ICU-66108.tar.gz

[apple/icu.git] / icuSources / common / unicode / uchar.h

diff --git a/icuSources/common/unicode/uchar.h b/icuSources/common/unicode/uchar.h
index 2d2c5c33d72e1f0efa188d2d707272d620cc8b82..3b55b2326dfc1f83ef95644baa1d4f659b951839 100644 (file)
--- a/icuSources/common/unicode/uchar.h
+++ b/icuSources/common/unicode/uchar.h
@@ -60,7 +60,7 @@ U_CDECL_BEGIN
  * @see u_getUnicodeVersion
  * @stable ICU 2.0
  */
-#define U_UNICODE_VERSION "12.1"
+#define U_UNICODE_VERSION "13.0"
 
 /**
  * \file
@@ -1788,6 +1788,25 @@ enum UBlockCode {
     /** @stable ICU 64 */
     UBLOCK_WANCHO = 300, /*[1E2C0]*/
 
+    // New blocks in Unicode 13.0
+
+    /** @stable ICU 66 */
+    UBLOCK_CHORASMIAN = 301, /*[10FB0]*/
+    /** @stable ICU 66 */
+    UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G = 302, /*[30000]*/
+    /** @stable ICU 66 */
+    UBLOCK_DIVES_AKURU = 303, /*[11900]*/
+    /** @stable ICU 66 */
+    UBLOCK_KHITAN_SMALL_SCRIPT = 304, /*[18B00]*/
+    /** @stable ICU 66 */
+    UBLOCK_LISU_SUPPLEMENT = 305, /*[11FB0]*/
+    /** @stable ICU 66 */
+    UBLOCK_SYMBOLS_FOR_LEGACY_COMPUTING = 306, /*[1FB00]*/
+    /** @stable ICU 66 */
+    UBLOCK_TANGUT_SUPPLEMENT = 307, /*[18D00]*/
+    /** @stable ICU 66 */
+    UBLOCK_YEZIDI = 308, /*[10E80]*/
+
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal UBlockCode value.
@@ -1795,7 +1814,7 @@ enum UBlockCode {
      *
      * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
-    UBLOCK_COUNT = 301,
+    UBLOCK_COUNT = 309,
 #endif  // U_HIDE_DEPRECATED_API
 
     /** @stable ICU 2.0 */
@@ -2436,6 +2455,8 @@ typedef enum UIndicPositionalCategory {
     U_INPC_TOP_AND_RIGHT,
     /** @stable ICU 63 */
     U_INPC_VISUAL_ORDER_LEFT,
+    /** @stable ICU 66 */
+    U_INPC_TOP_AND_BOTTOM_AND_LEFT,
 } UIndicPositionalCategory;
 
 /**
@@ -2578,8 +2599,6 @@ typedef enum UVerticalOrientation {
 U_STABLE UBool U_EXPORT2
 u_hasBinaryProperty(UChar32 c, UProperty which);
 
-#ifndef U_HIDE_DRAFT_API
-
 /**
  * Returns a frozen USet for a binary property.
  * The library retains ownership over the returned object.
@@ -2593,13 +2612,11 @@ u_hasBinaryProperty(UChar32 c, UProperty which);
  * @see UProperty
  * @see u_hasBinaryProperty
  * @see Unicode::fromUSet
- * @draft ICU 63
+ * @stable ICU 63
  */
 U_CAPI const USet * U_EXPORT2
 u_getBinaryPropertySet(UProperty property, UErrorCode *pErrorCode);
 
-#endif  // U_HIDE_DRAFT_API
-
 /**
  * Check if a code point has the Alphabetic Unicode property.
  * Same as u_hasBinaryProperty(c, UCHAR_ALPHABETIC).
@@ -2757,8 +2774,6 @@ u_getIntPropertyMinValue(UProperty which);
 U_STABLE int32_t U_EXPORT2
 u_getIntPropertyMaxValue(UProperty which);
 
-#ifndef U_HIDE_DRAFT_API
-
 /**
  * Returns an immutable UCPMap for an enumerated/catalog/int-valued property.
  * The library retains ownership over the returned object.
@@ -2772,13 +2787,11 @@ u_getIntPropertyMaxValue(UProperty which);
  * @return the property as a map
  * @see UProperty
  * @see u_getIntPropertyValue
- * @draft ICU 63
+ * @stable ICU 63
  */
 U_CAPI const UCPMap * U_EXPORT2
 u_getIntPropertyMap(UProperty property, UErrorCode *pErrorCode);
 
-#endif  // U_HIDE_DRAFT_API
-
 /**
  * Get the numeric value for a Unicode code point as defined in the
  * Unicode Character Database.
@@ -3197,15 +3210,14 @@ U_STABLE UBool U_EXPORT2
 u_isprint(UChar32 c);
 
 /**
- * Determines whether the specified code point is a base character.
+ * Non-standard: Determines whether the specified code point is a base character.
  * True for general categories "L" (letters), "N" (numbers),
  * "Mc" (spacing combining marks), and "Me" (enclosing marks).
  *
- * Note that this is different from the definition in the Unicode
- * Standard section 3.6, conformance clause D51,
- * which defines base characters to be all characters (not Cn)
- * that do not graphically combine with preceding characters (M)
- * and that are neither control (Cc) or format (Cf) characters.
+ * Note that this is different from the Unicode Standard definition in
+ * chapter 3.6, conformance clause D51 “Base character”,
+ * which defines base characters as the code points with general categories
+ * Letter (L), Number (N), Punctuation (P), Symbol (S), or Space Separator (Zs).
  *
  * @param c the code point to be tested
  * @return TRUE if the code point is a base character according to this function