pango 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

data/vendor/local/include/unicode/dtptngen.h

@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-* Copyright (C) 2007-2013, International Business Machines Corporation and
+* Copyright (C) 2007-2015, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
@@ -31,6 +31,7 @@ class DateTimeMatcher;
 class DistanceInfo;
 class PatternMap;
 class PtnSkeleton;
+class SharedDateTimePatternGenerator;
 
 /**
  * This class provides flexible generation of date format patterns, like "yy-MM-dd". 
@@ -65,6 +66,17 @@ public:
      */
     static DateTimePatternGenerator* U_EXPORT2 createInstance(const Locale& uLocale, UErrorCode& status);
 
+#ifndef U_HIDE_INTERNAL_API
+
+    /**
+     * For ICU use only
+     *
+     * @internal
+     */
+    static DateTimePatternGenerator* U_EXPORT2 internalMakeInstance(const Locale& uLocale, UErrorCode& status);
+
+#endif /* U_HIDE_INTERNAL_API */
+
     /**
      * Create an empty generator, to be constructed with addPattern(...) etc.
      * @param status  Output param set to success/failure code on exit,
@@ -215,22 +227,24 @@ public:
     const UnicodeString& getAppendItemName(UDateTimePatternField field) const;
 
     /**
-     * The date time format is a message format pattern used to compose date and
-     * time patterns. The default value is "{0} {1}", where {0} will be replaced
-     * by the date pattern and {1} will be replaced by the time pattern.
+     * The DateTimeFormat is a message format pattern used to compose date and
+     * time patterns. The default pattern in the root locale is "{1} {0}", where
+     * {1} will be replaced by the date pattern and {0} will be replaced by the
+     * time pattern; however, other locales may specify patterns such as
+     * "{1}, {0}" or "{1} 'at' {0}", etc.
      * <p>
      * This is used when the input skeleton contains both date and time fields,
      * but there is not a close match among the added patterns. For example,
      * suppose that this object was created by adding "dd-MMM" and "hh:mm", and
-     * its datetimeFormat is the default "{0} {1}". Then if the input skeleton
+     * its datetimeFormat is the default "{1} {0}". Then if the input skeleton
      * is "MMMdhmm", there is not an exact match, so the input skeleton is
      * broken up into two components "MMMd" and "hmm". There are close matches
      * for those two skeletons, so the result is put together with this pattern,
      * resulting in "d-MMM h:mm".
      *
      * @param dateTimeFormat
-     *            message format pattern, here {0} will be replaced by the date
-     *            pattern and {1} will be replaced by the time pattern.
+     *            message format pattern, here {1} will be replaced by the date
+     *            pattern and {0} will be replaced by the time pattern.
      * @stable ICU 3.8
      */
     void setDateTimeFormat(const UnicodeString& dateTimeFormat);

data/vendor/local/include/unicode/localpointer.h

