ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / udat.h

diff --git a/icuSources/i18n/unicode/udat.h b/icuSources/i18n/unicode/udat.h
index 4eaba39b74dd2b7f422c2a273f4381fec8ef75f0..0c37866d4dd767544619e4e362a54c051034ef52 100644 (file)
--- a/icuSources/i18n/unicode/udat.h
+++ b/icuSources/i18n/unicode/udat.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
 /*
  *******************************************************************************

- * Copyright (C) 1996-2015, International Business Machines
+ * Copyright (C) 1996-2016, International Business Machines

  * Corporation and others. All Rights Reserved.
  *******************************************************************************
 */
  * Corporation and others. All Rights Reserved.
  *******************************************************************************
 */


@@ -150,7 +150,7 @@
  */
 typedef void* UDateFormat;
 
  */
 typedef void* UDateFormat;
 

-/** The possible date/time format styles 
+/** The possible date/time format styles

  *  @stable ICU 2.6
  */
 typedef enum UDateFormatStyle {
  *  @stable ICU 2.6
  */
 typedef enum UDateFormatStyle {


@@ -167,16 +167,16 @@ typedef enum UDateFormatStyle {
 
     /** Bitfield for relative date */
     UDAT_RELATIVE = (1 << 7),
 
     /** Bitfield for relative date */
     UDAT_RELATIVE = (1 << 7),

-    
+

     UDAT_FULL_RELATIVE = UDAT_FULL | UDAT_RELATIVE,
     UDAT_FULL_RELATIVE = UDAT_FULL | UDAT_RELATIVE,

-        
+

     UDAT_LONG_RELATIVE = UDAT_LONG | UDAT_RELATIVE,
     UDAT_LONG_RELATIVE = UDAT_LONG | UDAT_RELATIVE,

-    
+

     UDAT_MEDIUM_RELATIVE = UDAT_MEDIUM | UDAT_RELATIVE,
     UDAT_MEDIUM_RELATIVE = UDAT_MEDIUM | UDAT_RELATIVE,

-    
+

     UDAT_SHORT_RELATIVE = UDAT_SHORT | UDAT_RELATIVE,
     UDAT_SHORT_RELATIVE = UDAT_SHORT | UDAT_RELATIVE,

-    
-    
+
+

     /** No style */
     UDAT_NONE = -1,
 
     /** No style */
     UDAT_NONE = -1,
 


@@ -294,7 +294,7 @@ typedef enum UDateFormatStyle {
  * Used in combinations date + time, date + time + zone, or time + zone.
  * @stable ICU 4.0
  */
  * Used in combinations date + time, date + time + zone, or time + zone.
  * @stable ICU 4.0
  */

-#define UDAT_YEAR_ABBR_MONTH_WEEKDAY_DAY "yMMMEd" 
+#define UDAT_YEAR_ABBR_MONTH_WEEKDAY_DAY "yMMMEd"

 /**
  * Constant for date skeleton with year, numeric month, weekday, and day.
  * Used in combinations date + time, date + time + zone, or time + zone.
 /**
  * Constant for date skeleton with year, numeric month, weekday, and day.
  * Used in combinations date + time, date + time + zone, or time + zone.


@@ -446,7 +446,7 @@ typedef enum UDateFormatStyle {
 
 /* deprecated skeleton constants */
 
 
 /* deprecated skeleton constants */
 

-#ifndef U_HIDE_DEPRECATED_API 
+#ifndef U_HIDE_DEPRECATED_API

 /**
  * Constant for date skeleton with standalone month.
  * @deprecated ICU 50 Use UDAT_MONTH instead.
 /**
  * Constant for date skeleton with standalone month.
  * @deprecated ICU 50 Use UDAT_MONTH instead.


@@ -759,16 +759,33 @@ typedef enum UDateFormatField {
      * @internal ICU 53
      */
     UDAT_RELATED_YEAR_FIELD = 34,
      * @internal ICU 53
      */
     UDAT_RELATED_YEAR_FIELD = 34,

-#endif /* U_HIDE_INTERNAL_API */
+#endif  /* U_HIDE_INTERNAL_API */

 
 #ifndef U_HIDE_DRAFT_API
     /**
 
 #ifndef U_HIDE_DRAFT_API
     /**

-     * FieldPosition and UFieldPosition selector for ':' time separator,
-     * no corresponding UCAL_ field.
-     * @draft ICU 55
+     * FieldPosition selector for 'b' field alignment.
+     * Displays midnight and noon for 12am and 12pm, respectively, if available;
+     * otherwise fall back to AM / PM.
+     * @draft ICU 57
+     */
+    UDAT_AM_PM_MIDNIGHT_NOON_FIELD = 35,
+
+    /* FieldPosition selector for 'B' field alignment.
+     * Displays flexible day periods, such as "in the morning", if available.
+     * @draft ICU 57
+     */
+    UDAT_FLEXIBLE_DAY_PERIOD_FIELD = 36,
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_INTERNAL_API
+    /**
+     * FieldPosition and UFieldPosition selector for time separator,
+     * no corresponding UCAL_ field. No pattern character is currently
+     * defined for this.
+     * @internal

      */
      */

-    UDAT_TIME_SEPARATOR_FIELD = 35,
-#endif  /* U_HIDE_DRAFT_API */
+    UDAT_TIME_SEPARATOR_FIELD = 37,
+#endif  /* U_HIDE_INTERNAL_API */

 
    /**
      * Number of FieldPosition and UFieldPosition selectors for
 
    /**
      * Number of FieldPosition and UFieldPosition selectors for


@@ -778,11 +795,21 @@ typedef enum UDateFormatField {
      * in the future.
      * @stable ICU 3.0
      */
      * in the future.
      * @stable ICU 3.0
      */

-    UDAT_FIELD_COUNT = 36
+    UDAT_FIELD_COUNT = 38

 
 } UDateFormatField;
 
 
 
 } UDateFormatField;
 
 

+#ifndef U_HIDE_INTERNAL_API
+/**
+ * Is a pattern character defined for UDAT_TIME_SEPARATOR_FIELD?
+ * In ICU 55 it was COLON, but that was withdrawn in ICU 56.
+ * @internal ICU 56
+ */
+#define UDAT_HAS_PATTERN_CHAR_FOR_TIME_SEPARATOR 0
+#endif /* U_HIDE_INTERNAL_API */
+
+

 /**
  * Maps from a UDateFormatField to the corresponding UCalendarDateFields.
  * Note: since the mapping is many-to-one, there is no inverse mapping.
 /**
  * Maps from a UDateFormatField to the corresponding UCalendarDateFields.
  * Note: since the mapping is many-to-one, there is no inverse mapping.


@@ -823,7 +850,7 @@ udat_toCalendarDateField(UDateFormatField field);
  * an error occurred.
  * @stable ICU 2.0
  */
  * an error occurred.
  * @stable ICU 2.0
  */

-U_STABLE UDateFormat* U_EXPORT2 
+U_STABLE UDateFormat* U_EXPORT2

 udat_open(UDateFormatStyle  timeStyle,
           UDateFormatStyle  dateStyle,
           const char        *locale,
 udat_open(UDateFormatStyle  timeStyle,
           UDateFormatStyle  dateStyle,
           const char        *locale,


@@ -840,13 +867,13 @@ udat_open(UDateFormatStyle  timeStyle,
 * @param format The formatter to close.
 * @stable ICU 2.0
 */
 * @param format The formatter to close.
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_close(UDateFormat* format);
 
 
 /**
  * DateFormat boolean attributes
 udat_close(UDateFormat* format);
 
 
 /**
  * DateFormat boolean attributes

- * 
+ *

  * @stable ICU 53
  */
 typedef enum UDateFormatBooleanAttribute {
  * @stable ICU 53
  */
 typedef enum UDateFormatBooleanAttribute {


@@ -864,14 +891,15 @@ typedef enum UDateFormatBooleanAttribute {
 #ifndef U_HIDE_DRAFT_API
     /**
      * indicates tolerance of a partial literal match
 #ifndef U_HIDE_DRAFT_API
     /**
      * indicates tolerance of a partial literal match

-     * @draft ICU 53
+     * e.g. accepting "--mon-02-march-2011" for a pattern of "'--: 'EEE-WW-MMMM-yyyy"
+     * @draft ICU 56
+     */
+    UDAT_PARSE_PARTIAL_LITERAL_MATCH = 2,
+    /**
+     * indicates tolerance of pattern mismatch between input data and specified format pattern.
+     * e.g. accepting "September" for a month pattern of MMM ("Sep")
+     * @draft ICU 56

      */
      */

-    UDAT_PARSE_PARTIAL_MATCH = 2,
-    /**  
-     * indicates tolerance of pattern mismatch between input data and specified format pattern. 
-     * e.g. accepting "September" for a month pattern of MMM ("Sep")   
-     * @draft ICU 53
-     */ 

     UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH = 3,
 #endif /* U_HIDE_DRAFT_API */
     /**
     UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH = 3,
 #endif /* U_HIDE_DRAFT_API */
     /**


@@ -936,7 +964,7 @@ U_NAMESPACE_END
  * @return A pointer to a UDateFormat identical to fmt.
  * @stable ICU 2.0
  */
  * @return A pointer to a UDateFormat identical to fmt.
  * @stable ICU 2.0
  */

-U_STABLE UDateFormat* U_EXPORT2 
+U_STABLE UDateFormat* U_EXPORT2

 udat_clone(const UDateFormat *fmt,
        UErrorCode *status);
 
 udat_clone(const UDateFormat *fmt,
        UErrorCode *status);
 


@@ -958,7 +986,7 @@ udat_clone(const UDateFormat *fmt,
 * @see UFieldPosition
 * @stable ICU 2.0
 */
 * @see UFieldPosition
 * @stable ICU 2.0
 */

-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_format(    const    UDateFormat*    format,
                         UDate           dateToFormat,
                         UChar*          result,
 udat_format(    const    UDateFormat*    format,
                         UDate           dateToFormat,
                         UChar*          result,


@@ -966,7 +994,6 @@ udat_format(    const    UDateFormat*    format,
                         UFieldPosition* position,
                         UErrorCode*     status);
 
                         UFieldPosition* position,
                         UErrorCode*     status);
 

-#ifndef U_HIDE_DRAFT_API

 /**
 * Format a date using an UDateFormat.
 * The date will be formatted using the conventions specified in {@link #udat_open }
 /**
 * Format a date using an UDateFormat.
 * The date will be formatted using the conventions specified in {@link #udat_open }


@@ -987,9 +1014,9 @@ udat_format(    const    UDateFormat*    format,
 * @see udat_format
 * @see udat_parseCalendar
 * @see UFieldPosition
 * @see udat_format
 * @see udat_parseCalendar
 * @see UFieldPosition

-* @draft ICU 55
+* @stable ICU 55

 */
 */

-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2

 udat_formatCalendar(    const UDateFormat*  format,
                         UCalendar*      calendar,
                         UChar*          result,
 udat_formatCalendar(    const UDateFormat*  format,
                         UCalendar*      calendar,
                         UChar*          result,


@@ -1022,9 +1049,9 @@ udat_formatCalendar(    const UDateFormat*  format,
 *          The total buffer size needed; if greater than resultLength, the output was truncated.
 * @see udat_parse
 * @see UFieldPositionIterator
 *          The total buffer size needed; if greater than resultLength, the output was truncated.
 * @see udat_parse
 * @see UFieldPositionIterator

-* @draft ICU 55
+* @stable ICU 55

 */
 */

-U_DRAFT int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_formatForFields(   const UDateFormat* format,
                         UDate           dateToFormat,
                         UChar*          result,
 udat_formatForFields(   const UDateFormat* format,
                         UDate           dateToFormat,
                         UChar*          result,


@@ -1060,9 +1087,9 @@ udat_formatForFields(   const UDateFormat* format,
 * @see udat_format
 * @see udat_parseCalendar
 * @see UFieldPositionIterator
 * @see udat_format
 * @see udat_parseCalendar
 * @see UFieldPositionIterator

-* @draft ICU 55
+* @stable ICU 55

 */
 */

-U_DRAFT int32_t U_EXPORT2
+U_STABLE int32_t U_EXPORT2

 udat_formatCalendarForFields( const UDateFormat* format,
                         UCalendar*      calendar,
                         UChar*          result,
 udat_formatCalendarForFields( const UDateFormat* format,
                         UCalendar*      calendar,
                         UChar*          result,


@@ -1070,7 +1097,6 @@ udat_formatCalendarForFields( const UDateFormat* format,
                         UFieldPositionIterator* fpositer,
                         UErrorCode*     status);
 
                         UFieldPositionIterator* fpositer,
                         UErrorCode*     status);
 

-#endif  /* U_HIDE_DRAFT_API */

 
 /**
 * Parse a string into an date/time using a UDateFormat.
 
 /**
 * Parse a string into an date/time using a UDateFormat.


@@ -1097,7 +1123,7 @@ udat_formatCalendarForFields( const UDateFormat* format,
 * @see udat_format
 * @stable ICU 2.0
 */
 * @see udat_format
 * @stable ICU 2.0
 */

-U_STABLE UDate U_EXPORT2 
+U_STABLE UDate U_EXPORT2

 udat_parse(const    UDateFormat*    format,
            const    UChar*          text,
                     int32_t         textLength,
 udat_parse(const    UDateFormat*    format,
            const    UChar*          text,
                     int32_t         textLength,


@@ -1125,7 +1151,7 @@ udat_parse(const    UDateFormat*    format,
 * @see udat_format
 * @stable ICU 2.0
 */
 * @see udat_format
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_parseCalendar(const    UDateFormat*    format,
                             UCalendar*      calendar,
                    const    UChar*          text,
 udat_parseCalendar(const    UDateFormat*    format,
                             UCalendar*      calendar,
                    const    UChar*          text,


@@ -1142,7 +1168,7 @@ udat_parseCalendar(const    UDateFormat*    format,
 * @see udat_setLenient
 * @stable ICU 2.0
 */
 * @see udat_setLenient
 * @stable ICU 2.0
 */

-U_STABLE UBool U_EXPORT2 
+U_STABLE UBool U_EXPORT2

 udat_isLenient(const UDateFormat* fmt);
 
 /**
 udat_isLenient(const UDateFormat* fmt);
 
 /**


@@ -1154,7 +1180,7 @@ udat_isLenient(const UDateFormat* fmt);
 * @see dat_isLenient
 * @stable ICU 2.0
 */
 * @see dat_isLenient
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_setLenient(    UDateFormat*    fmt,
                     UBool          isLenient);
 
 udat_setLenient(    UDateFormat*    fmt,
                     UBool          isLenient);
 


@@ -1167,7 +1193,7 @@ udat_setLenient(    UDateFormat*    fmt,
 * @see udat_setCalendar
 * @stable ICU 2.0
 */
 * @see udat_setCalendar
 * @stable ICU 2.0
 */

-U_STABLE const UCalendar* U_EXPORT2 
+U_STABLE const UCalendar* U_EXPORT2

 udat_getCalendar(const UDateFormat* fmt);
 
 /**
 udat_getCalendar(const UDateFormat* fmt);
 
 /**


@@ -1179,7 +1205,7 @@ udat_getCalendar(const UDateFormat* fmt);
 * @see udat_setCalendar
 * @stable ICU 2.0
 */
 * @see udat_setCalendar
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_setCalendar(            UDateFormat*    fmt,
                     const   UCalendar*      calendarToSet);
 
 udat_setCalendar(            UDateFormat*    fmt,
                     const   UCalendar*      calendarToSet);
 


@@ -1192,10 +1218,9 @@ udat_setCalendar(            UDateFormat*    fmt,
 * @see udat_setNumberFormat
 * @stable ICU 2.0
 */
 * @see udat_setNumberFormat
 * @stable ICU 2.0
 */

-U_STABLE const UNumberFormat* U_EXPORT2 
+U_STABLE const UNumberFormat* U_EXPORT2

 udat_getNumberFormat(const UDateFormat* fmt);
 
 udat_getNumberFormat(const UDateFormat* fmt);
 

-#ifndef U_HIDE_DRAFT_API

 /**
 * Get the UNumberFormat for specific field associated with an UDateFormat.
 * For example: 'y' for year and 'M' for month
 /**
 * Get the UNumberFormat for specific field associated with an UDateFormat.
 * For example: 'y' for year and 'M' for month


@@ -1203,16 +1228,16 @@ udat_getNumberFormat(const UDateFormat* fmt);
 * @param field the field to query
 * @return A pointer to the UNumberFormat used by fmt to format field numbers.
 * @see udat_setNumberFormatForField
 * @param field the field to query
 * @return A pointer to the UNumberFormat used by fmt to format field numbers.
 * @see udat_setNumberFormatForField

-* @draft ICU 54
+* @stable ICU 54

 */
 */

-U_DRAFT const UNumberFormat* U_EXPORT2 
+U_STABLE const UNumberFormat* U_EXPORT2

 udat_getNumberFormatForField(const UDateFormat* fmt, UChar field);
 
 /**
 * Set the UNumberFormat for specific field associated with an UDateFormat.
 * It can be a single field like: "y"(year) or "M"(month)
 * It can be several field combined together: "yM"(year and month)
 udat_getNumberFormatForField(const UDateFormat* fmt, UChar field);
 
 /**
 * Set the UNumberFormat for specific field associated with an UDateFormat.
 * It can be a single field like: "y"(year) or "M"(month)
 * It can be several field combined together: "yM"(year and month)

-* Note: 
+* Note:

 * 1 symbol field is enough for multiple symbol field (so "y" will override "yy", "yyy")
 * If the field is not numeric, then override has no effect (like "MMM" will use abbreviation, not numerical field)
 *
 * 1 symbol field is enough for multiple symbol field (so "y" will override "yy", "yyy")
 * If the field is not numeric, then override has no effect (like "MMM" will use abbreviation, not numerical field)
 *


@@ -1221,32 +1246,28 @@ udat_getNumberFormatForField(const UDateFormat* fmt, UChar field);
 * @param numberFormatToSet A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @param status error code passed around (memory allocation or invalid fields)
 * @see udat_getNumberFormatForField
 * @param numberFormatToSet A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @param status error code passed around (memory allocation or invalid fields)
 * @see udat_getNumberFormatForField

-* @draft ICU 54
+* @stable ICU 54

 */
 */

-U_DRAFT void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_adoptNumberFormatForFields(  UDateFormat* fmt,
                             const UChar* fields,
                                   UNumberFormat*  numberFormatToSet,
                                   UErrorCode* status);
 udat_adoptNumberFormatForFields(  UDateFormat* fmt,
                             const UChar* fields,
                                   UNumberFormat*  numberFormatToSet,
                                   UErrorCode* status);

-#endif  /* U_HIDE_DRAFT_API */
-

 /**
 * Set the UNumberFormat associated with an UDateFormat.
 * A UDateFormat uses a UNumberFormat to format numbers within a date,
 * for example the day number.
 /**
 * Set the UNumberFormat associated with an UDateFormat.
 * A UDateFormat uses a UNumberFormat to format numbers within a date,
 * for example the day number.

-* This method also clears per field NumberFormat instances previously 
-* set by {@see udat_setNumberFormatForField} 
+* This method also clears per field NumberFormat instances previously
+* set by {@see udat_setNumberFormatForField}

 * @param fmt The formatter to set.
 * @param numberFormatToSet A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @see udat_getNumberFormat
 * @see udat_setNumberFormatForField
 * @stable ICU 2.0
 */
 * @param fmt The formatter to set.
 * @param numberFormatToSet A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @see udat_getNumberFormat
 * @see udat_setNumberFormatForField
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_setNumberFormat(            UDateFormat*    fmt,
                         const   UNumberFormat*  numberFormatToSet);
 udat_setNumberFormat(            UDateFormat*    fmt,
                         const   UNumberFormat*  numberFormatToSet);

-
-#ifndef U_HIDE_DRAFT_API

 /**
 * Adopt the UNumberFormat associated with an UDateFormat.
 * A UDateFormat uses a UNumberFormat to format numbers within a date,
 /**
 * Adopt the UNumberFormat associated with an UDateFormat.
 * A UDateFormat uses a UNumberFormat to format numbers within a date,


@@ -1254,13 +1275,11 @@ udat_setNumberFormat(            UDateFormat*    fmt,
 * @param fmt The formatter to set.
 * @param numberFormatToAdopt A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @see udat_getNumberFormat
 * @param fmt The formatter to set.
 * @param numberFormatToAdopt A pointer to the UNumberFormat to be used by fmt to format numbers.
 * @see udat_getNumberFormat

-* @draft ICU 54
+* @stable ICU 54

 */
 */

-U_DRAFT void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_adoptNumberFormat(            UDateFormat*    fmt,
                                    UNumberFormat*  numberFormatToAdopt);
 udat_adoptNumberFormat(            UDateFormat*    fmt,
                                    UNumberFormat*  numberFormatToAdopt);

-#endif  /* U_HIDE_DRAFT_API */
-

 /**
 * Get a locale for which date/time formatting patterns are available.
 * A UDateFormat in a locale returned by this function will perform the correct
 /**
 * Get a locale for which date/time formatting patterns are available.
 * A UDateFormat in a locale returned by this function will perform the correct


@@ -1270,7 +1289,7 @@ udat_adoptNumberFormat(            UDateFormat*    fmt,
 * @see udat_countAvailable
 * @stable ICU 2.0
 */
 * @see udat_countAvailable
 * @stable ICU 2.0
 */

-U_STABLE const char* U_EXPORT2 
+U_STABLE const char* U_EXPORT2

 udat_getAvailable(int32_t localeIndex);
 
 /**
 udat_getAvailable(int32_t localeIndex);
 
 /**


@@ -1281,7 +1300,7 @@ udat_getAvailable(int32_t localeIndex);
 * @see udat_getAvailable
 * @stable ICU 2.0
 */
 * @see udat_getAvailable
 * @stable ICU 2.0
 */

-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_countAvailable(void);
 
 /**
 udat_countAvailable(void);
 
 /**


@@ -1294,7 +1313,7 @@ udat_countAvailable(void);
 * @see udat_Set2DigitYearStart
 * @stable ICU 2.0
 */
 * @see udat_Set2DigitYearStart
 * @stable ICU 2.0
 */

-U_STABLE UDate U_EXPORT2 
+U_STABLE UDate U_EXPORT2

 udat_get2DigitYearStart(    const   UDateFormat     *fmt,
                                     UErrorCode      *status);
 
 udat_get2DigitYearStart(    const   UDateFormat     *fmt,
                                     UErrorCode      *status);
 


@@ -1308,7 +1327,7 @@ udat_get2DigitYearStart(    const   UDateFormat     *fmt,
 * @see udat_Set2DigitYearStart
 * @stable ICU 2.0
 */
 * @see udat_Set2DigitYearStart
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_set2DigitYearStart(    UDateFormat     *fmt,
                             UDate           d,
                             UErrorCode      *status);
 udat_set2DigitYearStart(    UDateFormat     *fmt,
                             UDate           d,
                             UErrorCode      *status);


@@ -1325,7 +1344,7 @@ udat_set2DigitYearStart(    UDateFormat     *fmt,
 * @see udat_applyPattern
 * @stable ICU 2.0
 */
 * @see udat_applyPattern
 * @stable ICU 2.0
 */

-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_toPattern(    const   UDateFormat     *fmt,
                         UBool          localized,
                         UChar           *result,
 udat_toPattern(    const   UDateFormat     *fmt,
                         UBool          localized,
                         UChar           *result,


@@ -1342,14 +1361,14 @@ udat_toPattern(    const   UDateFormat     *fmt,
 * @see udat_toPattern
 * @stable ICU 2.0
 */
 * @see udat_toPattern
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_applyPattern(            UDateFormat     *format,
                             UBool          localized,
                     const   UChar           *pattern,
                             int32_t         patternLength);
 
 udat_applyPattern(            UDateFormat     *format,
                             UBool          localized,
                     const   UChar           *pattern,
                             int32_t         patternLength);
 

-/** 
- * The possible types of date format symbols 
+/**
+ * The possible types of date format symbols

  * @stable ICU 2.6
  */
 typedef enum UDateFormatSymbolType {
  * @stable ICU 2.6
  */
 typedef enum UDateFormatSymbolType {


@@ -1408,44 +1427,41 @@ typedef enum UDateFormatSymbolType {
      * Standalone version of UDAT_SHORTER_WEEKDAYS.
      * @stable ICU 51
      */
      * Standalone version of UDAT_SHORTER_WEEKDAYS.
      * @stable ICU 51
      */

-    UDAT_STANDALONE_SHORTER_WEEKDAYS
-#ifndef U_HIDE_DRAFT_API
-    ,
+    UDAT_STANDALONE_SHORTER_WEEKDAYS,

     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_CYCLIC_YEARS_WIDE)
     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_CYCLIC_YEARS_WIDE)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_CYCLIC_YEARS_WIDE,
     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage)
      */
     UDAT_CYCLIC_YEARS_WIDE,
     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_CYCLIC_YEARS_ABBREVIATED,
     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_CYCLIC_YEARS_NARROW)
      */
     UDAT_CYCLIC_YEARS_ABBREVIATED,
     /**
      * Cyclic year names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_CYCLIC_YEARS_NARROW)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_CYCLIC_YEARS_NARROW,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_ZODIAC_NAMES_WIDE)
      */
     UDAT_CYCLIC_YEARS_NARROW,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_ZODIAC_NAMES_WIDE)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_ZODIAC_NAMES_WIDE,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage)
      */
     UDAT_ZODIAC_NAMES_WIDE,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_ZODIAC_NAMES_ABBREVIATED,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_ZODIAC_NAMES_NARROW)
      */
     UDAT_ZODIAC_NAMES_ABBREVIATED,
     /**
      * Calendar zodiac  names (only supported for some calendars, and only for FORMAT usage;
      * udat_setSymbols not supported for UDAT_ZODIAC_NAMES_NARROW)

-     * @draft ICU 54
+     * @stable ICU 54

      */
     UDAT_ZODIAC_NAMES_NARROW
      */
     UDAT_ZODIAC_NAMES_NARROW

-#endif  /* U_HIDE_DRAFT_API */

 #ifndef U_HIDE_INTERNAL_API
     ,
     /**
 #ifndef U_HIDE_INTERNAL_API
     ,
     /**


@@ -1481,7 +1497,7 @@ typedef struct UDateFormatSymbols UDateFormatSymbols;
 * @see udat_setSymbols
 * @stable ICU 2.0
 */
 * @see udat_setSymbols
 * @stable ICU 2.0
 */

-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_getSymbols(const   UDateFormat             *fmt,
                         UDateFormatSymbolType   type,
                         int32_t                 symbolIndex,
 udat_getSymbols(const   UDateFormat             *fmt,
                         UDateFormatSymbolType   type,
                         int32_t                 symbolIndex,


@@ -1501,7 +1517,7 @@ udat_getSymbols(const   UDateFormat             *fmt,
 * @see udat_setSymbols
 * @stable ICU 2.0
 */
 * @see udat_setSymbols
 * @stable ICU 2.0
 */

-U_STABLE int32_t U_EXPORT2 
+U_STABLE int32_t U_EXPORT2

 udat_countSymbols(    const    UDateFormat                *fmt,
                             UDateFormatSymbolType    type);
 
 udat_countSymbols(    const    UDateFormat                *fmt,
                             UDateFormatSymbolType    type);
 


@@ -1520,7 +1536,7 @@ udat_countSymbols(    const    UDateFormat                *fmt,
 * @see udat_countSymbols
 * @stable ICU 2.0
 */
 * @see udat_countSymbols
 * @stable ICU 2.0
 */

-U_STABLE void U_EXPORT2 
+U_STABLE void U_EXPORT2

 udat_setSymbols(    UDateFormat             *format,
                     UDateFormatSymbolType   type,
                     int32_t                 symbolIndex,
 udat_setSymbols(    UDateFormat             *format,
                     UDateFormatSymbolType   type,
                     int32_t                 symbolIndex,


@@ -1532,7 +1548,7 @@ udat_setSymbols(    UDateFormat             *format,
  * Get the locale for this date format object.
  * You can choose between valid and actual locale.
  * @param fmt The formatter to get the locale from
  * Get the locale for this date format object.
  * You can choose between valid and actual locale.
  * @param fmt The formatter to get the locale from

- * @param type type of the locale we're looking for (valid or actual) 
+ * @param type type of the locale we're looking for (valid or actual)

  * @param status error code for the operation
  * @return the locale name
  * @stable ICU 2.8
  * @param status error code for the operation
  * @return the locale name
  * @stable ICU 2.8


@@ -1540,7 +1556,7 @@ udat_setSymbols(    UDateFormat             *format,
 U_STABLE const char* U_EXPORT2
 udat_getLocaleByType(const UDateFormat *fmt,
                      ULocDataLocaleType type,
 U_STABLE const char* U_EXPORT2
 udat_getLocaleByType(const UDateFormat *fmt,
                      ULocDataLocaleType type,

-                     UErrorCode* status); 
+                     UErrorCode* status);

 
 /**
  * Set a particular UDisplayContext value in the formatter, such as
 
 /**
  * Set a particular UDisplayContext value in the formatter, such as


@@ -1577,7 +1593,7 @@ udat_getContext(const UDateFormat* fmt, UDisplayContextType type, UErrorCode* st
 * @see udat_applyPatternRelative
 * @internal ICU 4.2 technology preview
 */
 * @see udat_applyPatternRelative
 * @internal ICU 4.2 technology preview
 */

-U_INTERNAL int32_t U_EXPORT2 
+U_INTERNAL int32_t U_EXPORT2

 udat_toPatternRelativeDate(const UDateFormat *fmt,
                            UChar             *result,
                            int32_t           resultLength,
 udat_toPatternRelativeDate(const UDateFormat *fmt,
                            UChar             *result,
                            int32_t           resultLength,


@@ -1594,7 +1610,7 @@ udat_toPatternRelativeDate(const UDateFormat *fmt,
 * @see udat_applyPatternRelative
 * @internal ICU 4.2 technology preview
 */
 * @see udat_applyPatternRelative
 * @internal ICU 4.2 technology preview
 */

-U_INTERNAL int32_t U_EXPORT2 
+U_INTERNAL int32_t U_EXPORT2

 udat_toPatternRelativeTime(const UDateFormat *fmt,
                            UChar             *result,
                            int32_t           resultLength,
 udat_toPatternRelativeTime(const UDateFormat *fmt,
                            UChar             *result,
                            int32_t           resultLength,


@@ -1612,7 +1628,7 @@ udat_toPatternRelativeTime(const UDateFormat *fmt,
 * @see udat_toPatternRelativeDate, udat_toPatternRelativeTime
 * @internal ICU 4.2 technology preview
 */
 * @see udat_toPatternRelativeDate, udat_toPatternRelativeTime
 * @internal ICU 4.2 technology preview
 */

-U_INTERNAL void U_EXPORT2 
+U_INTERNAL void U_EXPORT2

 udat_applyPatternRelative(UDateFormat *format,
                           const UChar *datePattern,
                           int32_t     datePatternLength,
 udat_applyPatternRelative(UDateFormat *format,
                           const UChar *datePattern,
                           int32_t     datePatternLength,