Restoring authorship annotation for <mcheshkov@yandex-team.ru>. Commit 2 of 2.

1 files changed, 2239 insertions, 2239 deletions

diff --git a/contrib/libs/icu/include/unicode/measunit.h b/contrib/libs/icu/include/unicode/measunit.h
index 5c3e168b25..e240092e30 100644
--- a/contrib/libs/icu/include/unicode/measunit.h
+++ b/contrib/libs/icu/include/unicode/measunit.h
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others. 
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
@@ -15,12 +15,12 @@
 
 #include "unicode/utypes.h"
 
-#if U_SHOW_CPLUSPLUS_API 
- 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/unistr.h"
-#include "unicode/localpointer.h" 
+#include "unicode/localpointer.h"
 
 /**
  * \file 
@@ -30,204 +30,204 @@
 U_NAMESPACE_BEGIN
 
 class StringEnumeration;
-struct MeasureUnitImpl; 
+struct MeasureUnitImpl;
 
-#ifndef U_HIDE_DRAFT_API 
+#ifndef U_HIDE_DRAFT_API
 /**
- * Enumeration for unit complexity. There are three levels: 
- *  
- * - SINGLE: A single unit, optionally with a power and/or SI prefix. Examples: hectare, 
- *           square-kilometer, kilojoule, per-second. 
- * - COMPOUND: A unit composed of the product of multiple single units. Examples: 
- *             meter-per-second, kilowatt-hour, kilogram-meter-per-square-second. 
- * - MIXED: A unit composed of the sum of multiple single units. Examples: foot+inch, 
- *          hour+minute+second, degree+arcminute+arcsecond. 
- * 
- * The complexity determines which operations are available. For example, you cannot set the power 
- * or SI prefix of a compound unit. 
- * 
- * @draft ICU 67 
- */ 
-enum UMeasureUnitComplexity { 
-    /** 
-     * A single unit, like kilojoule. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_UNIT_SINGLE, 
- 
-    /** 
-     * A compound unit, like meter-per-second. 
-     *  
-     * @draft ICU 67 
-     */ 
-    UMEASURE_UNIT_COMPOUND, 
- 
-    /** 
-     * A mixed unit, like hour+minute. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_UNIT_MIXED 
-}; 
- 
-/** 
- * Enumeration for SI prefixes, such as "kilo". 
+ * Enumeration for unit complexity. There are three levels:
  * 
- * @draft ICU 67 
- */ 
-typedef enum UMeasureSIPrefix { 
- 
-    /** 
-     * SI prefix: yotta, 10^24. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_YOTTA = 24, 
- 
-    /** 
-     * SI prefix: zetta, 10^21. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_ZETTA = 21, 
- 
-    /** 
-     * SI prefix: exa, 10^18. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_EXA = 18, 
- 
-    /** 
-     * SI prefix: peta, 10^15. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_PETA = 15, 
- 
-    /** 
-     * SI prefix: tera, 10^12. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_TERA = 12, 
- 
-    /** 
-     * SI prefix: giga, 10^9. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_GIGA = 9, 
- 
-    /** 
-     * SI prefix: mega, 10^6. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_MEGA = 6, 
- 
-    /** 
-     * SI prefix: kilo, 10^3. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_KILO = 3, 
- 
-    /** 
-     * SI prefix: hecto, 10^2. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_HECTO = 2, 
- 
-    /** 
-     * SI prefix: deka, 10^1. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_DEKA = 1, 
- 
-    /** 
-     * The absence of an SI prefix. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_ONE = 0, 
- 
-    /** 
-     * SI prefix: deci, 10^-1. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_DECI = -1, 
- 
-    /** 
-     * SI prefix: centi, 10^-2. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_CENTI = -2, 
- 
-    /** 
-     * SI prefix: milli, 10^-3. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_MILLI = -3, 
- 
-    /** 
-     * SI prefix: micro, 10^-6. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_MICRO = -6, 
- 
-    /** 
-     * SI prefix: nano, 10^-9. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_NANO = -9, 
- 
-    /** 
-     * SI prefix: pico, 10^-12. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_PICO = -12, 
- 
-    /** 
-     * SI prefix: femto, 10^-15. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_FEMTO = -15, 
- 
-    /** 
-     * SI prefix: atto, 10^-18. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_ATTO = -18, 
- 
-    /** 
-     * SI prefix: zepto, 10^-21. 
-     * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_ZEPTO = -21, 
- 
-    /** 
-     * SI prefix: yocto, 10^-24. 
+ * - SINGLE: A single unit, optionally with a power and/or SI prefix. Examples: hectare,
+ *           square-kilometer, kilojoule, per-second.
+ * - COMPOUND: A unit composed of the product of multiple single units. Examples:
+ *             meter-per-second, kilowatt-hour, kilogram-meter-per-square-second.
+ * - MIXED: A unit composed of the sum of multiple single units. Examples: foot+inch,
+ *          hour+minute+second, degree+arcminute+arcsecond.
+ *
+ * The complexity determines which operations are available. For example, you cannot set the power
+ * or SI prefix of a compound unit.
+ *
+ * @draft ICU 67
+ */
+enum UMeasureUnitComplexity {
+    /**
+     * A single unit, like kilojoule.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_UNIT_SINGLE,
+
+    /**
+     * A compound unit, like meter-per-second.
      * 
-     * @draft ICU 67 
-     */ 
-    UMEASURE_SI_PREFIX_YOCTO = -24 
-} UMeasureSIPrefix; 
-#endif // U_HIDE_DRAFT_API 
- 
-/** 
+     * @draft ICU 67
+     */
+    UMEASURE_UNIT_COMPOUND,
+
+    /**
+     * A mixed unit, like hour+minute.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_UNIT_MIXED
+};
+
+/**
+ * Enumeration for SI prefixes, such as "kilo".
+ *
+ * @draft ICU 67
+ */
+typedef enum UMeasureSIPrefix {
+
+    /**
+     * SI prefix: yotta, 10^24.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_YOTTA = 24,
+
+    /**
+     * SI prefix: zetta, 10^21.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_ZETTA = 21,
+
+    /**
+     * SI prefix: exa, 10^18.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_EXA = 18,
+
+    /**
+     * SI prefix: peta, 10^15.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_PETA = 15,
+
+    /**
+     * SI prefix: tera, 10^12.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_TERA = 12,
+
+    /**
+     * SI prefix: giga, 10^9.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_GIGA = 9,
+
+    /**
+     * SI prefix: mega, 10^6.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_MEGA = 6,
+
+    /**
+     * SI prefix: kilo, 10^3.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_KILO = 3,
+
+    /**
+     * SI prefix: hecto, 10^2.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_HECTO = 2,
+
+    /**
+     * SI prefix: deka, 10^1.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_DEKA = 1,
+
+    /**
+     * The absence of an SI prefix.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_ONE = 0,
+
+    /**
+     * SI prefix: deci, 10^-1.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_DECI = -1,
+
+    /**
+     * SI prefix: centi, 10^-2.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_CENTI = -2,
+
+    /**
+     * SI prefix: milli, 10^-3.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_MILLI = -3,
+
+    /**
+     * SI prefix: micro, 10^-6.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_MICRO = -6,
+
+    /**
+     * SI prefix: nano, 10^-9.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_NANO = -9,
+
+    /**
+     * SI prefix: pico, 10^-12.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_PICO = -12,
+
+    /**
+     * SI prefix: femto, 10^-15.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_FEMTO = -15,
+
+    /**
+     * SI prefix: atto, 10^-18.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_ATTO = -18,
+
+    /**
+     * SI prefix: zepto, 10^-21.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_ZEPTO = -21,
+
+    /**
+     * SI prefix: yocto, 10^-24.
+     *
+     * @draft ICU 67
+     */
+    UMEASURE_SI_PREFIX_YOCTO = -24
+} UMeasureSIPrefix;
+#endif // U_HIDE_DRAFT_API
+
+/**
  * A unit such as length, mass, volume, currency, etc.  A unit is
  * coupled with a numeric amount to produce a Measure.
  *
@@ -239,59 +239,59 @@ class U_I18N_API MeasureUnit: public UObject {
 
     /**
      * Default constructor.
-     * Populates the instance with the base dimensionless unit. 
+     * Populates the instance with the base dimensionless unit.
      * @stable ICU 3.0
      */
-    MeasureUnit(); 
+    MeasureUnit();
     
     /**
      * Copy constructor.
      * @stable ICU 3.0
      */
     MeasureUnit(const MeasureUnit &other);
- 
-#ifndef U_HIDE_DRAFT_API 
+
+#ifndef U_HIDE_DRAFT_API
     /**
-     * Move constructor. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit(MeasureUnit &&other) noexcept; 
- 
-    /** 
-     * Construct a MeasureUnit from a CLDR Unit Identifier, defined in UTS 35. 
-     * Validates and canonicalizes the identifier. 
-     * 
-     * <pre> 
-     * MeasureUnit example = MeasureUnit::forIdentifier("furlong-per-nanosecond") 
-     * </pre> 
-     * 
-     * @param identifier The CLDR Unit Identifier 
-     * @param status Set if the identifier is invalid. 
-     * @draft ICU 67 
-     */ 
-    static MeasureUnit forIdentifier(StringPiece identifier, UErrorCode& status); 
-#endif // U_HIDE_DRAFT_API 
- 
-    /** 
-     * Copy assignment operator. 
+     * Move constructor.
+     * @draft ICU 67
+     */
+    MeasureUnit(MeasureUnit &&other) noexcept;
+
+    /**
+     * Construct a MeasureUnit from a CLDR Unit Identifier, defined in UTS 35.
+     * Validates and canonicalizes the identifier.
+     *
+     * <pre>
+     * MeasureUnit example = MeasureUnit::forIdentifier("furlong-per-nanosecond")
+     * </pre>
+     *
+     * @param identifier The CLDR Unit Identifier
+     * @param status Set if the identifier is invalid.
+     * @draft ICU 67
+     */
+    static MeasureUnit forIdentifier(StringPiece identifier, UErrorCode& status);
+#endif // U_HIDE_DRAFT_API
+
+    /**
+     * Copy assignment operator.
      * @stable ICU 3.0
      */
     MeasureUnit &operator=(const MeasureUnit &other);
 
-#ifndef U_HIDE_DRAFT_API 
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Move assignment operator.
+     * @draft ICU 67
+     */
+    MeasureUnit &operator=(MeasureUnit &&other) noexcept;
+#endif // U_HIDE_DRAFT_API
+
     /**
-     * Move assignment operator. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit &operator=(MeasureUnit &&other) noexcept; 
-#endif // U_HIDE_DRAFT_API 
- 
-    /** 
      * Returns a polymorphic clone of this object.  The result will
      * have the same class as returned by getDynamicClassID().
      * @stable ICU 3.0
      */
-    virtual MeasureUnit* clone() const; 
+    virtual MeasureUnit* clone() const;
 
     /**
      * Destructor
@@ -317,157 +317,157 @@ class U_I18N_API MeasureUnit: public UObject {
 
     /**
      * Get the type.
-     * 
-     * If the unit does not have a type, the empty string is returned. 
-     * 
+     *
+     * If the unit does not have a type, the empty string is returned.
+     *
      * @stable ICU 53
      */
     const char *getType() const;
 
     /**
      * Get the sub type.
-     * 
-     * If the unit does not have a subtype, the empty string is returned. 
-     * 
+     *
+     * If the unit does not have a subtype, the empty string is returned.
+     *
      * @stable ICU 53
      */
     const char *getSubtype() const;
 
-#ifndef U_HIDE_DRAFT_API 
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Get the CLDR Unit Identifier for this MeasureUnit, as defined in UTS 35.
+     *
+     * @return The string form of this unit, owned by this MeasureUnit.
+     * @draft ICU 67
+     */
+    const char* getIdentifier() const;
+
+    /**
+     * Compute the complexity of the unit. See UMeasureUnitComplexity for more information.
+     *
+     * @param status Set if an error occurs.
+     * @return The unit complexity.
+     * @draft ICU 67
+     */
+    UMeasureUnitComplexity getComplexity(UErrorCode& status) const;
+
+    /**
+     * Creates a MeasureUnit which is this SINGLE unit augmented with the specified SI prefix.
+     * For example, UMEASURE_SI_PREFIX_KILO for "kilo".
+     *
+     * There is sufficient locale data to format all standard SI prefixes.
+     *
+     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will
+     * occur. For more information, see UMeasureUnitComplexity.
+     *
+     * @param prefix The SI prefix, from UMeasureSIPrefix.
+     * @param status Set if this is not a SINGLE unit or if another error occurs.
+     * @return A new SINGLE unit.
+     * @draft ICU 67
+     */
+    MeasureUnit withSIPrefix(UMeasureSIPrefix prefix, UErrorCode& status) const;
+
+    /**
+     * Gets the current SI prefix of this SINGLE unit. For example, if the unit has the SI prefix
+     * "kilo", then UMEASURE_SI_PREFIX_KILO is returned.
+     *
+     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will
+     * occur. For more information, see UMeasureUnitComplexity.
+     *
+     * @param status Set if this is not a SINGLE unit or if another error occurs.
+     * @return The SI prefix of this SINGLE unit, from UMeasureSIPrefix.
+     * @draft ICU 67
+     */
+    UMeasureSIPrefix getSIPrefix(UErrorCode& status) const;
+
+    /**
+     * Creates a MeasureUnit which is this SINGLE unit augmented with the specified dimensionality
+     * (power). For example, if dimensionality is 2, the unit will be squared.
+     *
+     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will
+     * occur. For more information, see UMeasureUnitComplexity.
+     *
+     * For the base dimensionless unit, withDimensionality does nothing.
+     *
+     * @param dimensionality The dimensionality (power).
+     * @param status Set if this is not a SINGLE unit or if another error occurs.
+     * @return A new SINGLE unit.
+     * @draft ICU 67
+     */
+    MeasureUnit withDimensionality(int32_t dimensionality, UErrorCode& status) const;
+
+    /**
+     * Gets the dimensionality (power) of this MeasureUnit. For example, if the unit is square,
+     * then 2 is returned.
+     *
+     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will
+     * occur. For more information, see UMeasureUnitComplexity.
+     *
+     * For the base dimensionless unit, getDimensionality returns 0.
+     *
+     * @param status Set if this is not a SINGLE unit or if another error occurs.
+     * @return The dimensionality (power) of this simple unit.
+     * @draft ICU 67
+     */
+    int32_t getDimensionality(UErrorCode& status) const;
+
+    /**
+     * Gets the reciprocal of this MeasureUnit, with the numerator and denominator flipped.
+     *
+     * For example, if the receiver is "meter-per-second", the unit "second-per-meter" is returned.
+     *
+     * NOTE: Only works on SINGLE and COMPOUND units. If this is a MIXED unit, an error will
+     * occur. For more information, see UMeasureUnitComplexity.
+     *
+     * @param status Set if this is a MIXED unit or if another error occurs.
+     * @return The reciprocal of the target unit.
+     * @draft ICU 67
+     */
+    MeasureUnit reciprocal(UErrorCode& status) const;
+
+    /**
+     * Gets the product of this unit with another unit. This is a way to build units from
+     * constituent parts.
+     *
+     * The numerator and denominator are preserved through this operation.
+     *
+     * For example, if the receiver is "kilowatt" and the argument is "hour-per-day", then the
+     * unit "kilowatt-hour-per-day" is returned.
+     *
+     * NOTE: Only works on SINGLE and COMPOUND units. If either unit (receivee and argument) is a
+     * MIXED unit, an error will occur. For more information, see UMeasureUnitComplexity.
+     *
+     * @param other The MeasureUnit to multiply with the target.
+     * @param status Set if this or other is a MIXED unit or if another error occurs.
+     * @return The product of the target unit with the provided unit.
+     * @draft ICU 67
+     */
+    MeasureUnit product(const MeasureUnit& other, UErrorCode& status) const;
+#endif // U_HIDE_DRAFT_API
+
+#ifndef U_HIDE_INTERNAL_API
+    /**
+     * Gets the list of SINGLE units contained within a MIXED of COMPOUND unit.
+     *
+     * Examples:
+     * - Given "meter-kilogram-per-second", three units will be returned: "meter",
+     *   "kilogram", and "per-second".
+     * - Given "hour+minute+second", three units will be returned: "hour", "minute",
+     *   and "second".
+     *
+     * If this is a SINGLE unit, an array of length 1 will be returned.
+     *
+     * TODO(ICU-21021): Finalize this API and propose it as draft.
+     *
+     * @param outCount The number of elements in the return array.
+     * @param status Set if an error occurs.
+     * @return An array of single units, owned by the caller.
+     * @internal ICU 67 Technical Preview
+     */
+    LocalArray<MeasureUnit> splitToSingleUnits(int32_t& outCount, UErrorCode& status) const;
+#endif // U_HIDE_INTERNAL_API
+
     /**
-     * Get the CLDR Unit Identifier for this MeasureUnit, as defined in UTS 35. 
-     * 
-     * @return The string form of this unit, owned by this MeasureUnit. 
-     * @draft ICU 67 
-     */ 
-    const char* getIdentifier() const; 
- 
-    /** 
-     * Compute the complexity of the unit. See UMeasureUnitComplexity for more information. 
-     * 
-     * @param status Set if an error occurs. 
-     * @return The unit complexity. 
-     * @draft ICU 67 
-     */ 
-    UMeasureUnitComplexity getComplexity(UErrorCode& status) const; 
- 
-    /** 
-     * Creates a MeasureUnit which is this SINGLE unit augmented with the specified SI prefix. 
-     * For example, UMEASURE_SI_PREFIX_KILO for "kilo". 
-     * 
-     * There is sufficient locale data to format all standard SI prefixes. 
-     * 
-     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will 
-     * occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * @param prefix The SI prefix, from UMeasureSIPrefix. 
-     * @param status Set if this is not a SINGLE unit or if another error occurs. 
-     * @return A new SINGLE unit. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit withSIPrefix(UMeasureSIPrefix prefix, UErrorCode& status) const; 
- 
-    /** 
-     * Gets the current SI prefix of this SINGLE unit. For example, if the unit has the SI prefix 
-     * "kilo", then UMEASURE_SI_PREFIX_KILO is returned. 
-     * 
-     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will 
-     * occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * @param status Set if this is not a SINGLE unit or if another error occurs. 
-     * @return The SI prefix of this SINGLE unit, from UMeasureSIPrefix. 
-     * @draft ICU 67 
-     */ 
-    UMeasureSIPrefix getSIPrefix(UErrorCode& status) const; 
- 
-    /** 
-     * Creates a MeasureUnit which is this SINGLE unit augmented with the specified dimensionality 
-     * (power). For example, if dimensionality is 2, the unit will be squared. 
-     * 
-     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will 
-     * occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * For the base dimensionless unit, withDimensionality does nothing. 
-     * 
-     * @param dimensionality The dimensionality (power). 
-     * @param status Set if this is not a SINGLE unit or if another error occurs. 
-     * @return A new SINGLE unit. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit withDimensionality(int32_t dimensionality, UErrorCode& status) const; 
- 
-    /** 
-     * Gets the dimensionality (power) of this MeasureUnit. For example, if the unit is square, 
-     * then 2 is returned. 
-     * 
-     * NOTE: Only works on SINGLE units. If this is a COMPOUND or MIXED unit, an error will 
-     * occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * For the base dimensionless unit, getDimensionality returns 0. 
-     * 
-     * @param status Set if this is not a SINGLE unit or if another error occurs. 
-     * @return The dimensionality (power) of this simple unit. 
-     * @draft ICU 67 
-     */ 
-    int32_t getDimensionality(UErrorCode& status) const; 
- 
-    /** 
-     * Gets the reciprocal of this MeasureUnit, with the numerator and denominator flipped. 
-     * 
-     * For example, if the receiver is "meter-per-second", the unit "second-per-meter" is returned. 
-     * 
-     * NOTE: Only works on SINGLE and COMPOUND units. If this is a MIXED unit, an error will 
-     * occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * @param status Set if this is a MIXED unit or if another error occurs. 
-     * @return The reciprocal of the target unit. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit reciprocal(UErrorCode& status) const; 
- 
-    /** 
-     * Gets the product of this unit with another unit. This is a way to build units from 
-     * constituent parts. 
-     * 
-     * The numerator and denominator are preserved through this operation. 
-     * 
-     * For example, if the receiver is "kilowatt" and the argument is "hour-per-day", then the 
-     * unit "kilowatt-hour-per-day" is returned. 
-     * 
-     * NOTE: Only works on SINGLE and COMPOUND units. If either unit (receivee and argument) is a 
-     * MIXED unit, an error will occur. For more information, see UMeasureUnitComplexity. 
-     * 
-     * @param other The MeasureUnit to multiply with the target. 
-     * @param status Set if this or other is a MIXED unit or if another error occurs. 
-     * @return The product of the target unit with the provided unit. 
-     * @draft ICU 67 
-     */ 
-    MeasureUnit product(const MeasureUnit& other, UErrorCode& status) const; 
-#endif // U_HIDE_DRAFT_API 
- 
-#ifndef U_HIDE_INTERNAL_API 
-    /** 
-     * Gets the list of SINGLE units contained within a MIXED of COMPOUND unit. 
-     * 
-     * Examples: 
-     * - Given "meter-kilogram-per-second", three units will be returned: "meter", 
-     *   "kilogram", and "per-second". 
-     * - Given "hour+minute+second", three units will be returned: "hour", "minute", 
-     *   and "second". 
-     * 
-     * If this is a SINGLE unit, an array of length 1 will be returned. 
-     * 
-     * TODO(ICU-21021): Finalize this API and propose it as draft. 
-     * 
-     * @param outCount The number of elements in the return array. 
-     * @param status Set if an error occurs. 
-     * @return An array of single units, owned by the caller. 
-     * @internal ICU 67 Technical Preview 
-     */ 
-    LocalArray<MeasureUnit> splitToSingleUnits(int32_t& outCount, UErrorCode& status) const; 
-#endif // U_HIDE_INTERNAL_API 
- 
-    /** 
      * getAvailable gets all of the available units.
      * If there are too many units to fit into destCapacity then the
      * error code is set to U_BUFFER_OVERFLOW_ERROR.
@@ -517,7 +517,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * <pre>
      * .   Base* polymorphic_pointer = createPolymorphicObject();
      * .   if (polymorphic_pointer->getDynamicClassID() ==
-     * .       Derived::getStaticClassID()) ... 
+     * .       Derived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
      * @stable ICU 53
@@ -565,8 +565,8 @@ class U_I18N_API MeasureUnit: public UObject {
      * ICU use only.
      * @internal
      */
-    static MeasureUnit resolveUnitPerUnit( 
-            const MeasureUnit &unit, const MeasureUnit &perUnit, bool* isResolved); 
+    static MeasureUnit resolveUnitPerUnit(
+            const MeasureUnit &unit, const MeasureUnit &perUnit, bool* isResolved);
 #endif /* U_HIDE_INTERNAL_API */
 
 // All code between the "Start generated createXXX methods" comment and
@@ -578,2780 +578,2780 @@ class U_I18N_API MeasureUnit: public UObject {
 // Start generated createXXX methods
 
     /**
-     * Returns by pointer, unit of acceleration: g-force. 
+     * Returns by pointer, unit of acceleration: g-force.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGForce()}. 
+     * Also see {@link #getGForce()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createGForce(UErrorCode &status);
 
     /**
-     * Returns by value, unit of acceleration: g-force. 
-     * Also see {@link #createGForce()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGForce(); 
- 
-    /** 
-     * Returns by pointer, unit of acceleration: meter-per-square-second. 
+     * Returns by value, unit of acceleration: g-force.
+     * Also see {@link #createGForce()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGForce();
+
+    /**
+     * Returns by pointer, unit of acceleration: meter-per-square-second.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMeterPerSecondSquared()}. 
+     * Also see {@link #getMeterPerSecondSquared()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMeterPerSecondSquared(UErrorCode &status);
 
     /**
-     * Returns by value, unit of acceleration: meter-per-square-second. 
-     * Also see {@link #createMeterPerSecondSquared()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMeterPerSecondSquared(); 
- 
-    /** 
-     * Returns by pointer, unit of angle: arc-minute. 
+     * Returns by value, unit of acceleration: meter-per-square-second.
+     * Also see {@link #createMeterPerSecondSquared()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMeterPerSecondSquared();
+
+    /**
+     * Returns by pointer, unit of angle: arc-minute.
      * Caller owns returned value and must free it.
-     * Also see {@link #getArcMinute()}. 
+     * Also see {@link #getArcMinute()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createArcMinute(UErrorCode &status);
 
     /**
-     * Returns by value, unit of angle: arc-minute. 
-     * Also see {@link #createArcMinute()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getArcMinute(); 
- 
-    /** 
-     * Returns by pointer, unit of angle: arc-second. 
+     * Returns by value, unit of angle: arc-minute.
+     * Also see {@link #createArcMinute()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getArcMinute();
+
+    /**
+     * Returns by pointer, unit of angle: arc-second.
      * Caller owns returned value and must free it.
-     * Also see {@link #getArcSecond()}. 
+     * Also see {@link #getArcSecond()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createArcSecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of angle: arc-second. 
-     * Also see {@link #createArcSecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getArcSecond(); 
- 
-    /** 
-     * Returns by pointer, unit of angle: degree. 
+     * Returns by value, unit of angle: arc-second.
+     * Also see {@link #createArcSecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getArcSecond();
+
+    /**
+     * Returns by pointer, unit of angle: degree.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDegree()}. 
+     * Also see {@link #getDegree()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createDegree(UErrorCode &status);
 
     /**
-     * Returns by value, unit of angle: degree. 
-     * Also see {@link #createDegree()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDegree(); 
- 
-    /** 
-     * Returns by pointer, unit of angle: radian. 
+     * Returns by value, unit of angle: degree.
+     * Also see {@link #createDegree()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDegree();
+
+    /**
+     * Returns by pointer, unit of angle: radian.
      * Caller owns returned value and must free it.
-     * Also see {@link #getRadian()}. 
+     * Also see {@link #getRadian()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createRadian(UErrorCode &status);
 
     /**
-     * Returns by value, unit of angle: radian. 
-     * Also see {@link #createRadian()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getRadian(); 
- 
-    /** 
-     * Returns by pointer, unit of angle: revolution. 
+     * Returns by value, unit of angle: radian.
+     * Also see {@link #createRadian()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getRadian();
+
+    /**
+     * Returns by pointer, unit of angle: revolution.
      * Caller owns returned value and must free it.
-     * Also see {@link #getRevolutionAngle()}. 
+     * Also see {@link #getRevolutionAngle()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createRevolutionAngle(UErrorCode &status);
 
     /**
-     * Returns by value, unit of angle: revolution. 
-     * Also see {@link #createRevolutionAngle()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getRevolutionAngle(); 
- 
-    /** 
-     * Returns by pointer, unit of area: acre. 
+     * Returns by value, unit of angle: revolution.
+     * Also see {@link #createRevolutionAngle()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getRevolutionAngle();
+
+    /**
+     * Returns by pointer, unit of area: acre.
      * Caller owns returned value and must free it.
-     * Also see {@link #getAcre()}. 
+     * Also see {@link #getAcre()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createAcre(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: acre. 
-     * Also see {@link #createAcre()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getAcre(); 
- 
-    /** 
-     * Returns by pointer, unit of area: dunam. 
+     * Returns by value, unit of area: acre.
+     * Also see {@link #createAcre()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getAcre();
+
+    /**
+     * Returns by pointer, unit of area: dunam.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDunam()}. 
+     * Also see {@link #getDunam()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createDunam(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of area: dunam.
+     * Also see {@link #createDunam()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDunam();
+
+    /**
+     * Returns by pointer, unit of area: hectare.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getHectare()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createDunam(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of area: dunam. 
-     * Also see {@link #createDunam()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDunam(); 
- 
-    /** 
-     * Returns by pointer, unit of area: hectare. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getHectare()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createHectare(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: hectare. 
-     * Also see {@link #createHectare()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHectare(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-centimeter. 
+     * Returns by value, unit of area: hectare.
+     * Also see {@link #createHectare()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHectare();
+
+    /**
+     * Returns by pointer, unit of area: square-centimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareCentimeter()}. 
+     * Also see {@link #getSquareCentimeter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createSquareCentimeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-centimeter. 
-     * Also see {@link #createSquareCentimeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareCentimeter(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-foot. 
+     * Returns by value, unit of area: square-centimeter.
+     * Also see {@link #createSquareCentimeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareCentimeter();
+
+    /**
+     * Returns by pointer, unit of area: square-foot.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareFoot()}. 
+     * Also see {@link #getSquareFoot()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createSquareFoot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-foot. 
-     * Also see {@link #createSquareFoot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareFoot(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-inch. 
+     * Returns by value, unit of area: square-foot.
+     * Also see {@link #createSquareFoot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareFoot();
+
+    /**
+     * Returns by pointer, unit of area: square-inch.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareInch()}. 
+     * Also see {@link #getSquareInch()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createSquareInch(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-inch. 
-     * Also see {@link #createSquareInch()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareInch(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-kilometer. 
+     * Returns by value, unit of area: square-inch.
+     * Also see {@link #createSquareInch()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareInch();
+
+    /**
+     * Returns by pointer, unit of area: square-kilometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareKilometer()}. 
+     * Also see {@link #getSquareKilometer()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createSquareKilometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-kilometer. 
-     * Also see {@link #createSquareKilometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareKilometer(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-meter. 
+     * Returns by value, unit of area: square-kilometer.
+     * Also see {@link #createSquareKilometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareKilometer();
+
+    /**
+     * Returns by pointer, unit of area: square-meter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareMeter()}. 
+     * Also see {@link #getSquareMeter()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createSquareMeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-meter. 
-     * Also see {@link #createSquareMeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareMeter(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-mile. 
+     * Returns by value, unit of area: square-meter.
+     * Also see {@link #createSquareMeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareMeter();
+
+    /**
+     * Returns by pointer, unit of area: square-mile.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareMile()}. 
+     * Also see {@link #getSquareMile()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createSquareMile(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-mile. 
-     * Also see {@link #createSquareMile()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareMile(); 
- 
-    /** 
-     * Returns by pointer, unit of area: square-yard. 
+     * Returns by value, unit of area: square-mile.
+     * Also see {@link #createSquareMile()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareMile();
+
+    /**
+     * Returns by pointer, unit of area: square-yard.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSquareYard()}. 
+     * Also see {@link #getSquareYard()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createSquareYard(UErrorCode &status);
 
     /**
-     * Returns by value, unit of area: square-yard. 
-     * Also see {@link #createSquareYard()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSquareYard(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: karat. 
+     * Returns by value, unit of area: square-yard.
+     * Also see {@link #createSquareYard()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSquareYard();
+
+    /**
+     * Returns by pointer, unit of concentr: karat.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKarat()}. 
+     * Also see {@link #getKarat()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKarat(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: karat. 
-     * Also see {@link #createKarat()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKarat(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: milligram-per-deciliter. 
+     * Returns by value, unit of concentr: karat.
+     * Also see {@link #createKarat()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKarat();
+
+    /**
+     * Returns by pointer, unit of concentr: milligram-per-deciliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilligramPerDeciliter()}. 
+     * Also see {@link #getMilligramPerDeciliter()}.
      * @param status ICU error code.
-     * @stable ICU 57 
+     * @stable ICU 57
      */
     static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: milligram-per-deciliter. 
-     * Also see {@link #createMilligramPerDeciliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilligramPerDeciliter(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: millimole-per-liter. 
+     * Returns by value, unit of concentr: milligram-per-deciliter.
+     * Also see {@link #createMilligramPerDeciliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilligramPerDeciliter();
+
+    /**
+     * Returns by pointer, unit of concentr: millimole-per-liter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMillimolePerLiter()}. 
+     * Also see {@link #getMillimolePerLiter()}.
      * @param status ICU error code.
-     * @stable ICU 57 
+     * @stable ICU 57
      */
     static MeasureUnit *createMillimolePerLiter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: millimole-per-liter. 
-     * Also see {@link #createMillimolePerLiter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMillimolePerLiter(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: mole. 
+     * Returns by value, unit of concentr: millimole-per-liter.
+     * Also see {@link #createMillimolePerLiter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMillimolePerLiter();
+
+    /**
+     * Returns by pointer, unit of concentr: mole.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMole()}. 
+     * Also see {@link #getMole()}.
      * @param status ICU error code.
-     * @stable ICU 64 
+     * @stable ICU 64
      */
-    static MeasureUnit *createMole(UErrorCode &status); 
+    static MeasureUnit *createMole(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: mole. 
-     * Also see {@link #createMole()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMole(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: permillion. 
+     * Returns by value, unit of concentr: mole.
+     * Also see {@link #createMole()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMole();
+
+    /**
+     * Returns by pointer, unit of concentr: permillion.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPartPerMillion()}. 
+     * Also see {@link #getPartPerMillion()}.
      * @param status ICU error code.
-     * @stable ICU 57 
+     * @stable ICU 57
      */
-    static MeasureUnit *createPartPerMillion(UErrorCode &status); 
+    static MeasureUnit *createPartPerMillion(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: permillion. 
-     * Also see {@link #createPartPerMillion()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPartPerMillion(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: percent. 
+     * Returns by value, unit of concentr: permillion.
+     * Also see {@link #createPartPerMillion()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPartPerMillion();
+
+    /**
+     * Returns by pointer, unit of concentr: percent.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPercent()}. 
+     * Also see {@link #getPercent()}.
      * @param status ICU error code.
-     * @stable ICU 63 
+     * @stable ICU 63
      */
-    static MeasureUnit *createPercent(UErrorCode &status); 
+    static MeasureUnit *createPercent(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: percent. 
-     * Also see {@link #createPercent()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPercent(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: permille. 
+     * Returns by value, unit of concentr: percent.
+     * Also see {@link #createPercent()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPercent();
+
+    /**
+     * Returns by pointer, unit of concentr: permille.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPermille()}. 
+     * Also see {@link #getPermille()}.
      * @param status ICU error code.
-     * @stable ICU 63 
+     * @stable ICU 63
      */
-    static MeasureUnit *createPermille(UErrorCode &status); 
+    static MeasureUnit *createPermille(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: permille. 
-     * Also see {@link #createPermille()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPermille(); 
- 
-    /** 
-     * Returns by pointer, unit of concentr: permyriad. 
+     * Returns by value, unit of concentr: permille.
+     * Also see {@link #createPermille()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPermille();
+
+    /**
+     * Returns by pointer, unit of concentr: permyriad.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPermyriad()}. 
+     * Also see {@link #getPermyriad()}.
      * @param status ICU error code.
-     * @stable ICU 64 
+     * @stable ICU 64
      */
-    static MeasureUnit *createPermyriad(UErrorCode &status); 
+    static MeasureUnit *createPermyriad(UErrorCode &status);
 
     /**
-     * Returns by value, unit of concentr: permyriad. 
-     * Also see {@link #createPermyriad()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPermyriad(); 
- 
-    /** 
-     * Returns by pointer, unit of consumption: liter-per-100-kilometer. 
+     * Returns by value, unit of concentr: permyriad.
+     * Also see {@link #createPermyriad()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPermyriad();
+
+    /**
+     * Returns by pointer, unit of consumption: liter-per-100-kilometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getLiterPer100Kilometers()}. 
+     * Also see {@link #getLiterPer100Kilometers()}.
      * @param status ICU error code.
-     * @stable ICU 56 
+     * @stable ICU 56
      */
-    static MeasureUnit *createLiterPer100Kilometers(UErrorCode &status); 
+    static MeasureUnit *createLiterPer100Kilometers(UErrorCode &status);
 
     /**
-     * Returns by value, unit of consumption: liter-per-100-kilometer. 
-     * Also see {@link #createLiterPer100Kilometers()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getLiterPer100Kilometers(); 
- 
-    /** 
-     * Returns by pointer, unit of consumption: liter-per-kilometer. 
+     * Returns by value, unit of consumption: liter-per-100-kilometer.
+     * Also see {@link #createLiterPer100Kilometers()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getLiterPer100Kilometers();
+
+    /**
+     * Returns by pointer, unit of consumption: liter-per-kilometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getLiterPerKilometer()}. 
+     * Also see {@link #getLiterPerKilometer()}.
      * @param status ICU error code.
-     * @stable ICU 54 
+     * @stable ICU 54
      */
-    static MeasureUnit *createLiterPerKilometer(UErrorCode &status); 
+    static MeasureUnit *createLiterPerKilometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of consumption: liter-per-kilometer. 
-     * Also see {@link #createLiterPerKilometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getLiterPerKilometer(); 
- 
-    /** 
-     * Returns by pointer, unit of consumption: mile-per-gallon. 
+     * Returns by value, unit of consumption: liter-per-kilometer.
+     * Also see {@link #createLiterPerKilometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getLiterPerKilometer();
+
+    /**
+     * Returns by pointer, unit of consumption: mile-per-gallon.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilePerGallon()}. 
+     * Also see {@link #getMilePerGallon()}.
      * @param status ICU error code.
-     * @stable ICU 54 
+     * @stable ICU 54
      */
-    static MeasureUnit *createMilePerGallon(UErrorCode &status); 
+    static MeasureUnit *createMilePerGallon(UErrorCode &status);
 
     /**
-     * Returns by value, unit of consumption: mile-per-gallon. 
-     * Also see {@link #createMilePerGallon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilePerGallon(); 
- 
-    /** 
-     * Returns by pointer, unit of consumption: mile-per-gallon-imperial. 
+     * Returns by value, unit of consumption: mile-per-gallon.
+     * Also see {@link #createMilePerGallon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilePerGallon();
+
+    /**
+     * Returns by pointer, unit of consumption: mile-per-gallon-imperial.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilePerGallonImperial()}. 
+     * Also see {@link #getMilePerGallonImperial()}.
      * @param status ICU error code.
-     * @stable ICU 57 
+     * @stable ICU 57
      */
-    static MeasureUnit *createMilePerGallonImperial(UErrorCode &status); 
+    static MeasureUnit *createMilePerGallonImperial(UErrorCode &status);
 
     /**
-     * Returns by value, unit of consumption: mile-per-gallon-imperial. 
-     * Also see {@link #createMilePerGallonImperial()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilePerGallonImperial(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: bit. 
+     * Returns by value, unit of consumption: mile-per-gallon-imperial.
+     * Also see {@link #createMilePerGallonImperial()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilePerGallonImperial();
+
+    /**
+     * Returns by pointer, unit of digital: bit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getBit()}. 
+     * Also see {@link #getBit()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createBit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: bit. 
-     * Also see {@link #createBit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getBit(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: byte. 
+     * Returns by value, unit of digital: bit.
+     * Also see {@link #createBit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getBit();
+
+    /**
+     * Returns by pointer, unit of digital: byte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getByte()}. 
+     * Also see {@link #getByte()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createByte(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: byte. 
-     * Also see {@link #createByte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getByte(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: gigabit. 
+     * Returns by value, unit of digital: byte.
+     * Also see {@link #createByte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getByte();
+
+    /**
+     * Returns by pointer, unit of digital: gigabit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGigabit()}. 
+     * Also see {@link #getGigabit()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createGigabit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: gigabit. 
-     * Also see {@link #createGigabit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGigabit(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: gigabyte. 
+     * Returns by value, unit of digital: gigabit.
+     * Also see {@link #createGigabit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGigabit();
+
+    /**
+     * Returns by pointer, unit of digital: gigabyte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGigabyte()}. 
+     * Also see {@link #getGigabyte()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createGigabyte(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: gigabyte. 
-     * Also see {@link #createGigabyte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGigabyte(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: kilobit. 
+     * Returns by value, unit of digital: gigabyte.
+     * Also see {@link #createGigabyte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGigabyte();
+
+    /**
+     * Returns by pointer, unit of digital: kilobit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilobit()}. 
+     * Also see {@link #getKilobit()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilobit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: kilobit. 
-     * Also see {@link #createKilobit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilobit(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: kilobyte. 
+     * Returns by value, unit of digital: kilobit.
+     * Also see {@link #createKilobit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilobit();
+
+    /**
+     * Returns by pointer, unit of digital: kilobyte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilobyte()}. 
+     * Also see {@link #getKilobyte()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilobyte(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: kilobyte. 
-     * Also see {@link #createKilobyte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilobyte(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: megabit. 
+     * Returns by value, unit of digital: kilobyte.
+     * Also see {@link #createKilobyte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilobyte();
+
+    /**
+     * Returns by pointer, unit of digital: megabit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMegabit()}. 
+     * Also see {@link #getMegabit()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMegabit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: megabit. 
-     * Also see {@link #createMegabit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegabit(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: megabyte. 
+     * Returns by value, unit of digital: megabit.
+     * Also see {@link #createMegabit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegabit();
+
+    /**
+     * Returns by pointer, unit of digital: megabyte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMegabyte()}. 
+     * Also see {@link #getMegabyte()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMegabyte(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: megabyte. 
-     * Also see {@link #createMegabyte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegabyte(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: petabyte. 
+     * Returns by value, unit of digital: megabyte.
+     * Also see {@link #createMegabyte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegabyte();
+
+    /**
+     * Returns by pointer, unit of digital: petabyte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPetabyte()}. 
+     * Also see {@link #getPetabyte()}.
+     * @param status ICU error code.
+     * @stable ICU 63
+     */
+    static MeasureUnit *createPetabyte(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of digital: petabyte.
+     * Also see {@link #createPetabyte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPetabyte();
+
+    /**
+     * Returns by pointer, unit of digital: terabit.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getTerabit()}.
      * @param status ICU error code.
-     * @stable ICU 63 
-     */ 
-    static MeasureUnit *createPetabyte(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of digital: petabyte. 
-     * Also see {@link #createPetabyte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPetabyte(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: terabit. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getTerabit()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createTerabit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: terabit. 
-     * Also see {@link #createTerabit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getTerabit(); 
- 
-    /** 
-     * Returns by pointer, unit of digital: terabyte. 
+     * Returns by value, unit of digital: terabit.
+     * Also see {@link #createTerabit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getTerabit();
+
+    /**
+     * Returns by pointer, unit of digital: terabyte.
      * Caller owns returned value and must free it.
-     * Also see {@link #getTerabyte()}. 
+     * Also see {@link #getTerabyte()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createTerabyte(UErrorCode &status);
 
     /**
-     * Returns by value, unit of digital: terabyte. 
-     * Also see {@link #createTerabyte()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getTerabyte(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: century. 
+     * Returns by value, unit of digital: terabyte.
+     * Also see {@link #createTerabyte()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getTerabyte();
+
+    /**
+     * Returns by pointer, unit of duration: century.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCentury()}. 
+     * Also see {@link #getCentury()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createCentury(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: century. 
-     * Also see {@link #createCentury()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCentury(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: day. 
+     * Returns by value, unit of duration: century.
+     * Also see {@link #createCentury()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCentury();
+
+    /**
+     * Returns by pointer, unit of duration: day.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDay()}. 
+     * Also see {@link #getDay()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createDay(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: day. 
-     * Also see {@link #createDay()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDay(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: day-person. 
+     * Returns by value, unit of duration: day.
+     * Also see {@link #createDay()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDay();
+
+    /**
+     * Returns by pointer, unit of duration: day-person.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDayPerson()}. 
+     * Also see {@link #getDayPerson()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createDayPerson(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of duration: day-person.
+     * Also see {@link #createDayPerson()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDayPerson();
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of duration: decade.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getDecade()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createDecade(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of duration: decade.
+     * Also see {@link #createDecade()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getDecade();
+#endif /* U_HIDE_DRAFT_API */
+
+    /**
+     * Returns by pointer, unit of duration: hour.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getHour()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createDayPerson(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of duration: day-person. 
-     * Also see {@link #createDayPerson()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDayPerson(); 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of duration: decade. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getDecade()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createDecade(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of duration: decade. 
-     * Also see {@link #createDecade()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getDecade(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-    /** 
-     * Returns by pointer, unit of duration: hour. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getHour()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createHour(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: hour. 
-     * Also see {@link #createHour()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHour(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: microsecond. 
+     * Returns by value, unit of duration: hour.
+     * Also see {@link #createHour()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHour();
+
+    /**
+     * Returns by pointer, unit of duration: microsecond.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMicrosecond()}. 
+     * Also see {@link #getMicrosecond()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMicrosecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: microsecond. 
-     * Also see {@link #createMicrosecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMicrosecond(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: millisecond. 
+     * Returns by value, unit of duration: microsecond.
+     * Also see {@link #createMicrosecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMicrosecond();
+
+    /**
+     * Returns by pointer, unit of duration: millisecond.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMillisecond()}. 
+     * Also see {@link #getMillisecond()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMillisecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: millisecond. 
-     * Also see {@link #createMillisecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMillisecond(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: minute. 
+     * Returns by value, unit of duration: millisecond.
+     * Also see {@link #createMillisecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMillisecond();
+
+    /**
+     * Returns by pointer, unit of duration: minute.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMinute()}. 
+     * Also see {@link #getMinute()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMinute(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: minute. 
-     * Also see {@link #createMinute()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMinute(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: month. 
+     * Returns by value, unit of duration: minute.
+     * Also see {@link #createMinute()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMinute();
+
+    /**
+     * Returns by pointer, unit of duration: month.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMonth()}. 
+     * Also see {@link #getMonth()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMonth(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: month. 
-     * Also see {@link #createMonth()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMonth(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: month-person. 
+     * Returns by value, unit of duration: month.
+     * Also see {@link #createMonth()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMonth();
+
+    /**
+     * Returns by pointer, unit of duration: month-person.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMonthPerson()}. 
+     * Also see {@link #getMonthPerson()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createMonthPerson(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of duration: month-person.
+     * Also see {@link #createMonthPerson()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMonthPerson();
+
+    /**
+     * Returns by pointer, unit of duration: nanosecond.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getNanosecond()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createMonthPerson(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of duration: month-person. 
-     * Also see {@link #createMonthPerson()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMonthPerson(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: nanosecond. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getNanosecond()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createNanosecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: nanosecond. 
-     * Also see {@link #createNanosecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getNanosecond(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: second. 
+     * Returns by value, unit of duration: nanosecond.
+     * Also see {@link #createNanosecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getNanosecond();
+
+    /**
+     * Returns by pointer, unit of duration: second.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSecond()}. 
+     * Also see {@link #getSecond()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createSecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: second. 
-     * Also see {@link #createSecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSecond(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: week. 
+     * Returns by value, unit of duration: second.
+     * Also see {@link #createSecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSecond();
+
+    /**
+     * Returns by pointer, unit of duration: week.
      * Caller owns returned value and must free it.
-     * Also see {@link #getWeek()}. 
+     * Also see {@link #getWeek()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createWeek(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: week. 
-     * Also see {@link #createWeek()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getWeek(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: week-person. 
+     * Returns by value, unit of duration: week.
+     * Also see {@link #createWeek()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getWeek();
+
+    /**
+     * Returns by pointer, unit of duration: week-person.
      * Caller owns returned value and must free it.
-     * Also see {@link #getWeekPerson()}. 
+     * Also see {@link #getWeekPerson()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createWeekPerson(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of duration: week-person.
+     * Also see {@link #createWeekPerson()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getWeekPerson();
+
+    /**
+     * Returns by pointer, unit of duration: year.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getYear()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createWeekPerson(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of duration: week-person. 
-     * Also see {@link #createWeekPerson()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getWeekPerson(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: year. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getYear()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createYear(UErrorCode &status);
 
     /**
-     * Returns by value, unit of duration: year. 
-     * Also see {@link #createYear()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getYear(); 
- 
-    /** 
-     * Returns by pointer, unit of duration: year-person. 
+     * Returns by value, unit of duration: year.
+     * Also see {@link #createYear()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getYear();
+
+    /**
+     * Returns by pointer, unit of duration: year-person.
      * Caller owns returned value and must free it.
-     * Also see {@link #getYearPerson()}. 
+     * Also see {@link #getYearPerson()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createYearPerson(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of duration: year-person.
+     * Also see {@link #createYearPerson()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getYearPerson();
+
+    /**
+     * Returns by pointer, unit of electric: ampere.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getAmpere()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createYearPerson(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of duration: year-person. 
-     * Also see {@link #createYearPerson()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getYearPerson(); 
- 
-    /** 
-     * Returns by pointer, unit of electric: ampere. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getAmpere()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createAmpere(UErrorCode &status);
 
     /**
-     * Returns by value, unit of electric: ampere. 
-     * Also see {@link #createAmpere()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getAmpere(); 
- 
-    /** 
-     * Returns by pointer, unit of electric: milliampere. 
+     * Returns by value, unit of electric: ampere.
+     * Also see {@link #createAmpere()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getAmpere();
+
+    /**
+     * Returns by pointer, unit of electric: milliampere.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilliampere()}. 
+     * Also see {@link #getMilliampere()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMilliampere(UErrorCode &status);
 
     /**
-     * Returns by value, unit of electric: milliampere. 
-     * Also see {@link #createMilliampere()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilliampere(); 
- 
-    /** 
-     * Returns by pointer, unit of electric: ohm. 
+     * Returns by value, unit of electric: milliampere.
+     * Also see {@link #createMilliampere()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilliampere();
+
+    /**
+     * Returns by pointer, unit of electric: ohm.
      * Caller owns returned value and must free it.
-     * Also see {@link #getOhm()}. 
+     * Also see {@link #getOhm()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createOhm(UErrorCode &status);
 
     /**
-     * Returns by value, unit of electric: ohm. 
-     * Also see {@link #createOhm()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getOhm(); 
- 
-    /** 
-     * Returns by pointer, unit of electric: volt. 
+     * Returns by value, unit of electric: ohm.
+     * Also see {@link #createOhm()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getOhm();
+
+    /**
+     * Returns by pointer, unit of electric: volt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getVolt()}. 
+     * Also see {@link #getVolt()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createVolt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of electric: volt. 
-     * Also see {@link #createVolt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getVolt(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: british-thermal-unit. 
+     * Returns by value, unit of electric: volt.
+     * Also see {@link #createVolt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getVolt();
+
+    /**
+     * Returns by pointer, unit of energy: british-thermal-unit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getBritishThermalUnit()}. 
+     * Also see {@link #getBritishThermalUnit()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createBritishThermalUnit(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of energy: british-thermal-unit.
+     * Also see {@link #createBritishThermalUnit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getBritishThermalUnit();
+
+    /**
+     * Returns by pointer, unit of energy: calorie.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getCalorie()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createBritishThermalUnit(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of energy: british-thermal-unit. 
-     * Also see {@link #createBritishThermalUnit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getBritishThermalUnit(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: calorie. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getCalorie()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createCalorie(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: calorie. 
-     * Also see {@link #createCalorie()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCalorie(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: electronvolt. 
+     * Returns by value, unit of energy: calorie.
+     * Also see {@link #createCalorie()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCalorie();
+
+    /**
+     * Returns by pointer, unit of energy: electronvolt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getElectronvolt()}. 
+     * Also see {@link #getElectronvolt()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createElectronvolt(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of energy: electronvolt.
+     * Also see {@link #createElectronvolt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getElectronvolt();
+
+    /**
+     * Returns by pointer, unit of energy: foodcalorie.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getFoodcalorie()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createElectronvolt(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of energy: electronvolt. 
-     * Also see {@link #createElectronvolt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getElectronvolt(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: foodcalorie. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getFoodcalorie()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createFoodcalorie(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: foodcalorie. 
-     * Also see {@link #createFoodcalorie()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFoodcalorie(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: joule. 
+     * Returns by value, unit of energy: foodcalorie.
+     * Also see {@link #createFoodcalorie()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFoodcalorie();
+
+    /**
+     * Returns by pointer, unit of energy: joule.
      * Caller owns returned value and must free it.
-     * Also see {@link #getJoule()}. 
+     * Also see {@link #getJoule()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createJoule(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: joule. 
-     * Also see {@link #createJoule()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getJoule(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: kilocalorie. 
+     * Returns by value, unit of energy: joule.
+     * Also see {@link #createJoule()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getJoule();
+
+    /**
+     * Returns by pointer, unit of energy: kilocalorie.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilocalorie()}. 
+     * Also see {@link #getKilocalorie()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilocalorie(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: kilocalorie. 
-     * Also see {@link #createKilocalorie()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilocalorie(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: kilojoule. 
+     * Returns by value, unit of energy: kilocalorie.
+     * Also see {@link #createKilocalorie()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilocalorie();
+
+    /**
+     * Returns by pointer, unit of energy: kilojoule.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilojoule()}. 
+     * Also see {@link #getKilojoule()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilojoule(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: kilojoule. 
-     * Also see {@link #createKilojoule()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilojoule(); 
- 
-    /** 
-     * Returns by pointer, unit of energy: kilowatt-hour. 
+     * Returns by value, unit of energy: kilojoule.
+     * Also see {@link #createKilojoule()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilojoule();
+
+    /**
+     * Returns by pointer, unit of energy: kilowatt-hour.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilowattHour()}. 
+     * Also see {@link #getKilowattHour()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilowattHour(UErrorCode &status);
 
     /**
-     * Returns by value, unit of energy: kilowatt-hour. 
-     * Also see {@link #createKilowattHour()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilowattHour(); 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of energy: therm-us. 
+     * Returns by value, unit of energy: kilowatt-hour.
+     * Also see {@link #createKilowattHour()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilowattHour();
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of energy: therm-us.
      * Caller owns returned value and must free it.
-     * Also see {@link #getThermUs()}. 
+     * Also see {@link #getThermUs()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createThermUs(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of energy: therm-us.
+     * Also see {@link #createThermUs()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getThermUs();
+#endif /* U_HIDE_DRAFT_API */
+
+    /**
+     * Returns by pointer, unit of force: newton.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getNewton()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createNewton(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of force: newton.
+     * Also see {@link #createNewton()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getNewton();
+
+    /**
+     * Returns by pointer, unit of force: pound-force.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPoundForce()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createPoundForce(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of force: pound-force.
+     * Also see {@link #createPoundForce()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPoundForce();
+
+    /**
+     * Returns by pointer, unit of frequency: gigahertz.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getGigahertz()}.
      * @param status ICU error code.
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createThermUs(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of energy: therm-us. 
-     * Also see {@link #createThermUs()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getThermUs(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-    /** 
-     * Returns by pointer, unit of force: newton. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getNewton()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createNewton(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of force: newton. 
-     * Also see {@link #createNewton()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getNewton(); 
- 
-    /** 
-     * Returns by pointer, unit of force: pound-force. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPoundForce()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createPoundForce(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of force: pound-force. 
-     * Also see {@link #createPoundForce()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPoundForce(); 
- 
-    /** 
-     * Returns by pointer, unit of frequency: gigahertz. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getGigahertz()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createGigahertz(UErrorCode &status);
 
     /**
-     * Returns by value, unit of frequency: gigahertz. 
-     * Also see {@link #createGigahertz()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGigahertz(); 
- 
-    /** 
-     * Returns by pointer, unit of frequency: hertz. 
+     * Returns by value, unit of frequency: gigahertz.
+     * Also see {@link #createGigahertz()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGigahertz();
+
+    /**
+     * Returns by pointer, unit of frequency: hertz.
      * Caller owns returned value and must free it.
-     * Also see {@link #getHertz()}. 
+     * Also see {@link #getHertz()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createHertz(UErrorCode &status);
 
     /**
-     * Returns by value, unit of frequency: hertz. 
-     * Also see {@link #createHertz()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHertz(); 
- 
-    /** 
-     * Returns by pointer, unit of frequency: kilohertz. 
+     * Returns by value, unit of frequency: hertz.
+     * Also see {@link #createHertz()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHertz();
+
+    /**
+     * Returns by pointer, unit of frequency: kilohertz.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilohertz()}. 
+     * Also see {@link #getKilohertz()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKilohertz(UErrorCode &status);
 
     /**
-     * Returns by value, unit of frequency: kilohertz. 
-     * Also see {@link #createKilohertz()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilohertz(); 
- 
-    /** 
-     * Returns by pointer, unit of frequency: megahertz. 
+     * Returns by value, unit of frequency: kilohertz.
+     * Also see {@link #createKilohertz()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilohertz();
+
+    /**
+     * Returns by pointer, unit of frequency: megahertz.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMegahertz()}. 
+     * Also see {@link #getMegahertz()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMegahertz(UErrorCode &status);
 
     /**
-     * Returns by value, unit of frequency: megahertz. 
-     * Also see {@link #createMegahertz()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegahertz(); 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: dot-per-centimeter. 
+     * Returns by value, unit of frequency: megahertz.
+     * Also see {@link #createMegahertz()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegahertz();
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: dot-per-centimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDotPerCentimeter()}. 
+     * Also see {@link #getDotPerCentimeter()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createDotPerCentimeter(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: dot-per-centimeter.
+     * Also see {@link #createDotPerCentimeter()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getDotPerCentimeter();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: dot-per-inch.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getDotPerInch()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createDotPerInch(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: dot-per-inch.
+     * Also see {@link #createDotPerInch()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getDotPerInch();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: em.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getEm()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createEm(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: em.
+     * Also see {@link #createEm()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getEm();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: megapixel.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getMegapixel()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createMegapixel(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: megapixel.
+     * Also see {@link #createMegapixel()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getMegapixel();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: pixel.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPixel()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createPixel(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: pixel.
+     * Also see {@link #createPixel()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getPixel();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: pixel-per-centimeter.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPixelPerCentimeter()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createPixelPerCentimeter(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: pixel-per-centimeter.
+     * Also see {@link #createPixelPerCentimeter()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getPixelPerCentimeter();
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of graphics: pixel-per-inch.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPixelPerInch()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createPixelPerInch(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of graphics: pixel-per-inch.
+     * Also see {@link #createPixelPerInch()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getPixelPerInch();
+#endif /* U_HIDE_DRAFT_API */
+
+    /**
+     * Returns by pointer, unit of length: astronomical-unit.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getAstronomicalUnit()}.
      * @param status ICU error code.
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createDotPerCentimeter(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: dot-per-centimeter. 
-     * Also see {@link #createDotPerCentimeter()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getDotPerCentimeter(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: dot-per-inch. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getDotPerInch()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createDotPerInch(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: dot-per-inch. 
-     * Also see {@link #createDotPerInch()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getDotPerInch(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: em. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getEm()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createEm(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: em. 
-     * Also see {@link #createEm()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getEm(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: megapixel. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getMegapixel()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createMegapixel(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: megapixel. 
-     * Also see {@link #createMegapixel()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getMegapixel(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: pixel. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPixel()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createPixel(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: pixel. 
-     * Also see {@link #createPixel()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getPixel(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: pixel-per-centimeter. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPixelPerCentimeter()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createPixelPerCentimeter(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: pixel-per-centimeter. 
-     * Also see {@link #createPixelPerCentimeter()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getPixelPerCentimeter(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of graphics: pixel-per-inch. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPixelPerInch()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createPixelPerInch(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of graphics: pixel-per-inch. 
-     * Also see {@link #createPixelPerInch()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getPixelPerInch(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-    /** 
-     * Returns by pointer, unit of length: astronomical-unit. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getAstronomicalUnit()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createAstronomicalUnit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: astronomical-unit. 
-     * Also see {@link #createAstronomicalUnit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getAstronomicalUnit(); 
- 
-    /** 
-     * Returns by pointer, unit of length: centimeter. 
+     * Returns by value, unit of length: astronomical-unit.
+     * Also see {@link #createAstronomicalUnit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getAstronomicalUnit();
+
+    /**
+     * Returns by pointer, unit of length: centimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCentimeter()}. 
+     * Also see {@link #getCentimeter()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createCentimeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: centimeter. 
-     * Also see {@link #createCentimeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCentimeter(); 
- 
-    /** 
-     * Returns by pointer, unit of length: decimeter. 
+     * Returns by value, unit of length: centimeter.
+     * Also see {@link #createCentimeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCentimeter();
+
+    /**
+     * Returns by pointer, unit of length: decimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDecimeter()}. 
+     * Also see {@link #getDecimeter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createDecimeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: decimeter. 
-     * Also see {@link #createDecimeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDecimeter(); 
- 
-    /** 
-     * Returns by pointer, unit of length: fathom. 
+     * Returns by value, unit of length: decimeter.
+     * Also see {@link #createDecimeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDecimeter();
+
+    /**
+     * Returns by pointer, unit of length: fathom.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFathom()}. 
+     * Also see {@link #getFathom()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createFathom(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: fathom. 
-     * Also see {@link #createFathom()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFathom(); 
- 
-    /** 
-     * Returns by pointer, unit of length: foot. 
+     * Returns by value, unit of length: fathom.
+     * Also see {@link #createFathom()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFathom();
+
+    /**
+     * Returns by pointer, unit of length: foot.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFoot()}. 
+     * Also see {@link #getFoot()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createFoot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: foot. 
-     * Also see {@link #createFoot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFoot(); 
- 
-    /** 
-     * Returns by pointer, unit of length: furlong. 
+     * Returns by value, unit of length: foot.
+     * Also see {@link #createFoot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFoot();
+
+    /**
+     * Returns by pointer, unit of length: furlong.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFurlong()}. 
+     * Also see {@link #getFurlong()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createFurlong(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: furlong. 
-     * Also see {@link #createFurlong()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFurlong(); 
- 
-    /** 
-     * Returns by pointer, unit of length: inch. 
+     * Returns by value, unit of length: furlong.
+     * Also see {@link #createFurlong()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFurlong();
+
+    /**
+     * Returns by pointer, unit of length: inch.
      * Caller owns returned value and must free it.
-     * Also see {@link #getInch()}. 
+     * Also see {@link #getInch()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createInch(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: inch. 
-     * Also see {@link #createInch()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getInch(); 
- 
-    /** 
-     * Returns by pointer, unit of length: kilometer. 
+     * Returns by value, unit of length: inch.
+     * Also see {@link #createInch()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getInch();
+
+    /**
+     * Returns by pointer, unit of length: kilometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilometer()}. 
+     * Also see {@link #getKilometer()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createKilometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: kilometer. 
-     * Also see {@link #createKilometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilometer(); 
- 
-    /** 
-     * Returns by pointer, unit of length: light-year. 
+     * Returns by value, unit of length: kilometer.
+     * Also see {@link #createKilometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilometer();
+
+    /**
+     * Returns by pointer, unit of length: light-year.
      * Caller owns returned value and must free it.
-     * Also see {@link #getLightYear()}. 
+     * Also see {@link #getLightYear()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createLightYear(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: light-year. 
-     * Also see {@link #createLightYear()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getLightYear(); 
- 
-    /** 
-     * Returns by pointer, unit of length: meter. 
+     * Returns by value, unit of length: light-year.
+     * Also see {@link #createLightYear()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getLightYear();
+
+    /**
+     * Returns by pointer, unit of length: meter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMeter()}. 
+     * Also see {@link #getMeter()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: meter. 
-     * Also see {@link #createMeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMeter(); 
- 
-    /** 
-     * Returns by pointer, unit of length: micrometer. 
+     * Returns by value, unit of length: meter.
+     * Also see {@link #createMeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMeter();
+
+    /**
+     * Returns by pointer, unit of length: micrometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMicrometer()}. 
+     * Also see {@link #getMicrometer()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMicrometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: micrometer. 
-     * Also see {@link #createMicrometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMicrometer(); 
- 
-    /** 
-     * Returns by pointer, unit of length: mile. 
+     * Returns by value, unit of length: micrometer.
+     * Also see {@link #createMicrometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMicrometer();
+
+    /**
+     * Returns by pointer, unit of length: mile.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMile()}. 
+     * Also see {@link #getMile()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMile(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: mile. 
-     * Also see {@link #createMile()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMile(); 
- 
-    /** 
-     * Returns by pointer, unit of length: mile-scandinavian. 
+     * Returns by value, unit of length: mile.
+     * Also see {@link #createMile()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMile();
+
+    /**
+     * Returns by pointer, unit of length: mile-scandinavian.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMileScandinavian()}. 
+     * Also see {@link #getMileScandinavian()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createMileScandinavian(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: mile-scandinavian. 
-     * Also see {@link #createMileScandinavian()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMileScandinavian(); 
- 
-    /** 
-     * Returns by pointer, unit of length: millimeter. 
+     * Returns by value, unit of length: mile-scandinavian.
+     * Also see {@link #createMileScandinavian()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMileScandinavian();
+
+    /**
+     * Returns by pointer, unit of length: millimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMillimeter()}. 
+     * Also see {@link #getMillimeter()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMillimeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: millimeter. 
-     * Also see {@link #createMillimeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMillimeter(); 
- 
-    /** 
-     * Returns by pointer, unit of length: nanometer. 
+     * Returns by value, unit of length: millimeter.
+     * Also see {@link #createMillimeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMillimeter();
+
+    /**
+     * Returns by pointer, unit of length: nanometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getNanometer()}. 
+     * Also see {@link #getNanometer()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createNanometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: nanometer. 
-     * Also see {@link #createNanometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getNanometer(); 
- 
-    /** 
-     * Returns by pointer, unit of length: nautical-mile. 
+     * Returns by value, unit of length: nanometer.
+     * Also see {@link #createNanometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getNanometer();
+
+    /**
+     * Returns by pointer, unit of length: nautical-mile.
      * Caller owns returned value and must free it.
-     * Also see {@link #getNauticalMile()}. 
+     * Also see {@link #getNauticalMile()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createNauticalMile(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: nautical-mile. 
-     * Also see {@link #createNauticalMile()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getNauticalMile(); 
- 
-    /** 
-     * Returns by pointer, unit of length: parsec. 
+     * Returns by value, unit of length: nautical-mile.
+     * Also see {@link #createNauticalMile()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getNauticalMile();
+
+    /**
+     * Returns by pointer, unit of length: parsec.
      * Caller owns returned value and must free it.
-     * Also see {@link #getParsec()}. 
+     * Also see {@link #getParsec()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createParsec(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: parsec. 
-     * Also see {@link #createParsec()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getParsec(); 
- 
-    /** 
-     * Returns by pointer, unit of length: picometer. 
+     * Returns by value, unit of length: parsec.
+     * Also see {@link #createParsec()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getParsec();
+
+    /**
+     * Returns by pointer, unit of length: picometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPicometer()}. 
+     * Also see {@link #getPicometer()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createPicometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: picometer. 
-     * Also see {@link #createPicometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPicometer(); 
- 
-    /** 
-     * Returns by pointer, unit of length: point. 
+     * Returns by value, unit of length: picometer.
+     * Also see {@link #createPicometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPicometer();
+
+    /**
+     * Returns by pointer, unit of length: point.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPoint()}. 
+     * Also see {@link #getPoint()}.
+     * @param status ICU error code.
+     * @stable ICU 59
+     */
+    static MeasureUnit *createPoint(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of length: point.
+     * Also see {@link #createPoint()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPoint();
+
+    /**
+     * Returns by pointer, unit of length: solar-radius.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getSolarRadius()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createSolarRadius(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of length: solar-radius.
+     * Also see {@link #createSolarRadius()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSolarRadius();
+
+    /**
+     * Returns by pointer, unit of length: yard.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getYard()}.
      * @param status ICU error code.
-     * @stable ICU 59 
-     */ 
-    static MeasureUnit *createPoint(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of length: point. 
-     * Also see {@link #createPoint()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPoint(); 
- 
-    /** 
-     * Returns by pointer, unit of length: solar-radius. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getSolarRadius()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createSolarRadius(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of length: solar-radius. 
-     * Also see {@link #createSolarRadius()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSolarRadius(); 
- 
-    /** 
-     * Returns by pointer, unit of length: yard. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getYard()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createYard(UErrorCode &status);
 
     /**
-     * Returns by value, unit of length: yard. 
-     * Also see {@link #createYard()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getYard(); 
- 
-    /** 
-     * Returns by pointer, unit of light: lux. 
+     * Returns by value, unit of length: yard.
+     * Also see {@link #createYard()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getYard();
+
+    /**
+     * Returns by pointer, unit of light: lux.
      * Caller owns returned value and must free it.
-     * Also see {@link #getLux()}. 
+     * Also see {@link #getLux()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createLux(UErrorCode &status);
 
     /**
-     * Returns by value, unit of light: lux. 
-     * Also see {@link #createLux()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getLux(); 
- 
-    /** 
-     * Returns by pointer, unit of light: solar-luminosity. 
+     * Returns by value, unit of light: lux.
+     * Also see {@link #createLux()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getLux();
+
+    /**
+     * Returns by pointer, unit of light: solar-luminosity.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSolarLuminosity()}. 
+     * Also see {@link #getSolarLuminosity()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createSolarLuminosity(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of light: solar-luminosity.
+     * Also see {@link #createSolarLuminosity()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSolarLuminosity();
+
+    /**
+     * Returns by pointer, unit of mass: carat.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getCarat()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createSolarLuminosity(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of light: solar-luminosity. 
-     * Also see {@link #createSolarLuminosity()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSolarLuminosity(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: carat. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getCarat()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createCarat(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: carat. 
-     * Also see {@link #createCarat()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCarat(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: dalton. 
+     * Returns by value, unit of mass: carat.
+     * Also see {@link #createCarat()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCarat();
+
+    /**
+     * Returns by pointer, unit of mass: dalton.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDalton()}. 
+     * Also see {@link #getDalton()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createDalton(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of mass: dalton.
+     * Also see {@link #createDalton()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDalton();
+
+    /**
+     * Returns by pointer, unit of mass: earth-mass.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getEarthMass()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createEarthMass(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of mass: earth-mass.
+     * Also see {@link #createEarthMass()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getEarthMass();
+
+    /**
+     * Returns by pointer, unit of mass: gram.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getGram()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createDalton(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of mass: dalton. 
-     * Also see {@link #createDalton()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDalton(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: earth-mass. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getEarthMass()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createEarthMass(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of mass: earth-mass. 
-     * Also see {@link #createEarthMass()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getEarthMass(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: gram. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getGram()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createGram(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: gram. 
-     * Also see {@link #createGram()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGram(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: kilogram. 
+     * Returns by value, unit of mass: gram.
+     * Also see {@link #createGram()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGram();
+
+    /**
+     * Returns by pointer, unit of mass: kilogram.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilogram()}. 
+     * Also see {@link #getKilogram()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createKilogram(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: kilogram. 
-     * Also see {@link #createKilogram()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilogram(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: metric-ton. 
+     * Returns by value, unit of mass: kilogram.
+     * Also see {@link #createKilogram()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilogram();
+
+    /**
+     * Returns by pointer, unit of mass: metric-ton.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMetricTon()}. 
+     * Also see {@link #getMetricTon()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMetricTon(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: metric-ton. 
-     * Also see {@link #createMetricTon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMetricTon(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: microgram. 
+     * Returns by value, unit of mass: metric-ton.
+     * Also see {@link #createMetricTon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMetricTon();
+
+    /**
+     * Returns by pointer, unit of mass: microgram.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMicrogram()}. 
+     * Also see {@link #getMicrogram()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMicrogram(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: microgram. 
-     * Also see {@link #createMicrogram()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMicrogram(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: milligram. 
+     * Returns by value, unit of mass: microgram.
+     * Also see {@link #createMicrogram()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMicrogram();
+
+    /**
+     * Returns by pointer, unit of mass: milligram.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilligram()}. 
+     * Also see {@link #getMilligram()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMilligram(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: milligram. 
-     * Also see {@link #createMilligram()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilligram(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: ounce. 
+     * Returns by value, unit of mass: milligram.
+     * Also see {@link #createMilligram()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilligram();
+
+    /**
+     * Returns by pointer, unit of mass: ounce.
      * Caller owns returned value and must free it.
-     * Also see {@link #getOunce()}. 
+     * Also see {@link #getOunce()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createOunce(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: ounce. 
-     * Also see {@link #createOunce()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getOunce(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: ounce-troy. 
+     * Returns by value, unit of mass: ounce.
+     * Also see {@link #createOunce()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getOunce();
+
+    /**
+     * Returns by pointer, unit of mass: ounce-troy.
      * Caller owns returned value and must free it.
-     * Also see {@link #getOunceTroy()}. 
+     * Also see {@link #getOunceTroy()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createOunceTroy(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: ounce-troy. 
-     * Also see {@link #createOunceTroy()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getOunceTroy(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: pound. 
+     * Returns by value, unit of mass: ounce-troy.
+     * Also see {@link #createOunceTroy()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getOunceTroy();
+
+    /**
+     * Returns by pointer, unit of mass: pound.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPound()}. 
+     * Also see {@link #getPound()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createPound(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: pound. 
-     * Also see {@link #createPound()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPound(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: solar-mass. 
+     * Returns by value, unit of mass: pound.
+     * Also see {@link #createPound()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPound();
+
+    /**
+     * Returns by pointer, unit of mass: solar-mass.
      * Caller owns returned value and must free it.
-     * Also see {@link #getSolarMass()}. 
+     * Also see {@link #getSolarMass()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createSolarMass(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of mass: solar-mass.
+     * Also see {@link #createSolarMass()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getSolarMass();
+
+    /**
+     * Returns by pointer, unit of mass: stone.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getStone()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createSolarMass(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of mass: solar-mass. 
-     * Also see {@link #createSolarMass()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getSolarMass(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: stone. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getStone()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createStone(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: stone. 
-     * Also see {@link #createStone()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getStone(); 
- 
-    /** 
-     * Returns by pointer, unit of mass: ton. 
+     * Returns by value, unit of mass: stone.
+     * Also see {@link #createStone()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getStone();
+
+    /**
+     * Returns by pointer, unit of mass: ton.
      * Caller owns returned value and must free it.
-     * Also see {@link #getTon()}. 
+     * Also see {@link #getTon()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createTon(UErrorCode &status);
 
     /**
-     * Returns by value, unit of mass: ton. 
-     * Also see {@link #createTon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getTon(); 
- 
-    /** 
-     * Returns by pointer, unit of power: gigawatt. 
+     * Returns by value, unit of mass: ton.
+     * Also see {@link #createTon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getTon();
+
+    /**
+     * Returns by pointer, unit of power: gigawatt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGigawatt()}. 
+     * Also see {@link #getGigawatt()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createGigawatt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: gigawatt. 
-     * Also see {@link #createGigawatt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGigawatt(); 
- 
-    /** 
-     * Returns by pointer, unit of power: horsepower. 
+     * Returns by value, unit of power: gigawatt.
+     * Also see {@link #createGigawatt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGigawatt();
+
+    /**
+     * Returns by pointer, unit of power: horsepower.
      * Caller owns returned value and must free it.
-     * Also see {@link #getHorsepower()}. 
+     * Also see {@link #getHorsepower()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createHorsepower(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: horsepower. 
-     * Also see {@link #createHorsepower()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHorsepower(); 
- 
-    /** 
-     * Returns by pointer, unit of power: kilowatt. 
+     * Returns by value, unit of power: horsepower.
+     * Also see {@link #createHorsepower()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHorsepower();
+
+    /**
+     * Returns by pointer, unit of power: kilowatt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilowatt()}. 
+     * Also see {@link #getKilowatt()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createKilowatt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: kilowatt. 
-     * Also see {@link #createKilowatt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilowatt(); 
- 
-    /** 
-     * Returns by pointer, unit of power: megawatt. 
+     * Returns by value, unit of power: kilowatt.
+     * Also see {@link #createKilowatt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilowatt();
+
+    /**
+     * Returns by pointer, unit of power: megawatt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMegawatt()}. 
+     * Also see {@link #getMegawatt()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMegawatt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: megawatt. 
-     * Also see {@link #createMegawatt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegawatt(); 
- 
-    /** 
-     * Returns by pointer, unit of power: milliwatt. 
+     * Returns by value, unit of power: megawatt.
+     * Also see {@link #createMegawatt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegawatt();
+
+    /**
+     * Returns by pointer, unit of power: milliwatt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilliwatt()}. 
+     * Also see {@link #getMilliwatt()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMilliwatt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: milliwatt. 
-     * Also see {@link #createMilliwatt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilliwatt(); 
- 
-    /** 
-     * Returns by pointer, unit of power: watt. 
+     * Returns by value, unit of power: milliwatt.
+     * Also see {@link #createMilliwatt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilliwatt();
+
+    /**
+     * Returns by pointer, unit of power: watt.
      * Caller owns returned value and must free it.
-     * Also see {@link #getWatt()}. 
+     * Also see {@link #getWatt()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createWatt(UErrorCode &status);
 
     /**
-     * Returns by value, unit of power: watt. 
-     * Also see {@link #createWatt()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getWatt(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: atmosphere. 
+     * Returns by value, unit of power: watt.
+     * Also see {@link #createWatt()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getWatt();
+
+    /**
+     * Returns by pointer, unit of pressure: atmosphere.
      * Caller owns returned value and must free it.
-     * Also see {@link #getAtmosphere()}. 
+     * Also see {@link #getAtmosphere()}.
+     * @param status ICU error code.
+     * @stable ICU 63
+     */
+    static MeasureUnit *createAtmosphere(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of pressure: atmosphere.
+     * Also see {@link #createAtmosphere()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getAtmosphere();
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of pressure: bar.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getBar()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createBar(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of pressure: bar.
+     * Also see {@link #createBar()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getBar();
+#endif /* U_HIDE_DRAFT_API */
+
+    /**
+     * Returns by pointer, unit of pressure: hectopascal.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getHectopascal()}.
      * @param status ICU error code.
-     * @stable ICU 63 
-     */ 
-    static MeasureUnit *createAtmosphere(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of pressure: atmosphere. 
-     * Also see {@link #createAtmosphere()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getAtmosphere(); 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of pressure: bar. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getBar()}. 
-     * @param status ICU error code. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createBar(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of pressure: bar. 
-     * Also see {@link #createBar()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getBar(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-    /** 
-     * Returns by pointer, unit of pressure: hectopascal. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getHectopascal()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createHectopascal(UErrorCode &status);
 
     /**
-     * Returns by value, unit of pressure: hectopascal. 
-     * Also see {@link #createHectopascal()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHectopascal(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: inch-ofhg. 
+     * Returns by value, unit of pressure: hectopascal.
+     * Also see {@link #createHectopascal()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHectopascal();
+
+    /**
+     * Returns by pointer, unit of pressure: inch-ofhg.
      * Caller owns returned value and must free it.
-     * Also see {@link #getInchHg()}. 
+     * Also see {@link #getInchHg()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createInchHg(UErrorCode &status);
 
     /**
-     * Returns by value, unit of pressure: inch-ofhg. 
-     * Also see {@link #createInchHg()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getInchHg(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: kilopascal. 
+     * Returns by value, unit of pressure: inch-ofhg.
+     * Also see {@link #createInchHg()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getInchHg();
+
+    /**
+     * Returns by pointer, unit of pressure: kilopascal.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilopascal()}. 
+     * Also see {@link #getKilopascal()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createKilopascal(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of pressure: kilopascal.
+     * Also see {@link #createKilopascal()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilopascal();
+
+    /**
+     * Returns by pointer, unit of pressure: megapascal.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getMegapascal()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createMegapascal(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of pressure: megapascal.
+     * Also see {@link #createMegapascal()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegapascal();
+
+    /**
+     * Returns by pointer, unit of pressure: millibar.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getMillibar()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createKilopascal(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of pressure: kilopascal. 
-     * Also see {@link #createKilopascal()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilopascal(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: megapascal. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getMegapascal()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createMegapascal(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of pressure: megapascal. 
-     * Also see {@link #createMegapascal()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegapascal(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: millibar. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getMillibar()}. 
-     * @param status ICU error code. 
      * @stable ICU 53
      */
     static MeasureUnit *createMillibar(UErrorCode &status);
 
     /**
-     * Returns by value, unit of pressure: millibar. 
-     * Also see {@link #createMillibar()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMillibar(); 
- 
-    /** 
-     * Returns by pointer, unit of pressure: millimeter-ofhg. 
+     * Returns by value, unit of pressure: millibar.
+     * Also see {@link #createMillibar()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMillibar();
+
+    /**
+     * Returns by pointer, unit of pressure: millimeter-ofhg.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMillimeterOfMercury()}. 
+     * Also see {@link #getMillimeterOfMercury()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMillimeterOfMercury(UErrorCode &status);
 
     /**
-     * Returns by value, unit of pressure: millimeter-ofhg. 
-     * Also see {@link #createMillimeterOfMercury()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMillimeterOfMercury(); 
- 
-#ifndef U_HIDE_DRAFT_API 
-    /** 
-     * Returns by pointer, unit of pressure: pascal. 
+     * Returns by value, unit of pressure: millimeter-ofhg.
+     * Also see {@link #createMillimeterOfMercury()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMillimeterOfMercury();
+
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Returns by pointer, unit of pressure: pascal.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPascal()}. 
+     * Also see {@link #getPascal()}.
+     * @param status ICU error code.
+     * @draft ICU 65
+     */
+    static MeasureUnit *createPascal(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of pressure: pascal.
+     * Also see {@link #createPascal()}.
+     * @draft ICU 65
+     */
+    static MeasureUnit getPascal();
+#endif /* U_HIDE_DRAFT_API */
+
+    /**
+     * Returns by pointer, unit of pressure: pound-force-per-square-inch.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPoundPerSquareInch()}.
      * @param status ICU error code.
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit *createPascal(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of pressure: pascal. 
-     * Also see {@link #createPascal()}. 
-     * @draft ICU 65 
-     */ 
-    static MeasureUnit getPascal(); 
-#endif /* U_HIDE_DRAFT_API */ 
- 
-    /** 
-     * Returns by pointer, unit of pressure: pound-force-per-square-inch. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPoundPerSquareInch()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createPoundPerSquareInch(UErrorCode &status);
 
     /**
-     * Returns by value, unit of pressure: pound-force-per-square-inch. 
-     * Also see {@link #createPoundPerSquareInch()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPoundPerSquareInch(); 
- 
-    /** 
-     * Returns by pointer, unit of speed: kilometer-per-hour. 
+     * Returns by value, unit of pressure: pound-force-per-square-inch.
+     * Also see {@link #createPoundPerSquareInch()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPoundPerSquareInch();
+
+    /**
+     * Returns by pointer, unit of speed: kilometer-per-hour.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKilometerPerHour()}. 
+     * Also see {@link #getKilometerPerHour()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createKilometerPerHour(UErrorCode &status);
 
     /**
-     * Returns by value, unit of speed: kilometer-per-hour. 
-     * Also see {@link #createKilometerPerHour()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKilometerPerHour(); 
- 
-    /** 
-     * Returns by pointer, unit of speed: knot. 
+     * Returns by value, unit of speed: kilometer-per-hour.
+     * Also see {@link #createKilometerPerHour()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKilometerPerHour();
+
+    /**
+     * Returns by pointer, unit of speed: knot.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKnot()}. 
+     * Also see {@link #getKnot()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createKnot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of speed: knot. 
-     * Also see {@link #createKnot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKnot(); 
- 
-    /** 
-     * Returns by pointer, unit of speed: meter-per-second. 
+     * Returns by value, unit of speed: knot.
+     * Also see {@link #createKnot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKnot();
+
+    /**
+     * Returns by pointer, unit of speed: meter-per-second.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMeterPerSecond()}. 
+     * Also see {@link #getMeterPerSecond()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMeterPerSecond(UErrorCode &status);
 
     /**
-     * Returns by value, unit of speed: meter-per-second. 
-     * Also see {@link #createMeterPerSecond()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMeterPerSecond(); 
- 
-    /** 
-     * Returns by pointer, unit of speed: mile-per-hour. 
+     * Returns by value, unit of speed: meter-per-second.
+     * Also see {@link #createMeterPerSecond()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMeterPerSecond();
+
+    /**
+     * Returns by pointer, unit of speed: mile-per-hour.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilePerHour()}. 
+     * Also see {@link #getMilePerHour()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createMilePerHour(UErrorCode &status);
 
     /**
-     * Returns by value, unit of speed: mile-per-hour. 
-     * Also see {@link #createMilePerHour()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilePerHour(); 
- 
-    /** 
-     * Returns by pointer, unit of temperature: celsius. 
+     * Returns by value, unit of speed: mile-per-hour.
+     * Also see {@link #createMilePerHour()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilePerHour();
+
+    /**
+     * Returns by pointer, unit of temperature: celsius.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCelsius()}. 
+     * Also see {@link #getCelsius()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createCelsius(UErrorCode &status);
 
     /**
-     * Returns by value, unit of temperature: celsius. 
-     * Also see {@link #createCelsius()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCelsius(); 
- 
-    /** 
-     * Returns by pointer, unit of temperature: fahrenheit. 
+     * Returns by value, unit of temperature: celsius.
+     * Also see {@link #createCelsius()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCelsius();
+
+    /**
+     * Returns by pointer, unit of temperature: fahrenheit.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFahrenheit()}. 
+     * Also see {@link #getFahrenheit()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createFahrenheit(UErrorCode &status);
 
     /**
-     * Returns by value, unit of temperature: fahrenheit. 
-     * Also see {@link #createFahrenheit()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFahrenheit(); 
- 
-    /** 
-     * Returns by pointer, unit of temperature: generic. 
+     * Returns by value, unit of temperature: fahrenheit.
+     * Also see {@link #createFahrenheit()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFahrenheit();
+
+    /**
+     * Returns by pointer, unit of temperature: generic.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGenericTemperature()}. 
+     * Also see {@link #getGenericTemperature()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createGenericTemperature(UErrorCode &status);
 
     /**
-     * Returns by value, unit of temperature: generic. 
-     * Also see {@link #createGenericTemperature()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGenericTemperature(); 
- 
-    /** 
-     * Returns by pointer, unit of temperature: kelvin. 
+     * Returns by value, unit of temperature: generic.
+     * Also see {@link #createGenericTemperature()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGenericTemperature();
+
+    /**
+     * Returns by pointer, unit of temperature: kelvin.
      * Caller owns returned value and must free it.
-     * Also see {@link #getKelvin()}. 
+     * Also see {@link #getKelvin()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createKelvin(UErrorCode &status);
 
     /**
-     * Returns by value, unit of temperature: kelvin. 
-     * Also see {@link #createKelvin()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getKelvin(); 
- 
-    /** 
-     * Returns by pointer, unit of torque: newton-meter. 
+     * Returns by value, unit of temperature: kelvin.
+     * Also see {@link #createKelvin()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getKelvin();
+
+    /**
+     * Returns by pointer, unit of torque: newton-meter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getNewtonMeter()}. 
+     * Also see {@link #getNewtonMeter()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createNewtonMeter(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of torque: newton-meter.
+     * Also see {@link #createNewtonMeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getNewtonMeter();
+
+    /**
+     * Returns by pointer, unit of torque: pound-force-foot.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getPoundFoot()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createPoundFoot(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of torque: pound-force-foot.
+     * Also see {@link #createPoundFoot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPoundFoot();
+
+    /**
+     * Returns by pointer, unit of volume: acre-foot.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getAcreFoot()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createNewtonMeter(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of torque: newton-meter. 
-     * Also see {@link #createNewtonMeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getNewtonMeter(); 
- 
-    /** 
-     * Returns by pointer, unit of torque: pound-force-foot. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getPoundFoot()}. 
-     * @param status ICU error code. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createPoundFoot(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of torque: pound-force-foot. 
-     * Also see {@link #createPoundFoot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPoundFoot(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: acre-foot. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getAcreFoot()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createAcreFoot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: acre-foot. 
-     * Also see {@link #createAcreFoot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getAcreFoot(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: barrel. 
+     * Returns by value, unit of volume: acre-foot.
+     * Also see {@link #createAcreFoot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getAcreFoot();
+
+    /**
+     * Returns by pointer, unit of volume: barrel.
      * Caller owns returned value and must free it.
-     * Also see {@link #getBarrel()}. 
+     * Also see {@link #getBarrel()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createBarrel(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of volume: barrel.
+     * Also see {@link #createBarrel()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getBarrel();
+
+    /**
+     * Returns by pointer, unit of volume: bushel.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getBushel()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createBarrel(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of volume: barrel. 
-     * Also see {@link #createBarrel()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getBarrel(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: bushel. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getBushel()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createBushel(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: bushel. 
-     * Also see {@link #createBushel()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getBushel(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: centiliter. 
+     * Returns by value, unit of volume: bushel.
+     * Also see {@link #createBushel()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getBushel();
+
+    /**
+     * Returns by pointer, unit of volume: centiliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCentiliter()}. 
+     * Also see {@link #getCentiliter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCentiliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: centiliter. 
-     * Also see {@link #createCentiliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCentiliter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-centimeter. 
+     * Returns by value, unit of volume: centiliter.
+     * Also see {@link #createCentiliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCentiliter();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-centimeter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicCentimeter()}. 
+     * Also see {@link #getCubicCentimeter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCubicCentimeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-centimeter. 
-     * Also see {@link #createCubicCentimeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicCentimeter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-foot. 
+     * Returns by value, unit of volume: cubic-centimeter.
+     * Also see {@link #createCubicCentimeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicCentimeter();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-foot.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicFoot()}. 
+     * Also see {@link #getCubicFoot()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCubicFoot(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-foot. 
-     * Also see {@link #createCubicFoot()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicFoot(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-inch. 
+     * Returns by value, unit of volume: cubic-foot.
+     * Also see {@link #createCubicFoot()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicFoot();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-inch.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicInch()}. 
+     * Also see {@link #getCubicInch()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCubicInch(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-inch. 
-     * Also see {@link #createCubicInch()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicInch(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-kilometer. 
+     * Returns by value, unit of volume: cubic-inch.
+     * Also see {@link #createCubicInch()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicInch();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-kilometer.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicKilometer()}. 
+     * Also see {@link #getCubicKilometer()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createCubicKilometer(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-kilometer. 
-     * Also see {@link #createCubicKilometer()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicKilometer(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-meter. 
+     * Returns by value, unit of volume: cubic-kilometer.
+     * Also see {@link #createCubicKilometer()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicKilometer();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-meter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicMeter()}. 
+     * Also see {@link #getCubicMeter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCubicMeter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-meter. 
-     * Also see {@link #createCubicMeter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicMeter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-mile. 
+     * Returns by value, unit of volume: cubic-meter.
+     * Also see {@link #createCubicMeter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicMeter();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-mile.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicMile()}. 
+     * Also see {@link #getCubicMile()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createCubicMile(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-mile. 
-     * Also see {@link #createCubicMile()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicMile(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cubic-yard. 
+     * Returns by value, unit of volume: cubic-mile.
+     * Also see {@link #createCubicMile()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicMile();
+
+    /**
+     * Returns by pointer, unit of volume: cubic-yard.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCubicYard()}. 
+     * Also see {@link #getCubicYard()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCubicYard(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cubic-yard. 
-     * Also see {@link #createCubicYard()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCubicYard(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cup. 
+     * Returns by value, unit of volume: cubic-yard.
+     * Also see {@link #createCubicYard()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCubicYard();
+
+    /**
+     * Returns by pointer, unit of volume: cup.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCup()}. 
+     * Also see {@link #getCup()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createCup(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cup. 
-     * Also see {@link #createCup()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCup(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: cup-metric. 
+     * Returns by value, unit of volume: cup.
+     * Also see {@link #createCup()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCup();
+
+    /**
+     * Returns by pointer, unit of volume: cup-metric.
      * Caller owns returned value and must free it.
-     * Also see {@link #getCupMetric()}. 
+     * Also see {@link #getCupMetric()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createCupMetric(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: cup-metric. 
-     * Also see {@link #createCupMetric()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getCupMetric(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: deciliter. 
+     * Returns by value, unit of volume: cup-metric.
+     * Also see {@link #createCupMetric()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getCupMetric();
+
+    /**
+     * Returns by pointer, unit of volume: deciliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getDeciliter()}. 
+     * Also see {@link #getDeciliter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createDeciliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: deciliter. 
-     * Also see {@link #createDeciliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getDeciliter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: fluid-ounce. 
+     * Returns by value, unit of volume: deciliter.
+     * Also see {@link #createDeciliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getDeciliter();
+
+    /**
+     * Returns by pointer, unit of volume: fluid-ounce.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFluidOunce()}. 
+     * Also see {@link #getFluidOunce()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createFluidOunce(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: fluid-ounce. 
-     * Also see {@link #createFluidOunce()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFluidOunce(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: fluid-ounce-imperial. 
+     * Returns by value, unit of volume: fluid-ounce.
+     * Also see {@link #createFluidOunce()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFluidOunce();
+
+    /**
+     * Returns by pointer, unit of volume: fluid-ounce-imperial.
      * Caller owns returned value and must free it.
-     * Also see {@link #getFluidOunceImperial()}. 
+     * Also see {@link #getFluidOunceImperial()}.
+     * @param status ICU error code.
+     * @stable ICU 64
+     */
+    static MeasureUnit *createFluidOunceImperial(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of volume: fluid-ounce-imperial.
+     * Also see {@link #createFluidOunceImperial()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getFluidOunceImperial();
+
+    /**
+     * Returns by pointer, unit of volume: gallon.
+     * Caller owns returned value and must free it.
+     * Also see {@link #getGallon()}.
      * @param status ICU error code.
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit *createFluidOunceImperial(UErrorCode &status); 
- 
-    /** 
-     * Returns by value, unit of volume: fluid-ounce-imperial. 
-     * Also see {@link #createFluidOunceImperial()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getFluidOunceImperial(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: gallon. 
-     * Caller owns returned value and must free it. 
-     * Also see {@link #getGallon()}. 
-     * @param status ICU error code. 
      * @stable ICU 54
      */
     static MeasureUnit *createGallon(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: gallon. 
-     * Also see {@link #createGallon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGallon(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: gallon-imperial. 
+     * Returns by value, unit of volume: gallon.
+     * Also see {@link #createGallon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGallon();
+
+    /**
+     * Returns by pointer, unit of volume: gallon-imperial.
      * Caller owns returned value and must free it.
-     * Also see {@link #getGallonImperial()}. 
+     * Also see {@link #getGallonImperial()}.
      * @param status ICU error code.
-     * @stable ICU 57 
+     * @stable ICU 57
      */
     static MeasureUnit *createGallonImperial(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: gallon-imperial. 
-     * Also see {@link #createGallonImperial()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getGallonImperial(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: hectoliter. 
+     * Returns by value, unit of volume: gallon-imperial.
+     * Also see {@link #createGallonImperial()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getGallonImperial();
+
+    /**
+     * Returns by pointer, unit of volume: hectoliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getHectoliter()}. 
+     * Also see {@link #getHectoliter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createHectoliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: hectoliter. 
-     * Also see {@link #createHectoliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getHectoliter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: liter. 
+     * Returns by value, unit of volume: hectoliter.
+     * Also see {@link #createHectoliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getHectoliter();
+
+    /**
+     * Returns by pointer, unit of volume: liter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getLiter()}. 
+     * Also see {@link #getLiter()}.
      * @param status ICU error code.
      * @stable ICU 53
      */
     static MeasureUnit *createLiter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: liter. 
-     * Also see {@link #createLiter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getLiter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: megaliter. 
+     * Returns by value, unit of volume: liter.
+     * Also see {@link #createLiter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getLiter();
+
+    /**
+     * Returns by pointer, unit of volume: megaliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMegaliter()}. 
+     * Also see {@link #getMegaliter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMegaliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: megaliter. 
-     * Also see {@link #createMegaliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMegaliter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: milliliter. 
+     * Returns by value, unit of volume: megaliter.
+     * Also see {@link #createMegaliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMegaliter();
+
+    /**
+     * Returns by pointer, unit of volume: milliliter.
      * Caller owns returned value and must free it.
-     * Also see {@link #getMilliliter()}. 
+     * Also see {@link #getMilliliter()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createMilliliter(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: milliliter. 
-     * Also see {@link #createMilliliter()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getMilliliter(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: pint. 
+     * Returns by value, unit of volume: milliliter.
+     * Also see {@link #createMilliliter()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getMilliliter();
+
+    /**
+     * Returns by pointer, unit of volume: pint.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPint()}. 
+     * Also see {@link #getPint()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createPint(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: pint. 
-     * Also see {@link #createPint()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPint(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: pint-metric. 
+     * Returns by value, unit of volume: pint.
+     * Also see {@link #createPint()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPint();
+
+    /**
+     * Returns by pointer, unit of volume: pint-metric.
      * Caller owns returned value and must free it.
-     * Also see {@link #getPintMetric()}. 
+     * Also see {@link #getPintMetric()}.
      * @param status ICU error code.
      * @stable ICU 56
      */
     static MeasureUnit *createPintMetric(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: pint-metric. 
-     * Also see {@link #createPintMetric()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getPintMetric(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: quart. 
+     * Returns by value, unit of volume: pint-metric.
+     * Also see {@link #createPintMetric()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPintMetric();
+
+    /**
+     * Returns by pointer, unit of volume: quart.
      * Caller owns returned value and must free it.
-     * Also see {@link #getQuart()}. 
+     * Also see {@link #getQuart()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createQuart(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: quart. 
-     * Also see {@link #createQuart()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getQuart(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: tablespoon. 
+     * Returns by value, unit of volume: quart.
+     * Also see {@link #createQuart()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getQuart();
+
+    /**
+     * Returns by pointer, unit of volume: tablespoon.
      * Caller owns returned value and must free it.
-     * Also see {@link #getTablespoon()}. 
+     * Also see {@link #getTablespoon()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createTablespoon(UErrorCode &status);
 
     /**
-     * Returns by value, unit of volume: tablespoon. 
-     * Also see {@link #createTablespoon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getTablespoon(); 
- 
-    /** 
-     * Returns by pointer, unit of volume: teaspoon. 
+     * Returns by value, unit of volume: tablespoon.
+     * Also see {@link #createTablespoon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getTablespoon();
+
+    /**
+     * Returns by pointer, unit of volume: teaspoon.
      * Caller owns returned value and must free it.
-     * Also see {@link #getTeaspoon()}. 
+     * Also see {@link #getTeaspoon()}.
      * @param status ICU error code.
      * @stable ICU 54
      */
     static MeasureUnit *createTeaspoon(UErrorCode &status);
 
-    /** 
-     * Returns by value, unit of volume: teaspoon. 
-     * Also see {@link #createTeaspoon()}. 
-     * @stable ICU 64 
-     */ 
-    static MeasureUnit getTeaspoon(); 
+    /**
+     * Returns by value, unit of volume: teaspoon.
+     * Also see {@link #createTeaspoon()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getTeaspoon();
+
 
- 
 // End generated createXXX methods
 
  protected:
@@ -3367,51 +3367,51 @@ class U_I18N_API MeasureUnit: public UObject {
      * For ICU use only.
      * @internal
      */
-    void initCurrency(StringPiece isoCurrency); 
+    void initCurrency(StringPiece isoCurrency);
+
+    /**
+     * For ICU use only.
+     * @internal
+     */
+    void initNoUnit(const char *subtype);
 
-    /** 
-     * For ICU use only. 
-     * @internal 
-     */ 
-    void initNoUnit(const char *subtype); 
- 
 #endif  /* U_HIDE_INTERNAL_API */
 
 private:
 
-    // Used by new draft APIs in ICU 67. If non-null, fImpl is owned by the 
-    // MeasureUnit. 
-    MeasureUnitImpl* fImpl; 
- 
-    // An index into a static string list in measunit.cpp. If set to -1, fImpl 
-    // is in use instead of fTypeId and fSubTypeId. 
-    int16_t fSubTypeId; 
-    // An index into a static string list in measunit.cpp. If set to -1, fImpl 
-    // is in use instead of fTypeId and fSubTypeId. 
-    int8_t fTypeId; 
- 
-    MeasureUnit(int32_t typeId, int32_t subTypeId); 
-    MeasureUnit(MeasureUnitImpl&& impl); 
+    // Used by new draft APIs in ICU 67. If non-null, fImpl is owned by the
+    // MeasureUnit.
+    MeasureUnitImpl* fImpl;
+
+    // An index into a static string list in measunit.cpp. If set to -1, fImpl
+    // is in use instead of fTypeId and fSubTypeId.
+    int16_t fSubTypeId;
+    // An index into a static string list in measunit.cpp. If set to -1, fImpl
+    // is in use instead of fTypeId and fSubTypeId.
+    int8_t fTypeId;
+
+    MeasureUnit(int32_t typeId, int32_t subTypeId);
+    MeasureUnit(MeasureUnitImpl&& impl);
     void setTo(int32_t typeId, int32_t subTypeId);
     int32_t getOffset() const;
     static MeasureUnit *create(int typeId, int subTypeId, UErrorCode &status);
- 
-    /** 
-     * Sets output's typeId and subTypeId according to subType, if subType is a 
-     * valid/known identifier. 
-     * 
-     * @return Whether subType is known to ICU. If false, output was not 
-     * modified. 
-     */ 
-    static bool findBySubType(StringPiece subType, MeasureUnit* output); 
- 
-    friend struct MeasureUnitImpl; 
+
+    /**
+     * Sets output's typeId and subTypeId according to subType, if subType is a
+     * valid/known identifier.
+     *
+     * @return Whether subType is known to ICU. If false, output was not
+     * modified.
+     */
+    static bool findBySubType(StringPiece subType, MeasureUnit* output);
+
+    friend struct MeasureUnitImpl;
 };
 
 U_NAMESPACE_END
 
 #endif // !UNCONFIG_NO_FORMATTING
- 
-#endif /* U_SHOW_CPLUSPLUS_API */ 
- 
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // __MEASUREUNIT_H__