@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2009-2012, International Business Machines
+*   Copyright (C) 2009-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -191,6 +191,26 @@ public:
      * @stable ICU 4.4
      */
     explicit LocalPointer(T *p=NULL) : LocalPointerBase<T>(p) {}
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Constructor takes ownership and reports an error if NULL.
+     *
+     * This constructor is intended to be used with other-class constructors
+     * that may report a failure UErrorCode,
+     * so that callers need to check only for U_FAILURE(errorCode)
+     * and not also separately for isNull().
+     *
+     * @param p simple pointer to an object that is adopted
+     * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR
+     *     if p==NULL and no other failure code had been set
+     * @draft ICU 55
+     */
+    LocalPointer(T *p, UErrorCode &errorCode) : LocalPointerBase<T>(p) {
+        if(p==NULL && U_SUCCESS(errorCode)) {
+            errorCode=U_MEMORY_ALLOCATION_ERROR;
+        }
+    }
+#endif  /* U_HIDE_DRAFT_API */
     /**
      * Destructor deletes the object it owns.
      * @stable ICU 4.4
@@ -208,6 +228,34 @@ public:
         delete LocalPointerBase<T>::ptr;
         LocalPointerBase<T>::ptr=p;
     }
+#ifndef U_HIDE_DRAFT_API
+    /**
+     * Deletes the object it owns,
+     * and adopts (takes ownership of) the one passed in.
+     *
+     * If U_FAILURE(errorCode), then the current object is retained and the new one deleted.
+     *
+     * If U_SUCCESS(errorCode) but the input pointer is NULL,
+     * then U_MEMORY_ALLOCATION_ERROR is set,
+     * the current object is deleted, and NULL is set.
+     *
+     * @param p simple pointer to an object that is adopted
+     * @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR
+     *     if p==NULL and no other failure code had been set
+     * @draft ICU 55
+     */
+    void adoptInsteadAndCheckErrorCode(T *p, UErrorCode &errorCode) {
+        if(U_SUCCESS(errorCode)) {
+            delete LocalPointerBase<T>::ptr;
+            LocalPointerBase<T>::ptr=p;
+            if(p==NULL) {
+                errorCode=U_MEMORY_ALLOCATION_ERROR;
+            }
+        } else {
+            delete p;
+        }
+    }
+#endif  /* U_HIDE_DRAFT_API */
 };
 
 /**

data/vendor/local/include/unicode/locid.h

@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1996-2014, International Business Machines
+*   Copyright (C) 1996-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -750,7 +750,7 @@ private:
     char fullNameBuffer[ULOC_FULLNAME_CAPACITY];
     // name without keywords
     char* baseName;
-    char baseNameBuffer[ULOC_FULLNAME_CAPACITY];
+    void initBaseName(UErrorCode& status);
 
     UBool fIsBogus;
 
@@ -795,7 +795,6 @@ Locale::getScript() const
 inline const char *
 Locale::getVariant() const
 {
-    getBaseName(); // lazy init
     return &baseName[variantBegin];
 }
 

data/vendor/local/include/unicode/measfmt.h

@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2004-2014, International Business Machines
+* Copyright (c) 2004-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -29,45 +29,43 @@
  * For example, for English, when formatting "3 hours"
  * Wide is "3 hours"; short is "3 hrs"; narrow is "3h";
  * formatting "3 hours 17 minutes" as numeric give "3:17"
- * @draft ICU 53
+ * @stable ICU 53
  */
 enum UMeasureFormatWidth {
 
-#ifndef U_HIDE_DRAFT_API
     // Wide, short, and narrow must be first and in this order.
     /**
      * Spell out measure units.
-     * @draft ICU 53 
+     * @stable ICU 53 
      */
     UMEASFMT_WIDTH_WIDE,
  
     /**
      * Abbreviate measure units.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UMEASFMT_WIDTH_SHORT,
 
     /**
      * Use symbols for measure units when possible.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UMEASFMT_WIDTH_NARROW,
 
     /**
      * Completely omit measure units when possible. For example, format
      * '5 hours, 37 minutes' as '5:37'
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UMEASFMT_WIDTH_NUMERIC,
-#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Count of values in this enum.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UMEASFMT_WIDTH_COUNT = 4
 };
-/** @draft ICU 53 */
+/** @stable ICU 53 */
 typedef enum UMeasureFormatWidth UMeasureFormatWidth; 
 
 U_NAMESPACE_BEGIN
@@ -97,34 +95,32 @@ class U_I18N_API MeasureFormat : public Format {
     using Format::parseObject;
     using Format::format;
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Constructor.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     MeasureFormat(
             const Locale &locale, UMeasureFormatWidth width, UErrorCode &status);
 
     /**
      * Constructor.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     MeasureFormat(
             const Locale &locale,
             UMeasureFormatWidth width,
             NumberFormat *nfToAdopt,
             UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Copy constructor.
-     * @draft ICU 53
+     * @stable ICU 3.0
      */
     MeasureFormat(const MeasureFormat &other);
 
     /**
      * Assignment operator.
-     * @draft ICU 53
+     * @stable ICU 3.0
      */
     MeasureFormat &operator=(const MeasureFormat &rhs);
 
@@ -136,19 +132,19 @@ class U_I18N_API MeasureFormat : public Format {
 
     /**
      * Return true if given Format objects are semantically equal.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual UBool operator==(const Format &other) const;
 
     /**
      * Clones this object polymorphically.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual Format *clone() const;
 
     /**
      * Formats object to produce a string.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual UnicodeString &format(
             const Formattable &obj,
@@ -167,7 +163,6 @@ class U_I18N_API MeasureFormat : public Format {
             Formattable &reslt,
             ParsePosition &pos) const;
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Formats measure objects to produce a string. An example of such a
      * formatted string is 3 meters, 3.5 centimeters. Measure objects appear
@@ -182,7 +177,7 @@ class U_I18N_API MeasureFormat : public Format {
      * @param status the error.
      * @return appendTo reference
      *
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UnicodeString &formatMeasures(
             const Measure *measures,
@@ -190,31 +185,29 @@ class U_I18N_API MeasureFormat : public Format {
             UnicodeString &appendTo,
             FieldPosition &pos,
             UErrorCode &status) const;
-#endif  /* U_HIDE_DRAFT_API */
 
-#ifndef U_HIDE_INTERNAL_API
+#ifndef U_HIDE_DRAFT_API
     /**
-     * Works like formatMeasures but adds a per unit. An example of such a
-     * formatted string is 3 meters, 3.5 centimeters per second.
-     * @param measures array of measure objects.
-     * @param measureCount the number of measure objects.
-     * @param perUnit The per unit. In the example formatted string,
-     *        it is *MeasureUnit::createSecond(status).
+     * Formats a single measure per unit. An example of such a
+     * formatted string is 3.5 meters per second.
+     * @param measure The measure object. In above example, 3.5 meters.
+     * @param perUnit The per unit. In above example, it is
+     *        *MeasureUnit::createSecond(status).
      * @param appendTo formatted string appended here.
      * @param pos the field position.
      * @param status the error.
      * @return appendTo reference
      *
-     * @internal Technology preview
+     * @draft ICU 55
      */
-    UnicodeString &formatMeasuresPer(
-            const Measure *measures,
-            int32_t measureCount,
+    UnicodeString &formatMeasurePerUnit(
+            const Measure &measure,
             const MeasureUnit &perUnit,
             UnicodeString &appendTo,
             FieldPosition &pos,
             UErrorCode &status) const;
-#endif /* U_HIDE_INTERNAL_API */
+
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Return a formatter for CurrencyAmount objects in the given
@@ -245,7 +238,7 @@ class U_I18N_API MeasureFormat : public Format {
      * .       erived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static UClassID U_EXPORT2 getStaticClassID(void);
 
@@ -258,7 +251,7 @@ class U_I18N_API MeasureFormat : public Format {
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual UClassID getDynamicClassID(void) const;
 
@@ -347,7 +340,7 @@ class U_I18N_API MeasureFormat : public Format {
             int32_t widthIndex,
             UErrorCode &status) const;
 
-    int32_t withPerUnit(
+    int32_t withPerUnitAndAppend(
         const UnicodeString &formatted,
         const MeasureUnit &perUnit,
         UnicodeString &appendTo,

data/vendor/local/include/unicode/measunit.h

@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2004-2014, International Business Machines
+* Copyright (c) 2004-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -46,13 +46,13 @@ class U_I18N_API MeasureUnit: public UObject {
     
     /**
      * Copy constructor.
-     * @draft ICU 53
+     * @stable ICU 3.0
      */
     MeasureUnit(const MeasureUnit &other);
         
     /**
      * Assignment operator.
-     * @draft ICU 53
+     * @stable ICU 3.0
      */
     MeasureUnit &operator=(const MeasureUnit &other);
 
@@ -76,11 +76,10 @@ class U_I18N_API MeasureUnit: public UObject {
      */
     virtual UBool operator==(const UObject& other) const;
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Inequality operator.  Return true if this object is not equal
      * to the given object.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     UBool operator!=(const UObject& other) const {
         return !(*this == other);
@@ -88,13 +87,13 @@ class U_I18N_API MeasureUnit: public UObject {
 
     /**
      * Get the type.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     const char *getType() const;
 
     /**
      * Get the sub type.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     const char *getSubtype() const;
 
@@ -107,7 +106,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * @param destCapacity number of MeasureUnit instances available at dest.
      * @param errorCode ICU error code.
      * @return number of available units.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static int32_t getAvailable(
             MeasureUnit *destArray,
@@ -124,7 +123,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * @param destCapacity number of MeasureUnit instances available at dest.
      * @param errorCode ICU error code.
      * @return number of available units for type.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static int32_t getAvailable(
             const char *type,
@@ -138,10 +137,9 @@ class U_I18N_API MeasureUnit: public UObject {
      *
      * @param errorCode ICU error code.
      * @return the types.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static StringEnumeration* getAvailableTypes(UErrorCode &errorCode);
-#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Return the class ID for this class. This is useful only for comparing to
@@ -152,7 +150,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * .       erived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static UClassID U_EXPORT2 getStaticClassID(void);
 
@@ -165,7 +163,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     virtual UClassID getDynamicClassID(void) const;
 
@@ -184,26 +182,31 @@ class U_I18N_API MeasureUnit: public UObject {
      * @internal
      */
     static int32_t getIndexCount();
+
+    /**
+     * ICU use only.
+     * @internal
+     */
+    static MeasureUnit *resolveUnitPerUnit(
+            const MeasureUnit &unit, const MeasureUnit &perUnit);
 #endif /* U_HIDE_INTERNAL_API */
 
 // All code between the "Start generated createXXX methods" comment and
 // the "End generated createXXX methods" comment is auto generated code
 // and must not be edited manually. For instructions on how to correctly
 // update this code, refer to:
-// https://sites.google.com/site/icusite/design/formatting/measureformat/updating-measure-unit
+// http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit
 //
 // Start generated createXXX methods
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of acceleration: g-force.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createGForce(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of acceleration: meter-per-second-squared.
@@ -214,36 +217,30 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createMeterPerSecondSquared(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of angle: arc-minute.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createArcMinute(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of angle: arc-second.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createArcSecond(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of angle: degree.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createDegree(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of angle: radian.
@@ -254,26 +251,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createRadian(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: acre.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createAcre(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: hectare.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createHectare(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-centimeter.
@@ -284,16 +277,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createSquareCentimeter(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-foot.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createSquareFoot(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-inch.
@@ -304,36 +295,30 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createSquareInch(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-kilometer.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createSquareKilometer(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-meter.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createSquareMeter(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-mile.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createSquareMile(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of area: square-yard.
@@ -464,26 +449,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createTerabyte(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: day.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createDay(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: hour.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createHour(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: microsecond.
@@ -494,36 +475,30 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createMicrosecond(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: millisecond.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMillisecond(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: minute.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMinute(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: month.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMonth(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: nanosecond.
@@ -534,36 +509,30 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createNanosecond(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: second.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createSecond(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: week.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createWeek(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of duration: year.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createYear(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of electric: ampere.
@@ -714,16 +683,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createAstronomicalUnit(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: centimeter.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createCentimeter(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: decimeter.
@@ -744,16 +711,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createFathom(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: foot.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createFoot(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: furlong.
@@ -764,46 +729,38 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createFurlong(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: inch.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createInch(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: kilometer.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createKilometer(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: light-year.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createLightYear(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: meter.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMeter(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: micrometer.
@@ -814,26 +771,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createMicrometer(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: mile.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMile(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: millimeter.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMillimeter(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: nanometer.
@@ -864,26 +817,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createParsec(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: picometer.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createPicometer(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of length: yard.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createYard(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of light: lux.
@@ -904,26 +853,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createCarat(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: gram.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createGram(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: kilogram.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createKilogram(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: metric-ton.
@@ -954,16 +899,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createMilligram(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: ounce.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createOunce(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: ounce-troy.
@@ -974,16 +917,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createOunceTroy(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: pound.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createPound(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of mass: stone.
@@ -1014,26 +955,22 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createGigawatt(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of power: horsepower.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createHorsepower(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of power: kilowatt.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createKilowatt(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of power: megawatt.
@@ -1054,46 +991,38 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createMilliwatt(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of power: watt.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createWatt(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of pressure: hectopascal.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createHectopascal(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of pressure: inch-hg.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createInchHg(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of pressure: millibar.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMillibar(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of pressure: millimeter-of-mercury.
@@ -1124,56 +1053,46 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createKarat(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of speed: kilometer-per-hour.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createKilometerPerHour(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of speed: meter-per-second.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMeterPerSecond(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of speed: mile-per-hour.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createMilePerHour(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of temperature: celsius.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createCelsius(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of temperature: fahrenheit.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createFahrenheit(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of temperature: kelvin.
@@ -1244,16 +1163,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createCubicInch(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: cubic-kilometer.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createCubicKilometer(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: cubic-meter.
@@ -1264,16 +1181,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createCubicMeter(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: cubic-mile.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createCubicMile(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: cubic-yard.
@@ -1334,16 +1249,14 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit *createHectoliter(UErrorCode &status);
 
 #endif /* U_HIDE_DRAFT_API */
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: liter.
      * Caller owns returned value and must free it.
      * @param status ICU error code.
-     * @draft ICU 53
+     * @stable ICU 53
      */
     static MeasureUnit *createLiter(UErrorCode &status);
 
-#endif /* U_HIDE_DRAFT_API */
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns unit of volume: megaliter.