From e6a0df52eeede89ee095c09c293bc12e35dd3ed3 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Sat, 28 May 2005 22:54:36 +0000
Subject: [PATCH] ICU-4199 enum/name API support for C/POSIX character classes,
 and UnicodeSet support for [:Assigned:]

X-SVN-Rev: 17730
---
 icu4c/source/common/uchar.c                   |   57 +-
 icu4c/source/common/unicode/uchar.h           |   55 +-
 icu4c/source/common/unicode/uniset.h          |    3 +-
 icu4c/source/common/unicode/uset.h            |    3 +-
 icu4c/source/common/uniset_props.cpp          |   69 +-
 icu4c/source/common/uprops.c                  |   27 +-
 icu4c/source/common/uprops.h                  |   27 +
 icu4c/source/test/intltest/usettest.cpp       |   65 +-
 .../genpname/SyntheticPropertyAliases.txt     |   10 +-
 icu4c/source/tools/genpname/data.h            | 2131 +++++++++--------
 icu4c/source/tools/genpname/preparse.pl       |   27 +-
 11 files changed, 1299 insertions(+), 1175 deletions(-)

diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c
index 5f3a656bb2..5b00a493e6 100644
--- a/icu4c/source/common/uchar.c
+++ b/icu4c/source/common/uchar.c
@@ -504,7 +504,7 @@ u_isUAlphabetic(UChar32 c) {
     return (u_getUnicodeProperties(c, 1)&U_MASK(UPROPS_ALPHABETIC))!=0;
 }
 
-/* Checks if ch is a letter or a decimal digit */
+/* Checks if c is a letter or a decimal digit */
 U_CAPI UBool U_EXPORT2
 u_isalnum(UChar32 c) {
     uint32_t props;
@@ -512,6 +512,15 @@ u_isalnum(UChar32 c) {
     return (UBool)((CAT_MASK(props)&(U_GC_L_MASK|U_GC_ND_MASK))!=0);
 }
 
+/**
+ * Checks if c is alphabetic, or a decimal digit; implements UCHAR_POSIX_ALNUM.
+ * @internal
+ */
+U_CFUNC UBool
+u_isalnumPOSIX(UChar32 c) {
+    return (UBool)(u_isUAlphabetic(c) || u_isdigit(c));
+}
+
 /* Checks if ch is a unicode character with assigned character type.*/
 U_CAPI UBool U_EXPORT2
 u_isdefined(UChar32 c) {
@@ -577,8 +586,10 @@ u_isblank(UChar32 c) {
     if((uint32_t)c<=0x9f) {
         return c==9 || c==0x20; /* TAB or SPACE */
     } else {
-        /* White_Space but not LS (Zl) or PS (Zp) */
-        return u_isUWhiteSpace(c) && ((c&0xfffffffe)!=0x2028);
+        /* Zs */
+        uint32_t props;
+        GET_PROPS(c, props);
+        return (UBool)(GET_CATEGORY(props)==U_SPACE_SEPARATOR);
     }
 }
 
@@ -596,6 +607,22 @@ u_isprint(UChar32 c) {
     return (UBool)((CAT_MASK(props)&U_GC_C_MASK)==0);
 }
 
+/**
+ * Checks if c is in \p{graph}\p{blank} - \p{cntrl}.
+ * Implements UCHAR_POSIX_PRINT.
+ * @internal
+ */
+U_CFUNC UBool
+u_isprintPOSIX(UChar32 c) {
+    uint32_t props;
+    GET_PROPS(c, props);
+    /*
+     * The only cntrl character in graph+blank is TAB (in blank).
+     * Here we implement (blank-TAB)=Zs instead of calling u_isblank().
+     */
+    return (UBool)((GET_CATEGORY(props)==U_SPACE_SEPARATOR) || u_isgraphPOSIX(c));
+}
+
 U_CAPI UBool U_EXPORT2
 u_isgraph(UChar32 c) {
     uint32_t props;
@@ -606,6 +633,24 @@ u_isgraph(UChar32 c) {
                    ==0);
 }
 
+/**
+ * Checks if c is in
+ * [^\p{space}\p{gc=Control}\p{gc=Surrogate}\p{gc=Unassigned}]
+ * with space=\p{Whitespace} and Control=Cc.
+ * Implements UCHAR_POSIX_GRAPH.
+ * @internal
+ */
+U_CFUNC UBool
+u_isgraphPOSIX(UChar32 c) {
+    uint32_t props;
+    GET_PROPS(c, props);
+    /* \p{space}\p{gc=Control} == \p{gc=Z}\p{Control} */
+    /* comparing ==0 returns FALSE for the categories mentioned */
+    return (UBool)((CAT_MASK(props)&
+                    (U_GC_CC_MASK|U_GC_CS_MASK|U_GC_CN_MASK|U_GC_Z_MASK))
+                   ==0);
+}
+
 U_CAPI UBool U_EXPORT2
 u_ispunct(UChar32 c) {
     uint32_t props;
@@ -1003,9 +1048,11 @@ uchar_addPropertyStarts(const USetAdder *sa, UErrorCode *pErrorCode) {
 
     /* add code points with hardcoded properties, plus the ones following them */
 
+    /* add for u_isblank() */
+    USET_ADD_CP_AND_NEXT(sa, TAB);
+
     /* add for IS_THAT_CONTROL_SPACE() */
-    sa->add(sa->set, TAB); /* range TAB..CR */
-    sa->add(sa->set, CR+1);
+    sa->add(sa->set, CR+1); /* range TAB..CR */
     sa->add(sa->set, 0x1c);
     sa->add(sa->set, 0x1f+1);
     USET_ADD_CP_AND_NEXT(sa, NL);
diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h
index c868b9ec67..16a64342ac 100644
--- a/icu4c/source/common/unicode/uchar.h
+++ b/icu4c/source/common/unicode/uchar.h
@@ -77,12 +77,31 @@ U_CDECL_BEGIN
  * (In ICU, BreakIterator is the most sophisticated API for word boundaries.)
  * Another example: There is no "istitle()" class for titlecase characters.
  *
- * A summary of the behavior of some C/POSIX character classification implementations
- * for Unicode is available at http://oss.software.ibm.com/cvs/icu/~checkout~/icuhtml/design/posix_classes.html
+ * ICU 3.4 and later provides API access for all twelve C/POSIX character classes.
+ * ICU implements them according to the Standard Recommendations in
+ * Annex C: Compatibility Properties of UTS #18 Unicode Regular Expressions
+ * (http://www.unicode.org/reports/tr18/#Compatibility_Properties).
  *
- * <strong>Important</strong>:
- * The behavior of the ICU C/POSIX-style character classification
- * functions is subject to change according to discussion of the above summary.
+ * API access for C/POSIX character classes is as follows:
+ * - alpha:     u_isUAlphabetic(c) or u_hasBinaryProperty(c, UCHAR_ALPHABETIC)
+ * - lower:     u_isULowercase(c) or u_hasBinaryProperty(c, UCHAR_LOWERCASE)
+ * - upper:     u_isUUppercase(c) or u_hasBinaryProperty(c, UCHAR_UPPERCASE)
+ * - punct:     u_ispunct(c)
+ * - digit:     u_charType(c)==U_DECIMAL_DIGIT_NUMBER
+ * - xdigit:    u_isxdigit(c) or u_hasBinaryProperty(c, UCHAR_POSIX_XDIGIT)
+ * - alnum:     u_hasBinaryProperty(c, UCHAR_POSIX_ALNUM)
+ * - space:     u_isUWhiteSpace(c) or u_hasBinaryProperty(c, UCHAR_WHITE_SPACE)
+ * - blank:     u_isblank(c) or u_hasBinaryProperty(c, UCHAR_POSIX_BLANK)
+ * - cntrl:     u_charType(c)==U_CONTROL_CHAR
+ * - graph:     u_hasBinaryProperty(c, UCHAR_POSIX_GRAPH)
+ * - print:     u_hasBinaryProperty(c, UCHAR_POSIX_PRINT)
+ *
+ * Note: Some of the u_isxyz() functions in uchar.h predate, and do not match,
+ * the Standard Recommendations in UTS #18. Instead, they match Java
+ * functions according to their API documentation.
+ *
+ * The C/POSIX character classes are also available in UnicodeSet patterns,
+ * using patterns like [:graph:] or \p{graph}.
  *
  * Note: There are several ICU whitespace functions.
  * Comparison:
@@ -368,6 +387,31 @@ typedef enum UProperty {
         (http://www.unicode.org/reports/tr31/)
         @draft ICU 3.4 */
     UCHAR_PATTERN_WHITE_SPACE,
+    /** Binary property alnum (a C/POSIX character class).
+        Implemented according to the UTS #18 Annex C Standard Recommendation.
+        See the uchar.h file documentation.
+        @draft ICU 3.4 */
+    UCHAR_POSIX_ALNUM,
+    /** Binary property blank (a C/POSIX character class).
+        Implemented according to the UTS #18 Annex C Standard Recommendation.
+        See the uchar.h file documentation.
+        @draft ICU 3.4 */
+    UCHAR_POSIX_BLANK,
+    /** Binary property graph (a C/POSIX character class).
+        Implemented according to the UTS #18 Annex C Standard Recommendation.
+        See the uchar.h file documentation.
+        @draft ICU 3.4 */
+    UCHAR_POSIX_GRAPH,
+    /** Binary property print (a C/POSIX character class).
+        Implemented according to the UTS #18 Annex C Standard Recommendation.
+        See the uchar.h file documentation.
+        @draft ICU 3.4 */
+    UCHAR_POSIX_PRINT,
+    /** Binary property xdigit (a C/POSIX character class).
+        Implemented according to the UTS #18 Annex C Standard Recommendation.
+        See the uchar.h file documentation.
+        @draft ICU 3.4 */
+    UCHAR_POSIX_XDIGIT,
     /** One more than the last constant for binary Unicode properties. @stable ICU 2.1 */
     UCHAR_BINARY_LIMIT,
 
@@ -1739,7 +1783,6 @@ u_getNumericValue(UChar32 c);
  * @see UCHAR_LOWERCASE
  * @see u_isupper
  * @see u_istitle
- * @see u_islower
  * @stable ICU 2.0
  */
 U_STABLE UBool U_EXPORT2
diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h
index 9e45b52f1c..639305e7c3 100644
--- a/icu4c/source/common/unicode/uniset.h
+++ b/icu4c/source/common/unicode/uniset.h
@@ -569,7 +569,8 @@ public:
      * correspond to the following sets:
      *
      * "ANY" = [\\u0000-\\U0010FFFF],
-     * "ASCII" = [\\u0000-\\u007F].
+     * "ASCII" = [\\u0000-\\u007F],
+     * "Assigned" = [:^Cn:].
      *
      * @param value a value alias, either short or long.  The name is matched
      * loosely.  See PropertyValueAliases.txt for names and a description of
diff --git a/icu4c/source/common/unicode/uset.h b/icu4c/source/common/unicode/uset.h
index 6a243d7fbe..9a2066c943 100644
--- a/icu4c/source/common/unicode/uset.h
+++ b/icu4c/source/common/unicode/uset.h
@@ -265,7 +265,8 @@ uset_applyIntPropertyValue(USet* set,
  * matched loosely and correspond to the following sets:
  *
  * "ANY" = [\\u0000-\\U0010FFFF],
- * "ASCII" = [\\u0000-\\u007F].
+ * "ASCII" = [\\u0000-\\u007F],
+ * "Assigned" = [:^Cn:].
  *
  * @param propLength the length of the prop, or -1 if NULL
  *
diff --git a/icu4c/source/common/uniset_props.cpp b/icu4c/source/common/uniset_props.cpp
index 069c59fe2f..590c5a84b1 100644
--- a/icu4c/source/common/uniset_props.cpp
+++ b/icu4c/source/common/uniset_props.cpp
@@ -77,42 +77,12 @@ static const UChar HYPHEN_RIGHT_BRACE[] = {HYPHEN,SET_CLOSE,0}; /*-]*/
 // Special property set IDs
 static const char ANY[]   = "ANY";   // [\u0000-\U0010FFFF]
 static const char ASCII[] = "ASCII"; // [\u0000-\u007F]
+static const char ASSIGNED[] = "Assigned"; // [:^Cn:]
 
 // Unicode name property alias
 #define NAME_PROP "na"
 #define NAME_PROP_LENGTH 2
 
-// TODO: Remove the following special-case code when
-// these four C99-compatibility properties are implemented
-// as enums/names.
-U_CDECL_BEGIN
-    typedef UBool (U_CALLCONV *C99_Property_Function)(UChar32);
-U_CDECL_END
-static const struct C99_Map {
-    const char* name;
-    C99_Property_Function func;
-    UPropertySource src;
-} C99_DISPATCH[] = {
-    // These three entries omitted; they clash with PropertyAliases
-    // names for Unicode properties, so UnicodeSet already maps them
-    // to those properties.
-    //{ "alpha", u_isalpha, UPROPS_SRC_PROPSVEC },
-    //{ "lower", u_islower, UPROPS_SRC_CASE },
-    //{ "upper", u_isupper, UPROPS_SRC_CASE },
-
-    // MUST be in SORTED order
-    { "alnum", u_isalnum, UPROPS_SRC_CHAR },
-    { "blank", u_isblank, UPROPS_SRC_PROPSVEC },
-    // new alias in Unicode 4.1 { "cntrl", u_iscntrl, UPROPS_SRC_CHAR },
-    // new alias in Unicode 4.1 { "digit", u_isdigit, UPROPS_SRC_CHAR },
-    { "graph", u_isgraph, UPROPS_SRC_CHAR },
-    { "print", u_isprint, UPROPS_SRC_CHAR },
-    // new alias in Unicode 4.1 { "punct", u_ispunct, UPROPS_SRC_CHAR },
-    // new alias in Unicode 4.1 { "space", u_isspace, UPROPS_SRC_CHAR },
-    { "title", u_istitle, UPROPS_SRC_CHAR },
-    { "xdigit", u_isxdigit, UPROPS_SRC_CHAR }
-};
-
 // TEMPORARY: Remove when deprecated category code constructor is removed.
 static const UChar CATEGORY_NAMES[] = {
     // Must be kept in sync with uchar.h/UCharCategory
@@ -931,14 +901,6 @@ static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) {
 
 #define FAIL(ec) {ec=U_ILLEGAL_ARGUMENT_ERROR; return *this;}
 
-// TODO: Remove the following special-case code when
-// these four C99-compatibility properties are implemented
-// as enums/names.
-static UBool c99Filter(UChar32 ch, void* context) {
-    struct C99_Map* m = (struct C99_Map*) context;
-    return m->func(ch);
-}
-
 UnicodeSet&
 UnicodeSet::applyIntPropertyValue(UProperty prop, int32_t value, UErrorCode& ec) {
     if (U_FAILURE(ec)) return *this;
@@ -974,7 +936,7 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop,
 
     UProperty p;
     int32_t v;
-    UBool mustNotBeEmpty = FALSE;
+    UBool mustNotBeEmpty = FALSE, invert = FALSE;
 
     if (value.length() > 0) {
         p = u_getPropertyEnum(pname);
@@ -1081,22 +1043,12 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop,
                 } else if (0 == uprv_comparePropertyNames(ASCII, pname)) {
                     set(0, 0x7F);
                     return *this;
+                } else if (0 == uprv_comparePropertyNames(ASSIGNED, pname)) {
+                    // [:Assigned:]=[:^Cn:]
+                    p = UCHAR_GENERAL_CATEGORY_MASK;
+                    v = U_GC_CN_MASK;
+                    invert = TRUE;
                 } else {
-
-                    // TODO: Remove the following special-case code when
-                    // these four C99-compatibility properties are implemented
-                    // as enums/names.
-                    for (int32_t i=0; i<LENGTHOF(C99_DISPATCH); ++i) {
-                        int32_t c = uprv_comparePropertyNames(pname, C99_DISPATCH[i].name);
-                        if (c == 0) {
-                            applyFilter(c99Filter, (void*) &C99_DISPATCH[i], C99_DISPATCH[i].src, ec);
-                            return *this;
-                        } else if (c < 0) {
-                            // Further entries will not match; bail out
-                            break;
-                        }
-                    }
-
                     FAIL(ec);
                 }
             }
@@ -1104,6 +1056,9 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop,
     }
     
     applyIntPropertyValue(p, v, ec);
+    if(invert) {
+        complement();
+    }
 
     if (U_SUCCESS(ec) && (mustNotBeEmpty && isEmpty())) {
         // mustNotBeEmpty is set to true if an empty set indicates
@@ -1342,6 +1297,10 @@ const UnicodeSet* UnicodeSet::getInclusions(int32_t src, UErrorCode &status) {
             case UPROPS_SRC_PROPSVEC:
                 upropsvec_addPropertyStarts(&sa, &status);
                 break;
+            case UPROPS_SRC_CHAR_AND_PROPSVEC:
+                uchar_addPropertyStarts(&sa, &status);
+                upropsvec_addPropertyStarts(&sa, &status);
+                break;
             case UPROPS_SRC_HST:
                 uhst_addPropertyStarts(&sa, &status);
                 break;
diff --git a/icu4c/source/common/uprops.c b/icu4c/source/common/uprops.c
index 78fceacc00..5ecf072ca7 100644
--- a/icu4c/source/common/uprops.c
+++ b/icu4c/source/common/uprops.c
@@ -239,7 +239,12 @@ static const struct {
     { UPROPS_SRC_NORM,  0 },                                    /* UCHAR_NFKC_INERT */
     { UPROPS_SRC_NORM,  0 },                                    /* UCHAR_SEGMENT_STARTER */
     {  2,               U_MASK(UPROPS_V2_PATTERN_SYNTAX) },
-    {  2,               U_MASK(UPROPS_V2_PATTERN_WHITE_SPACE) }
+    {  2,               U_MASK(UPROPS_V2_PATTERN_WHITE_SPACE) },
+    { UPROPS_SRC_CHAR_AND_PROPSVEC,  0 },                       /* UCHAR_POSIX_ALNUM */
+    { UPROPS_SRC_CHAR,  0 },                                    /* UCHAR_POSIX_BLANK */
+    { UPROPS_SRC_CHAR,  0 },                                    /* UCHAR_POSIX_GRAPH */
+    { UPROPS_SRC_CHAR,  0 },                                    /* UCHAR_POSIX_PRINT */
+    { UPROPS_SRC_CHAR,  0 }                                     /* UCHAR_POSIX_XDIGIT */
 };
 
 U_CAPI UBool U_EXPORT2
@@ -305,6 +310,26 @@ u_hasBinaryProperty(UChar32 c, UProperty which) {
                 default:
                     break;
                 }
+            } else if(column==UPROPS_SRC_CHAR) {
+                switch(which) {
+                case UCHAR_POSIX_BLANK:
+                    return u_isblank(c);
+                case UCHAR_POSIX_GRAPH:
+                    return u_isgraphPOSIX(c);
+                case UCHAR_POSIX_PRINT:
+                    return u_isprintPOSIX(c);
+                case UCHAR_POSIX_XDIGIT:
+                    return u_isxdigit(c);
+                default:
+                    break;
+                }
+            } else if(column==UPROPS_SRC_CHAR_AND_PROPSVEC) {
+                switch(which) {
+                case UCHAR_POSIX_ALNUM:
+                    return u_isalnumPOSIX(c);
+                default:
+                    break;
+                }
             }
         }
     }
diff --git a/icu4c/source/common/uprops.h b/icu4c/source/common/uprops.h
index 842ab85bb7..dec3dd5b11 100644
--- a/icu4c/source/common/uprops.h
+++ b/icu4c/source/common/uprops.h
@@ -224,6 +224,31 @@ uprv_getMaxValues(int32_t column);
 U_CFUNC UHangulSyllableType
 uchar_getHST(UChar32 c);
 
+/**
+ * Checks if c is alphabetic, or a decimal digit; implements UCHAR_POSIX_ALNUM.
+ * @internal
+ */
+U_CFUNC UBool
+u_isalnumPOSIX(UChar32 c);
+
+/**
+ * Checks if c is in
+ * [^\p{space}\p{gc=Control}\p{gc=Surrogate}\p{gc=Unassigned}]
+ * with space=\p{Whitespace} and Control=Cc.
+ * Implements UCHAR_POSIX_GRAPH.
+ * @internal
+ */
+U_CFUNC UBool
+u_isgraphPOSIX(UChar32 c);
+
+/**
+ * Checks if c is in \p{graph}\p{blank} - \p{cntrl}.
+ * Implements UCHAR_POSIX_PRINT.
+ * @internal
+ */
+U_CFUNC UBool
+u_isprintPOSIX(UChar32 c);
+
 /** Turn a bit index into a bit flag. @internal */
 #define FLAG(n) ((uint32_t)1<<(n))
 
@@ -359,6 +384,8 @@ enum UPropertySource {
     UPROPS_SRC_CASE,
     /** From ubidi_props.c/ubidi.icu */
     UPROPS_SRC_BIDI,
+    /** From uchar.c/uprops.icu main trie as well as properties vectors trie */
+    UPROPS_SRC_CHAR_AND_PROPSVEC,
     /** One more than the highest UPropertySource (UPROPS_SRC_) constant. */
     UPROPS_SRC_COUNT
 };
diff --git a/icu4c/source/test/intltest/usettest.cpp b/icu4c/source/test/intltest/usettest.cpp
index d874df85ee..d2ea4b488a 100644
--- a/icu4c/source/test/intltest/usettest.cpp
+++ b/icu4c/source/test/intltest/usettest.cpp
@@ -889,6 +889,9 @@ void UnicodeSetTest::TestPropertySet() {
         "\\u0F73\\u0F75\\u0F81",
         "abcd\\u0300\\u0301\\u00c0\\u00c5",
 
+        "[:Assigned:]",
+        "A\\uE000\\uF8FF\\uFDC7\\U00010000\\U0010FFFD",
+        "\\u0888\\uFDD3\\uFFFE\\U00050005"
     };
 
     static const int32_t DATA_LEN = sizeof(DATA)/sizeof(DATA[0]);
@@ -946,24 +949,20 @@ void UnicodeSetTest::TestPosixClasses() {
         TEST_ASSERT_SUCCESS(status);
         TEST_ASSERT(s1==s2);
     }
-    UVersionInfo ICU_34 = {3, 4, 0, 0};  // Time Bomb for bug 4199
     {
-        if (isICUVersionAtLeast(ICU_34)) {  // Time Bomb Test
-            UErrorCode status = U_ZERO_ERROR;
-            UnicodeSet s1("[:alnum:]", status);
-            UnicodeSet s2("[\\p{Alphabetic}\\p{DecimalNumber}]", status);
-            TEST_ASSERT_SUCCESS(status);
-            TEST_ASSERT(s1==s2);
-        }
+        UErrorCode status = U_ZERO_ERROR;
+        UnicodeSet s1("[:alnum:]", status);
+        UnicodeSet s2("[\\p{Alphabetic}\\p{DecimalNumber}]", status);
+        TEST_ASSERT_SUCCESS(status);
+        TEST_ASSERT(s1==s2);
     }
     {
-        if (isICUVersionAtLeast(ICU_34)) {  // Time Bomb Test
-            UErrorCode status = U_ZERO_ERROR;
-            UnicodeSet s1("[:space:]", status);
-            UnicodeSet s2("\\p{Whitespace}", status);
-            TEST_ASSERT_SUCCESS(status);
-            TEST_ASSERT(s1==s2);
-        }    }
+        UErrorCode status = U_ZERO_ERROR;
+        UnicodeSet s1("[:space:]", status);
+        UnicodeSet s2("\\p{Whitespace}", status);
+        TEST_ASSERT_SUCCESS(status);
+        TEST_ASSERT(s1==s2);
+    }
     {
         UErrorCode status = U_ZERO_ERROR;
         UnicodeSet s1("[:blank:]", status);
@@ -974,39 +973,29 @@ void UnicodeSetTest::TestPosixClasses() {
         TEST_ASSERT(s1==s2);
     }
     {
-        if (isICUVersionAtLeast(ICU_34)) {  // Time Bomb Test
-            UErrorCode status = U_ZERO_ERROR;
-            UnicodeSet s1("[:cntrl:]", status);
-            TEST_ASSERT_SUCCESS(status);
-            UnicodeSet s2("\\p{Control}", status);
-            TEST_ASSERT_SUCCESS(status);
-            TEST_ASSERT(s1==s2);
-        }
+        UErrorCode status = U_ZERO_ERROR;
+        UnicodeSet s1("[:cntrl:]", status);
+        TEST_ASSERT_SUCCESS(status);
+        UnicodeSet s2("\\p{Control}", status);
+        TEST_ASSERT_SUCCESS(status);
+        TEST_ASSERT(s1==s2);
     }
     {
         UErrorCode status = U_ZERO_ERROR;
         UnicodeSet s1("[:graph:]", status);
         TEST_ASSERT_SUCCESS(status);
-        UnicodeSet s2("[^\\p{Whitespace}\\p{Control}\\p{Format}"
-            "\\p{Surrogate}\\p{Unassigned}]", status);
+        UnicodeSet s2("[^\\p{Whitespace}\\p{Control}\\p{Surrogate}\\p{Unassigned}]", status);
         TEST_ASSERT_SUCCESS(status);
         TEST_ASSERT(s1==s2);
     }
     {
-        if (isICUVersionAtLeast(ICU_34)) {  // Time Bomb Test
-            UErrorCode status = U_ZERO_ERROR;
-            UnicodeSet s1("[:print:]", status);
-            TEST_ASSERT_SUCCESS(status);
-            UnicodeSet s2(
-                "[[^\\p{Whitespace}\\p{Control}\\p{Format}\\p{Surrogate}\\p{Unassigned}]"
-                "[\\p{Whitespace}-[\\u000a\\u000B\\u000c\\u000d\\u0085\\p{LineSeparator}]]"
-                "-[\\p{Control}]]"
-                , status);
-            TEST_ASSERT_SUCCESS(status);
-            TEST_ASSERT(s1==s2);
-        }
+        UErrorCode status = U_ZERO_ERROR;
+        UnicodeSet s1("[:print:]", status);
+        TEST_ASSERT_SUCCESS(status);
+        UnicodeSet s2("[[:graph:][:blank:]-[\\p{Control}]]" ,status);
+        TEST_ASSERT_SUCCESS(status);
+        TEST_ASSERT(s1==s2);
     }
-
 }
 /**
  * Test cloning of UnicodeSet.  For C++, we test the copy constructor.
diff --git a/icu4c/source/tools/genpname/SyntheticPropertyAliases.txt b/icu4c/source/tools/genpname/SyntheticPropertyAliases.txt
index fa9b1b268d..77d71f23b3 100644
--- a/icu4c/source/tools/genpname/SyntheticPropertyAliases.txt
+++ b/icu4c/source/tools/genpname/SyntheticPropertyAliases.txt
@@ -1,5 +1,5 @@
 ######################################################################
-# Copyright (c) 2003-2004, International Business Machines
+# Copyright (c) 2003-2005, International Business Machines
 # Corporation and others.  All Rights Reserved.
 ######################################################################
 # Author: Alan Liu
@@ -42,3 +42,11 @@ nfcinert; NFC_Inert
 nfkcinert; NFKC_Inert
 
 segstart; Segment_Starter
+
+# C/POSIX character classes that do not have Unicode property [value] aliases
+# see uchar.h
+n/a; alnum
+n/a; blank
+n/a; graph
+n/a; print
+n/a; xdigit
diff --git a/icu4c/source/tools/genpname/data.h b/icu4c/source/tools/genpname/data.h
index f6ddbf0893..c16214529b 100644
--- a/icu4c/source/tools/genpname/data.h
+++ b/icu4c/source/tools/genpname/data.h
@@ -11,7 +11,7 @@
  *   PropertyAliases.txt
  *   PropertyValueAliases.txt
  *
- * Date: Wed Apr 20 08:19:19 2005
+ * Date: Fri May 27 13:25:08 2005
  * Unicode version: 4.1.0
  * Script: preparse.pl
  */
@@ -22,7 +22,7 @@ const uint8_t VERSION_1 = 1;
 const uint8_t VERSION_2 = 0;
 const uint8_t VERSION_3 = 0;
 
-const int32_t STRING_COUNT = 730;
+const int32_t STRING_COUNT = 735;
 
 /* to be sorted */
 const AliasName STRING_TABLE[] = {
@@ -701,67 +701,72 @@ const AliasName STRING_TABLE[] = {
     AliasName("Zs", 672),
     AliasName("Zyyy", 673),
     AliasName("age", 674),
-    AliasName("bc", 675),
-    AliasName("blk", 676),
-    AliasName("bmg", 677),
-    AliasName("can", 678),
-    AliasName("ccc", 679),
-    AliasName("cf", 680),
-    AliasName("cntrl", 681),
-    AliasName("com", 682),
-    AliasName("digit", 683),
-    AliasName("dt", 684),
-    AliasName("ea", 685),
-    AliasName("enc", 686),
-    AliasName("fin", 687),
-    AliasName("font", 688),
-    AliasName("fra", 689),
-    AliasName("gc", 690),
-    AliasName("gcm", 691),
-    AliasName("hst", 692),
-    AliasName("init", 693),
-    AliasName("isc", 694),
-    AliasName("iso", 695),
-    AliasName("jg", 696),
-    AliasName("jt", 697),
-    AliasName("lb", 698),
-    AliasName("lc", 699),
-    AliasName("lccc", 700),
-    AliasName("med", 701),
-    AliasName("na", 702),
-    AliasName("na1", 703),
-    AliasName("nar", 704),
-    AliasName("nb", 705),
-    AliasName("nfcinert", 706),
-    AliasName("nfdinert", 707),
-    AliasName("nfkcinert", 708),
-    AliasName("nfkdinert", 709),
-    AliasName("none", 710),
-    AliasName("nt", 711),
-    AliasName("nv", 712),
-    AliasName("punct", 713),
-    AliasName("sc", 714),
-    AliasName("segstart", 715),
-    AliasName("sfc", 716),
-    AliasName("slc", 717),
-    AliasName("sml", 718),
-    AliasName("space", 719),
-    AliasName("sqr", 720),
-    AliasName("stc", 721),
-    AliasName("sub", 722),
-    AliasName("suc", 723),
-    AliasName("sup", 724),
-    AliasName("tc", 725),
-    AliasName("tccc", 726),
-    AliasName("uc", 727),
-    AliasName("vert", 728),
-    AliasName("wide", 729),
+    AliasName("alnum", 675),
+    AliasName("bc", 676),
+    AliasName("blank", 677),
+    AliasName("blk", 678),
+    AliasName("bmg", 679),
+    AliasName("can", 680),
+    AliasName("ccc", 681),
+    AliasName("cf", 682),
+    AliasName("cntrl", 683),
+    AliasName("com", 684),
+    AliasName("digit", 685),
+    AliasName("dt", 686),
+    AliasName("ea", 687),
+    AliasName("enc", 688),
+    AliasName("fin", 689),
+    AliasName("font", 690),
+    AliasName("fra", 691),
+    AliasName("gc", 692),
+    AliasName("gcm", 693),
+    AliasName("graph", 694),
+    AliasName("hst", 695),
+    AliasName("init", 696),
+    AliasName("isc", 697),
+    AliasName("iso", 698),
+    AliasName("jg", 699),
+    AliasName("jt", 700),
+    AliasName("lb", 701),
+    AliasName("lc", 702),
+    AliasName("lccc", 703),
+    AliasName("med", 704),
+    AliasName("na", 705),
+    AliasName("na1", 706),
+    AliasName("nar", 707),
+    AliasName("nb", 708),
+    AliasName("nfcinert", 709),
+    AliasName("nfdinert", 710),
+    AliasName("nfkcinert", 711),
+    AliasName("nfkdinert", 712),
+    AliasName("none", 713),
+    AliasName("nt", 714),
+    AliasName("nv", 715),
+    AliasName("print", 716),
+    AliasName("punct", 717),
+    AliasName("sc", 718),
+    AliasName("segstart", 719),
+    AliasName("sfc", 720),
+    AliasName("slc", 721),
+    AliasName("sml", 722),
+    AliasName("space", 723),
+    AliasName("sqr", 724),
+    AliasName("stc", 725),
+    AliasName("sub", 726),
+    AliasName("suc", 727),
+    AliasName("sup", 728),
+    AliasName("tc", 729),
+    AliasName("tccc", 730),
+    AliasName("uc", 731),
+    AliasName("vert", 732),
+    AliasName("wide", 733),
+    AliasName("xdigit", 734),
 };
 
 /* to be filled in */
-int32_t REMAP[730];
+int32_t REMAP[735];
 
-const int32_t NAME_GROUP_COUNT = 1053;
+const int32_t NAME_GROUP_COUNT = 1058;
 
 int32_t NAME_GROUP[] = {
     96, -128,           /*   0: "CN", "Control" */
@@ -817,476 +822,481 @@ int32_t NAME_GROUP[] = {
     324, -363,          /* 100: "LOE", "Logical_Order_Exception" */
     365, -366,          /* 102: "Lower", "Lowercase" */
     377, -377,          /* 104: "Math", "Math" */
-    706, -407,          /* 106: "nfcinert", "NFC_Inert" */
-    707, -410,          /* 108: "nfdinert", "NFD_Inert" */
-    708, -413,          /* 110: "nfkcinert", "NFKC_Inert" */
-    709, -416,          /* 112: "nfkdinert", "NFKD_Inert" */
+    709, -407,          /* 106: "nfcinert", "NFC_Inert" */
+    710, -410,          /* 108: "nfdinert", "NFD_Inert" */
+    711, -413,          /* 110: "nfkcinert", "NFKC_Inert" */
+    712, -416,          /* 112: "nfkdinert", "NFKD_Inert" */
     406, -438,          /* 114: "NChar", "Noncharacter_Code_Point" */
     479, -481,          /* 116: "Pat_Syn", "Pattern_Syntax" */
     480, -482,          /* 118: "Pat_WS", "Pattern_White_Space" */
-    498, -505,          /* 120: "QMark", "Quotation_Mark" */
-    509, -509,          /* 122: "Radical", "Radical" */
-    715, -535,          /* 124: "segstart", "Segment_Starter" */
-    522, -555,          /* 126: "SD", "Soft_Dotted" */
-    527, -527,          /* 128: "STerm", "STerm" */
-    596, -597,          /* 130: "Term", "Terminal_Punctuation" */
-    614, -621,          /* 132: "UIdeo", "Unified_Ideograph" */
-    623, -624,          /* 134: "Upper", "Uppercase" */
-    629, -630,          /* 136: "VS", "Variation_Selector" */
-    641, 643, -719,     /* 138: "WSpace", "White_Space", "space" */
-    647, -649,          /* 141: "XIDC", "XID_Continue" */
-    648, -650,          /* 143: "XIDS", "XID_Start" */
-    712, -451,          /* 145: "nv", "Numeric_Value" */
-    675, -58,           /* 147: "bc", "Bidi_Class" */
-    676, -63,           /* 149: "blk", "Block" */
-    679, -101,          /* 151: "ccc", "Canonical_Combining_Class" */
-    684, -153,          /* 153: "dt", "Decomposition_Type" */
-    685, -174,          /* 155: "ea", "East_Asian_Width" */
-    690, -207,          /* 157: "gc", "General_Category" */
-    203, -223,          /* 159: "GCB", "Grapheme_Cluster_Break" */
-    692, -247,          /* 161: "hst", "Hangul_Syllable_Type" */
-    696, -297,          /* 163: "jg", "Joining_Group" */
-    697, -298,          /* 165: "jt", "Joining_Type" */
-    700, -341,          /* 167: "lccc", "Lead_Canonical_Combining_Class" */
-    698, -354,          /* 169: "lb", "Line_Break" */
-    408, -409,          /* 171: "NFC_QC", "NFC_Quick_Check" */
-    411, -412,          /* 173: "NFD_QC", "NFD_Quick_Check" */
-    414, -415,          /* 175: "NFKC_QC", "NFKC_Quick_Check" */
-    417, -418,          /* 177: "NFKD_QC", "NFKD_Quick_Check" */
-    711, -450,          /* 179: "nt", "Numeric_Type" */
-    714, -532,          /* 181: "sc", "Script" */
-    521, -538,          /* 183: "SB", "Sentence_Break" */
-    726, -609,          /* 185: "tccc", "Trail_Canonical_Combining_Class" */
-    638, -645,          /* 187: "WB", "Word_Break" */
-    691, -208,          /* 189: "gcm", "General_Category_Mask" */
-    674, -18,           /* 191: "age", "Age" */
-    677, -62,           /* 193: "bmg", "Bidi_Mirroring_Glyph" */
-    680, -104,          /* 195: "cf", "Case_Folding" */
-    694, -278,          /* 197: "isc", "ISO_Comment" */
-    699, -368,          /* 199: "lc", "Lowercase_Mapping" */
-    702, -426,          /* 201: "na", "Name" */
-    716, -544,          /* 203: "sfc", "Simple_Case_Folding" */
-    717, -545,          /* 205: "slc", "Simple_Lowercase_Mapping" */
-    721, -546,          /* 207: "stc", "Simple_Titlecase_Mapping" */
-    723, -547,          /* 209: "suc", "Simple_Uppercase_Mapping" */
-    725, -608,          /* 211: "tc", "Titlecase_Mapping" */
-    703, -619,          /* 213: "na1", "Unicode_1_Name" */
-    727, -626,          /* 215: "uc", "Uppercase_Mapping" */
-    6, -31,             /* 217: "AN", "Arabic_Number" */
-    41, -478,           /* 219: "B", "Paragraph_Separator" */
-    47, -68,            /* 221: "BN", "Boundary_Neutral" */
-    98, -122,           /* 223: "CS", "Common_Separator" */
-    423, -440,          /* 225: "NSM", "Nonspacing_Mark" */
-    170, -182,          /* 227: "EN", "European_Number" */
-    171, -183,          /* 229: "ES", "European_Separator" */
-    172, -184,          /* 231: "ET", "European_Terminator" */
-    319, -345,          /* 233: "L", "Left_To_Right" */
-    325, -346,          /* 235: "LRE", "Left_To_Right_Embedding" */
-    326, -347,          /* 237: "LRO", "Left_To_Right_Override" */
-    454, -469,          /* 239: "ON", "Other_Neutral" */
-    475, -491,          /* 241: "PDF", "Pop_Directional_Format" */
-    506, -514,          /* 243: "R", "Right_To_Left" */
-    4, -30,             /* 245: "AL", "Arabic_Letter" */
-    507, -515,          /* 247: "RLE", "Right_To_Left_Embedding" */
-    508, -516,          /* 249: "RLO", "Right_To_Left_Override" */
-    519, -534,          /* 251: "S", "Segment_Separator" */
-    640, -643,          /* 253: "WS", "White_Space" */
-    190, -192,          /* 255: "F", "False" */
-    580, -612,          /* 257: "T", "True" */
-    0, -17,             /* 259: "", "Aegean_Numbers" */
-    0, -24,             /* 261: "", "Alphabetic_Presentation_Forms" */
-    0, -26,             /* 263: "", "Ancient_Greek_Musical_Notation" */
-    0, -27,             /* 265: "", "Ancient_Greek_Numbers" */
-    0, -29,             /* 267: "", "Arabic" */
-    0, -32,             /* 269: "", "Arabic_Presentation_Forms-A" */
-    0, -33,             /* 271: "", "Arabic_Presentation_Forms-B" */
-    0, -34,             /* 273: "", "Arabic_Supplement" */
-    0, -35,             /* 275: "", "Armenian" */
-    0, -37,             /* 277: "", "Arrows" */
-    0, -49,             /* 279: "", "Basic_Latin" */
-    0, -55,             /* 281: "", "Bengali" */
-    0, -64,             /* 283: "", "Block_Elements" */
-    0, -66,             /* 285: "", "Bopomofo" */
-    0, -67,             /* 287: "", "Bopomofo_Extended" */
-    0, -69,             /* 289: "", "Box_Drawing" */
-    0, -72,             /* 291: "", "Braille_Patterns" */
-    0, -78,             /* 293: "", "Buginese" */
-    0, -80,             /* 295: "", "Buhid" */
-    0, -81,             /* 297: "", "Byzantine_Musical_Symbols" */
-    0, -110,            /* 299: "", "Cherokee" */
-    0, -84,             /* 301: "", "CJK_Compatibility" */
-    0, -85,             /* 303: "", "CJK_Compatibility_Forms" */
-    0, -86,             /* 305: "", "CJK_Compatibility_Ideographs" */
-    0, -87,             /* 307: "", "CJK_Compatibility_Ideographs_Supplement" */
-    0, -88,             /* 309: "", "CJK_Radicals_Supplement" */
-    0, -89,             /* 311: "", "CJK_Strokes" */
-    0, -90,             /* 313: "", "CJK_Symbols_and_Punctuation" */
-    0, -91,             /* 315: "", "CJK_Unified_Ideographs" */
-    0, -92,             /* 317: "", "CJK_Unified_Ideographs_Extension_A" */
-    0, -93,             /* 319: "", "CJK_Unified_Ideographs_Extension_B" */
-    0, -116,            /* 321: "", "Combining_Diacritical_Marks" */
-    0, -117,            /* 323: "", "Combining_Diacritical_Marks_Supplement" */
-    0, -119,            /* 325: "", "Combining_Half_Marks" */
-    0, -118,            /* 327: "", "Combining_Diacritical_Marks_for_Symbols" */
-    0, -129,            /* 329: "", "Control_Pictures" */
-    0, -131,            /* 331: "", "Coptic" */
-    0, -135,            /* 333: "", "Currency_Symbols" */
-    0, -137,            /* 335: "", "Cypriot_Syllabary" */
-    0, -138,            /* 337: "", "Cyrillic" */
-    0, 139, -140,       /* 339: "", "Cyrillic_Supplement", "Cyrillic_Supplementary" */
-    0, -157,            /* 342: "", "Deseret" */
-    0, -159,            /* 344: "", "Devanagari" */
-    0, -164,            /* 346: "", "Dingbats" */
-    0, -175,            /* 348: "", "Enclosed_Alphanumerics" */
-    0, -176,            /* 350: "", "Enclosed_CJK_Letters_and_Months" */
-    0, -179,            /* 352: "", "Ethiopic" */
-    0, -180,            /* 354: "", "Ethiopic_Extended" */
-    0, -181,            /* 356: "", "Ethiopic_Supplement" */
-    0, -209,            /* 358: "", "General_Punctuation" */
-    0, -210,            /* 360: "", "Geometric_Shapes" */
-    0, -212,            /* 362: "", "Georgian" */
-    0, -213,            /* 364: "", "Georgian_Supplement" */
-    0, -215,            /* 366: "", "Glagolitic" */
-    0, -218,            /* 368: "", "Gothic" */
-    0, -228,            /* 370: "", "Greek_and_Coptic" */
-    0, -227,            /* 372: "", "Greek_Extended" */
-    0, -230,            /* 374: "", "Gujarati" */
-    0, -232,            /* 376: "", "Gurmukhi" */
-    0, -240,            /* 378: "", "Halfwidth_and_Fullwidth_Forms" */
-    0, -245,            /* 380: "", "Hangul_Compatibility_Jamo" */
-    0, -246,            /* 382: "", "Hangul_Jamo" */
-    0, -248,            /* 384: "", "Hangul_Syllables" */
-    0, -251,            /* 386: "", "Hanunoo" */
-    0, -254,            /* 388: "", "Hebrew" */
-    0, -260,            /* 390: "", "High_Private_Use_Surrogates" */
-    0, -261,            /* 392: "", "High_Surrogates" */
-    0, -263,            /* 394: "", "Hiragana" */
-    0, -281,            /* 396: "", "Ideographic_Description_Characters" */
-    0, -276,            /* 398: "", "IPA_Extensions" */
-    0, -304,            /* 400: "", "Kanbun" */
-    0, -305,            /* 402: "", "Kangxi_Radicals" */
-    0, -306,            /* 404: "", "Kannada" */
-    0, -308,            /* 406: "", "Katakana" */
-    0, -310,            /* 408: "", "Katakana_Phonetic_Extensions" */
-    0, -313,            /* 410: "", "Kharoshthi" */
-    0, -314,            /* 412: "", "Khmer" */
-    0, -315,            /* 414: "", "Khmer_Symbols" */
-    0, -333,            /* 416: "", "Lao" */
-    0, -336,            /* 418: "", "Latin-1_Supplement" */
-    0, -337,            /* 420: "", "Latin_Extended-A" */
-    0, -339,            /* 422: "", "Latin_Extended_Additional" */
-    0, -338,            /* 424: "", "Latin_Extended-B" */
-    0, -350,            /* 426: "", "Letterlike_Symbols" */
-    0, -352,            /* 428: "", "Limbu" */
-    0, -358,            /* 430: "", "Linear_B_Ideograms" */
-    0, -359,            /* 432: "", "Linear_B_Syllabary" */
-    0, -364,            /* 434: "", "Low_Surrogates" */
-    0, -374,            /* 436: "", "Malayalam" */
-    0, -379,            /* 438: "", "Mathematical_Alphanumeric_Symbols" */
-    0, -380,            /* 440: "", "Mathematical_Operators" */
-    0, -389,            /* 442: "", "Miscellaneous_Mathematical_Symbols-A" */
-    0, -390,            /* 444: "", "Miscellaneous_Mathematical_Symbols-B" */
-    0, -391,            /* 446: "", "Miscellaneous_Symbols" */
-    0, -392,            /* 448: "", "Miscellaneous_Symbols_and_Arrows" */
-    0, -393,            /* 450: "", "Miscellaneous_Technical" */
-    0, -398,            /* 452: "", "Modifier_Tone_Letters" */
-    0, -400,            /* 454: "", "Mongolian" */
-    0, -401,            /* 456: "", "Musical_Symbols" */
-    0, -402,            /* 458: "", "Myanmar" */
-    0, -430,            /* 460: "", "New_Tai_Lue" */
-    0, -434,            /* 462: "", "No_Block" */
-    0, -448,            /* 464: "", "Number_Forms" */
-    0, -458,            /* 466: "", "Ogham" */
-    0, -459,            /* 468: "", "Old_Italic" */
-    0, -460,            /* 470: "", "Old_Persian" */
-    0, -462,            /* 472: "", "Optical_Character_Recognition" */
-    0, -463,            /* 474: "", "Oriya" */
-    0, -466,            /* 476: "", "Osmanya" */
-    0, -487,            /* 478: "", "Phonetic_Extensions" */
-    0, -488,            /* 480: "", "Phonetic_Extensions_Supplement" */
-    0, -495,            /* 482: "", "Private_Use_Area" */
-    0, -517,            /* 484: "", "Runic" */
-    0, -541,            /* 486: "", "Shavian" */
-    0, -549,            /* 488: "", "Sinhala" */
-    0, -553,            /* 490: "", "Small_Form_Variants" */
-    0, -560,            /* 492: "", "Spacing_Modifier_Letters" */
-    0, -561,            /* 494: "", "Specials" */
-    0, -565,            /* 496: "", "Superscripts_and_Subscripts" */
-    0, -566,            /* 498: "", "Supplemental_Arrows-A" */
-    0, -567,            /* 500: "", "Supplemental_Arrows-B" */
-    0, -568,            /* 502: "", "Supplemental_Mathematical_Operators" */
-    0, -569,            /* 504: "", "Supplemental_Punctuation" */
-    0, -570,            /* 506: "", "Supplementary_Private_Use_Area-A" */
-    0, -571,            /* 508: "", "Supplementary_Private_Use_Area-B" */
-    0, -575,            /* 510: "", "Syloti_Nagri" */
-    0, -578,            /* 512: "", "Syriac" */
-    0, -581,            /* 514: "", "Tagalog" */
-    0, -583,            /* 516: "", "Tagbanwa" */
-    0, -584,            /* 518: "", "Tags" */
-    0, -586,            /* 520: "", "Tai_Le" */
-    0, -587,            /* 522: "", "Tai_Xuan_Jing_Symbols" */
-    0, -590,            /* 524: "", "Tamil" */
-    0, -595,            /* 526: "", "Telugu" */
-    0, -602,            /* 528: "", "Thaana" */
-    0, -603,            /* 530: "", "Thai" */
-    0, -604,            /* 532: "", "Tibetan" */
-    0, -606,            /* 534: "", "Tifinagh" */
-    0, -617,            /* 536: "", "Ugaritic" */
-    0, -620,            /* 538: "", "Unified_Canadian_Aboriginal_Syllabics" */
-    0, -631,            /* 540: "", "Variation_Selectors" */
-    0, -632,            /* 542: "", "Variation_Selectors_Supplement" */
-    0, -634,            /* 544: "", "Vertical_Forms" */
-    0, -662,            /* 546: "", "Yijing_Hexagram_Symbols" */
-    0, -659,            /* 548: "", "Yi_Radicals" */
-    0, -660,            /* 550: "", "Yi_Syllables" */
-    421, -444,          /* 552: "NR", "Not_Reordered" */
-    456, -473,          /* 554: "OV", "Overlay" */
-    12, -40,            /* 556: "ATBL", "Attached_Below_Left" */
-    11, -39,            /* 558: "ATB", "Attached_Below" */
-    10, -38,            /* 560: "ATAR", "Attached_Above_Right" */
-    46, -52,            /* 562: "BL", "Below_Left" */
-    41, -51,            /* 564: "B", "Below" */
-    48, -53,            /* 566: "BR", "Below_Right" */
-    319, -343,          /* 568: "L", "Left" */
-    506, -512,          /* 570: "R", "Right" */
-    4, -15,             /* 572: "AL", "Above_Left" */
-    1, -14,             /* 574: "A", "Above" */
-    7, -16,             /* 576: "AR", "Above_Right" */
-    144, -166,          /* 578: "DB", "Double_Below" */
-    143, -165,          /* 580: "DA", "Double_Above" */
-    277, -288,          /* 582: "IS", "Iota_Subscript" */
-    419, -446,          /* 584: "NK", "Nukta" */
-    300, -303,          /* 586: "KV", "Kana_Voicing" */
-    628, -635,          /* 588: "VR", "Virama" */
-    678, -100,          /* 590: "can", "Canonical" */
-    686, -111,          /* 592: "enc", "Circle" */
-    682, -124,          /* 594: "com", "Compat" */
-    687, -195,          /* 596: "fin", "Final" */
-    688, -198,          /* 598: "font", "Font" */
-    689, -200,          /* 600: "fra", "Fraction" */
-    693, -284,          /* 602: "init", "Initial" */
-    695, -289,          /* 604: "iso", "Isolated" */
-    701, -384,          /* 606: "med", "Medial" */
-    704, -427,          /* 608: "nar", "Narrow" */
-    705, -436,          /* 610: "nb", "Nobreak" */
-    710, -439,          /* 612: "none", "None" */
-    718, -552,          /* 614: "sml", "Small" */
-    720, -562,          /* 616: "sqr", "Square" */
-    722, -563,          /* 618: "sub", "Sub" */
-    724, -564,          /* 620: "sup", "Super" */
-    728, -633,          /* 622: "vert", "Vertical" */
-    729, -644,          /* 624: "wide", "Wide" */
-    1, -25,             /* 626: "A", "Ambiguous" */
-    190, -202,          /* 628: "F", "Fullwidth" */
-    234, -239,          /* 630: "H", "Halfwidth" */
-    425, -427,          /* 632: "Na", "Narrow" */
-    404, -429,          /* 634: "N", "Neutral" */
-    637, -644,          /* 636: "W", "Wide" */
-    382, -559,          /* 638: "Mc", "Spacing_Mark" */
-    483, -126,          /* 640: "Pc", "Connector_Punctuation" */
-    107, 128, -681,     /* 642: "Cc", "Control", "cntrl" */
-    531, -134,          /* 645: "Sc", "Currency_Symbol" */
-    484, -149,          /* 647: "Pd", "Dash_Punctuation" */
-    428, 152, -683,     /* 649: "Nd", "Decimal_Number", "digit" */
-    383, -177,          /* 652: "Me", "Enclosing_Mark" */
-    485, -113,          /* 654: "Pe", "Close_Punctuation" */
-    486, -196,          /* 656: "Pf", "Final_Punctuation" */
-    108, -199,          /* 658: "Cf", "Format" */
-    114, -618,          /* 660: "Cn", "Unassigned" */
-    489, -285,          /* 662: "Pi", "Initial_Punctuation" */
-    432, -349,          /* 664: "Nl", "Letter_Number" */
-    670, -356,          /* 666: "Zl", "Line_Separator" */
-    360, -367,          /* 668: "Ll", "Lowercase_Letter" */
-    551, -378,          /* 670: "Sm", "Math_Symbol" */
-    361, -396,          /* 672: "Lm", "Modifier_Letter" */
-    550, -397,          /* 674: "Sk", "Modifier_Symbol" */
-    395, -440,          /* 676: "Mn", "Nonspacing_Mark" */
-    362, -468,          /* 678: "Lo", "Other_Letter" */
-    433, -470,          /* 680: "No", "Other_Number" */
-    490, -471,          /* 682: "Po", "Other_Punctuation" */
-    554, -472,          /* 684: "So", "Other_Symbol" */
-    671, -478,          /* 686: "Zp", "Paragraph_Separator" */
-    115, -494,          /* 688: "Co", "Private_Use" */
-    672, -558,          /* 690: "Zs", "Space_Separator" */
-    496, -461,          /* 692: "Ps", "Open_Punctuation" */
-    133, -572,          /* 694: "Cs", "Surrogate" */
-    369, -607,          /* 696: "Lt", "Titlecase_Letter" */
-    370, -625,          /* 698: "Lu", "Uppercase_Letter" */
-    82, -467,           /* 700: "C", "Other" */
-    320, -106,          /* 702: "LC", "Cased_Letter" */
-    319, -348,          /* 704: "L", "Letter" */
-    371, -376,          /* 706: "M", "Mark" */
-    404, -447,          /* 708: "N", "Number" */
-    474, 497, -713,     /* 710: "P", "Punctuation", "punct" */
-    519, -576,          /* 713: "S", "Symbol" */
-    665, -540,          /* 715: "Z", "Separator" */
-    319, -342,          /* 717: "L", "Leading_Jamo" */
-    328, -329,          /* 719: "LVT", "LVT_Syllable" */
-    327, -330,          /* 721: "LV", "LV_Syllable" */
-    405, -443,          /* 723: "NA", "Not_Applicable" */
-    580, -610,          /* 725: "T", "Trailing_Jamo" */
-    627, -636,          /* 727: "V", "Vowel_Jamo" */
-    0, -19,             /* 729: "", "Ain" */
-    0, -20,             /* 731: "", "Alaph" */
-    0, -21,             /* 733: "", "Alef" */
-    0, -50,             /* 735: "", "Beh" */
-    0, -56,             /* 737: "", "Beth" */
-    0, -146,            /* 739: "", "Dal" */
-    0, -147,            /* 741: "", "Dalath_Rish" */
-    0, -169,            /* 743: "", "E" */
-    0, -193,            /* 745: "", "Fe" */
-    0, -194,            /* 747: "", "Feh" */
-    0, -197,            /* 749: "", "Final_Semkath" */
-    0, -205,            /* 751: "", "Gaf" */
-    0, -206,            /* 753: "", "Gamal" */
-    0, -238,            /* 755: "", "Hah" */
-    0, -241,            /* 757: "", "Hamza_On_Heh_Goal" */
-    0, -252,            /* 759: "", "He" */
-    0, -255,            /* 761: "", "Heh" */
-    0, -256,            /* 763: "", "Heh_Goal" */
-    0, -257,            /* 765: "", "Heth" */
-    0, -301,            /* 767: "", "Kaf" */
-    0, -307,            /* 769: "", "Kaph" */
-    0, -311,            /* 771: "", "Khaph" */
-    0, -318,            /* 773: "", "Knotted_Heh" */
-    0, -331,            /* 775: "", "Lam" */
-    0, -332,            /* 777: "", "Lamadh" */
-    0, -385,            /* 779: "", "Meem" */
-    0, -388,            /* 781: "", "Mim" */
-    0, -442,            /* 783: "", "Noon" */
-    0, -435,            /* 785: "", "No_Joining_Group" */
-    0, -452,            /* 787: "", "Nun" */
-    0, -485,            /* 789: "", "Pe" */
-    0, -502,            /* 791: "", "Qaf" */
-    0, -503,            /* 793: "", "Qaph" */
-    0, -510,            /* 795: "", "Reh" */
-    0, -511,            /* 797: "", "Reversed_Pe" */
-    0, -529,            /* 799: "", "Sad" */
-    0, -530,            /* 801: "", "Sadhe" */
-    0, -533,            /* 803: "", "Seen" */
-    0, -536,            /* 805: "", "Semkath" */
-    0, -543,            /* 807: "", "Shin" */
-    0, -573,            /* 809: "", "Swash_Kaf" */
-    0, -579,            /* 811: "", "Syriac_Waw" */
-    0, -585,            /* 813: "", "Tah" */
-    0, -592,            /* 815: "", "Taw" */
-    0, -593,            /* 817: "", "Teh_Marbuta" */
-    0, -598,            /* 819: "", "Teth" */
-    0, -642,            /* 821: "", "Waw" */
-    0, -654,            /* 823: "", "Yeh" */
-    0, -655,            /* 825: "", "Yeh_Barree" */
-    0, -656,            /* 827: "", "Yeh_With_Tail" */
-    0, -663,            /* 829: "", "Yudh" */
-    0, -664,            /* 831: "", "Yudh_He" */
-    0, -668,            /* 833: "", "Zain" */
-    0, -669,            /* 835: "", "Zhain" */
-    142, -168,          /* 837: "D", "Dual_Joining" */
-    82, -295,           /* 839: "C", "Join_Causing" */
-    319, -344,          /* 841: "L", "Left_Joining" */
-    613, -437,          /* 843: "U", "Non_Joining" */
-    506, -513,          /* 845: "R", "Right_Joining" */
-    580, -611,          /* 847: "T", "Transparent" */
-    4, -23,             /* 849: "AL", "Alphabetic" */
-    3, -25,             /* 851: "AI", "Ambiguous" */
-    43, -73,            /* 853: "BA", "Break_After" */
-    44, -74,            /* 855: "BB", "Break_Before" */
-    42, -75,            /* 857: "B2", "Break_Both" */
-    528, -76,           /* 859: "SY", "Break_Symbols" */
-    97, -103,           /* 861: "CR", "Carriage_Return" */
-    94, -113,           /* 863: "CL", "Close_Punctuation" */
-    95, -120,           /* 865: "CM", "Combining_Mark" */
-    520, -125,          /* 867: "SA", "Complex_Context" */
-    83, -127,           /* 869: "CB", "Contingent_Break" */
-    173, -185,          /* 871: "EX", "Exclamation" */
-    204, -216,          /* 873: "GL", "Glue" */
-    235, -235,          /* 875: "H2", "H2" */
-    236, -236,          /* 877: "H3", "H3" */
-    237, -265,          /* 879: "HY", "Hyphen" */
-    266, -280,          /* 881: "ID", "Ideographic" */
-    277, -282,          /* 883: "IS", "Infix_Numeric" */
-    275, 286, -287,     /* 885: "IN", "Inseparable", "Inseperable" */
-    291, -291,          /* 888: "JL", "JL" */
-    292, -292,          /* 890: "JT", "JT" */
-    293, -293,          /* 892: "JV", "JV" */
-    322, -355,          /* 894: "LF", "Line_Feed" */
-    45, -375,           /* 896: "BK", "Mandatory_Break" */
-    420, -431,          /* 898: "NL", "Next_Line" */
-    422, -441,          /* 900: "NS", "Nonstarter" */
-    455, -461,          /* 902: "OP", "Open_Punctuation" */
-    476, -492,          /* 904: "PO", "Postfix_Numeric" */
-    477, -493,          /* 906: "PR", "Prefix_Numeric" */
-    499, -504,          /* 908: "QU", "Quotation" */
-    525, -557,          /* 910: "SP", "Space" */
-    524, -572,          /* 912: "SG", "Surrogate" */
-    651, -622,          /* 914: "XX", "Unknown" */
-    639, -646,          /* 916: "WJ", "Word_Joiner" */
-    666, -667,          /* 918: "ZW", "ZWSpace" */
-    150, -151,          /* 920: "De", "Decimal" */
-    160, -163,          /* 922: "Di", "Digit" */
-    439, -439,          /* 924: "None", "None" */
-    445, -449,          /* 926: "Nu", "Numeric" */
-    28, -29,            /* 928: "Arab", "Arabic" */
-    36, -35,            /* 930: "Armn", "Armenian" */
-    54, -55,            /* 932: "Beng", "Bengali" */
-    65, -66,            /* 934: "Bopo", "Bopomofo" */
-    70, -71,            /* 936: "Brai", "Braille" */
-    77, -78,            /* 938: "Bugi", "Buginese" */
-    79, -80,            /* 940: "Buhd", "Buhid" */
-    102, -99,           /* 942: "Cans", "Canadian_Aboriginal" */
-    109, -110,          /* 944: "Cher", "Cherokee" */
-    673, -121,          /* 946: "Zyyy", "Common" */
-    130, 131, -500,     /* 948: "Copt", "Coptic", "Qaac" */
-    132, -136,          /* 951: "Cprt", "Cypriot" */
-    141, -138,          /* 953: "Cyrl", "Cyrillic" */
-    167, -157,          /* 955: "Dsrt", "Deseret" */
-    158, -159,          /* 957: "Deva", "Devanagari" */
-    178, -179,          /* 959: "Ethi", "Ethiopic" */
-    211, -212,          /* 961: "Geor", "Georgian" */
-    214, -215,          /* 963: "Glag", "Glagolitic" */
-    217, -218,          /* 965: "Goth", "Gothic" */
-    229, -226,          /* 967: "Grek", "Greek" */
-    231, -230,          /* 969: "Gujr", "Gujarati" */
-    233, -232,          /* 971: "Guru", "Gurmukhi" */
-    249, -242,          /* 973: "Hani", "Han" */
-    243, -244,          /* 975: "Hang", "Hangul" */
-    250, -251,          /* 977: "Hano", "Hanunoo" */
-    253, -254,          /* 979: "Hebr", "Hebrew" */
-    262, -263,          /* 981: "Hira", "Hiragana" */
-    501, -283,          /* 983: "Qaai", "Inherited" */
-    317, -306,          /* 985: "Knda", "Kannada" */
-    302, -308,          /* 987: "Kana", "Katakana" */
-    264, -309,          /* 989: "Hrkt", "Katakana_Or_Hiragana" */
-    312, -313,          /* 991: "Khar", "Kharoshthi" */
-    316, -314,          /* 993: "Khmr", "Khmer" */
-    334, -333,          /* 995: "Laoo", "Lao" */
-    340, -335,          /* 997: "Latn", "Latin" */
-    351, -352,          /* 999: "Limb", "Limbu" */
-    353, -357,          /* 1001: "Linb", "Linear_B" */
-    394, -374,          /* 1003: "Mlym", "Malayalam" */
-    399, -400,          /* 1005: "Mong", "Mongolian" */
-    403, -402,          /* 1007: "Mymr", "Myanmar" */
-    589, -430,          /* 1009: "Talu", "New_Tai_Lue" */
-    457, -458,          /* 1011: "Ogam", "Ogham" */
-    290, -459,          /* 1013: "Ital", "Old_Italic" */
-    652, -460,          /* 1015: "Xpeo", "Old_Persian" */
-    464, -463,          /* 1017: "Orya", "Oriya" */
-    465, -466,          /* 1019: "Osma", "Osmanya" */
-    518, -517,          /* 1021: "Runr", "Runic" */
-    542, -541,          /* 1023: "Shaw", "Shavian" */
-    548, -549,          /* 1025: "Sinh", "Sinhala" */
-    574, -575,          /* 1027: "Sylo", "Syloti_Nagri" */
-    577, -578,          /* 1029: "Syrc", "Syriac" */
-    600, -581,          /* 1031: "Tglg", "Tagalog" */
-    582, -583,          /* 1033: "Tagb", "Tagbanwa" */
-    588, -586,          /* 1035: "Tale", "Tai_Le" */
-    591, -590,          /* 1037: "Taml", "Tamil" */
-    594, -595,          /* 1039: "Telu", "Telugu" */
-    601, -602,          /* 1041: "Thaa", "Thaana" */
-    603, -603,          /* 1043: "Thai", "Thai" */
-    605, -604,          /* 1045: "Tibt", "Tibetan" */
-    599, -606,          /* 1047: "Tfng", "Tifinagh" */
-    616, -617,          /* 1049: "Ugar", "Ugaritic" */
-    661, -658,          /* 1051: "Yiii", "Yi" */
+    -675,               /* 120: "alnum" */
+    -677,               /* 121: "blank" */
+    -694,               /* 122: "graph" */
+    -716,               /* 123: "print" */
+    -734,               /* 124: "xdigit" */
+    498, -505,          /* 125: "QMark", "Quotation_Mark" */
+    509, -509,          /* 127: "Radical", "Radical" */
+    719, -535,          /* 129: "segstart", "Segment_Starter" */
+    522, -555,          /* 131: "SD", "Soft_Dotted" */
+    527, -527,          /* 133: "STerm", "STerm" */
+    596, -597,          /* 135: "Term", "Terminal_Punctuation" */
+    614, -621,          /* 137: "UIdeo", "Unified_Ideograph" */
+    623, -624,          /* 139: "Upper", "Uppercase" */
+    629, -630,          /* 141: "VS", "Variation_Selector" */
+    641, 643, -723,     /* 143: "WSpace", "White_Space", "space" */
+    647, -649,          /* 146: "XIDC", "XID_Continue" */
+    648, -650,          /* 148: "XIDS", "XID_Start" */
+    715, -451,          /* 150: "nv", "Numeric_Value" */
+    676, -58,           /* 152: "bc", "Bidi_Class" */
+    678, -63,           /* 154: "blk", "Block" */
+    681, -101,          /* 156: "ccc", "Canonical_Combining_Class" */
+    686, -153,          /* 158: "dt", "Decomposition_Type" */
+    687, -174,          /* 160: "ea", "East_Asian_Width" */
+    692, -207,          /* 162: "gc", "General_Category" */
+    203, -223,          /* 164: "GCB", "Grapheme_Cluster_Break" */
+    695, -247,          /* 166: "hst", "Hangul_Syllable_Type" */
+    699, -297,          /* 168: "jg", "Joining_Group" */
+    700, -298,          /* 170: "jt", "Joining_Type" */
+    703, -341,          /* 172: "lccc", "Lead_Canonical_Combining_Class" */
+    701, -354,          /* 174: "lb", "Line_Break" */
+    408, -409,          /* 176: "NFC_QC", "NFC_Quick_Check" */
+    411, -412,          /* 178: "NFD_QC", "NFD_Quick_Check" */
+    414, -415,          /* 180: "NFKC_QC", "NFKC_Quick_Check" */
+    417, -418,          /* 182: "NFKD_QC", "NFKD_Quick_Check" */
+    714, -450,          /* 184: "nt", "Numeric_Type" */
+    718, -532,          /* 186: "sc", "Script" */
+    521, -538,          /* 188: "SB", "Sentence_Break" */
+    730, -609,          /* 190: "tccc", "Trail_Canonical_Combining_Class" */
+    638, -645,          /* 192: "WB", "Word_Break" */
+    693, -208,          /* 194: "gcm", "General_Category_Mask" */
+    674, -18,           /* 196: "age", "Age" */
+    679, -62,           /* 198: "bmg", "Bidi_Mirroring_Glyph" */
+    682, -104,          /* 200: "cf", "Case_Folding" */
+    697, -278,          /* 202: "isc", "ISO_Comment" */
+    702, -368,          /* 204: "lc", "Lowercase_Mapping" */
+    705, -426,          /* 206: "na", "Name" */
+    720, -544,          /* 208: "sfc", "Simple_Case_Folding" */
+    721, -545,          /* 210: "slc", "Simple_Lowercase_Mapping" */
+    725, -546,          /* 212: "stc", "Simple_Titlecase_Mapping" */
+    727, -547,          /* 214: "suc", "Simple_Uppercase_Mapping" */
+    729, -608,          /* 216: "tc", "Titlecase_Mapping" */
+    706, -619,          /* 218: "na1", "Unicode_1_Name" */
+    731, -626,          /* 220: "uc", "Uppercase_Mapping" */
+    6, -31,             /* 222: "AN", "Arabic_Number" */
+    41, -478,           /* 224: "B", "Paragraph_Separator" */
+    47, -68,            /* 226: "BN", "Boundary_Neutral" */
+    98, -122,           /* 228: "CS", "Common_Separator" */
+    423, -440,          /* 230: "NSM", "Nonspacing_Mark" */
+    170, -182,          /* 232: "EN", "European_Number" */
+    171, -183,          /* 234: "ES", "European_Separator" */
+    172, -184,          /* 236: "ET", "European_Terminator" */
+    319, -345,          /* 238: "L", "Left_To_Right" */
+    325, -346,          /* 240: "LRE", "Left_To_Right_Embedding" */
+    326, -347,          /* 242: "LRO", "Left_To_Right_Override" */
+    454, -469,          /* 244: "ON", "Other_Neutral" */
+    475, -491,          /* 246: "PDF", "Pop_Directional_Format" */
+    506, -514,          /* 248: "R", "Right_To_Left" */
+    4, -30,             /* 250: "AL", "Arabic_Letter" */
+    507, -515,          /* 252: "RLE", "Right_To_Left_Embedding" */
+    508, -516,          /* 254: "RLO", "Right_To_Left_Override" */
+    519, -534,          /* 256: "S", "Segment_Separator" */
+    640, -643,          /* 258: "WS", "White_Space" */
+    190, -192,          /* 260: "F", "False" */
+    580, -612,          /* 262: "T", "True" */
+    0, -17,             /* 264: "", "Aegean_Numbers" */
+    0, -24,             /* 266: "", "Alphabetic_Presentation_Forms" */
+    0, -26,             /* 268: "", "Ancient_Greek_Musical_Notation" */
+    0, -27,             /* 270: "", "Ancient_Greek_Numbers" */
+    0, -29,             /* 272: "", "Arabic" */
+    0, -32,             /* 274: "", "Arabic_Presentation_Forms-A" */
+    0, -33,             /* 276: "", "Arabic_Presentation_Forms-B" */
+    0, -34,             /* 278: "", "Arabic_Supplement" */
+    0, -35,             /* 280: "", "Armenian" */
+    0, -37,             /* 282: "", "Arrows" */
+    0, -49,             /* 284: "", "Basic_Latin" */
+    0, -55,             /* 286: "", "Bengali" */
+    0, -64,             /* 288: "", "Block_Elements" */
+    0, -66,             /* 290: "", "Bopomofo" */
+    0, -67,             /* 292: "", "Bopomofo_Extended" */
+    0, -69,             /* 294: "", "Box_Drawing" */
+    0, -72,             /* 296: "", "Braille_Patterns" */
+    0, -78,             /* 298: "", "Buginese" */
+    0, -80,             /* 300: "", "Buhid" */
+    0, -81,             /* 302: "", "Byzantine_Musical_Symbols" */
+    0, -110,            /* 304: "", "Cherokee" */
+    0, -84,             /* 306: "", "CJK_Compatibility" */
+    0, -85,             /* 308: "", "CJK_Compatibility_Forms" */
+    0, -86,             /* 310: "", "CJK_Compatibility_Ideographs" */
+    0, -87,             /* 312: "", "CJK_Compatibility_Ideographs_Supplement" */
+    0, -88,             /* 314: "", "CJK_Radicals_Supplement" */
+    0, -89,             /* 316: "", "CJK_Strokes" */
+    0, -90,             /* 318: "", "CJK_Symbols_and_Punctuation" */
+    0, -91,             /* 320: "", "CJK_Unified_Ideographs" */
+    0, -92,             /* 322: "", "CJK_Unified_Ideographs_Extension_A" */
+    0, -93,             /* 324: "", "CJK_Unified_Ideographs_Extension_B" */
+    0, -116,            /* 326: "", "Combining_Diacritical_Marks" */
+    0, -117,            /* 328: "", "Combining_Diacritical_Marks_Supplement" */
+    0, -119,            /* 330: "", "Combining_Half_Marks" */
+    0, -118,            /* 332: "", "Combining_Diacritical_Marks_for_Symbols" */
+    0, -129,            /* 334: "", "Control_Pictures" */
+    0, -131,            /* 336: "", "Coptic" */
+    0, -135,            /* 338: "", "Currency_Symbols" */
+    0, -137,            /* 340: "", "Cypriot_Syllabary" */
+    0, -138,            /* 342: "", "Cyrillic" */
+    0, 139, -140,       /* 344: "", "Cyrillic_Supplement", "Cyrillic_Supplementary" */
+    0, -157,            /* 347: "", "Deseret" */
+    0, -159,            /* 349: "", "Devanagari" */
+    0, -164,            /* 351: "", "Dingbats" */
+    0, -175,            /* 353: "", "Enclosed_Alphanumerics" */
+    0, -176,            /* 355: "", "Enclosed_CJK_Letters_and_Months" */
+    0, -179,            /* 357: "", "Ethiopic" */
+    0, -180,            /* 359: "", "Ethiopic_Extended" */
+    0, -181,            /* 361: "", "Ethiopic_Supplement" */
+    0, -209,            /* 363: "", "General_Punctuation" */
+    0, -210,            /* 365: "", "Geometric_Shapes" */
+    0, -212,            /* 367: "", "Georgian" */
+    0, -213,            /* 369: "", "Georgian_Supplement" */
+    0, -215,            /* 371: "", "Glagolitic" */
+    0, -218,            /* 373: "", "Gothic" */
+    0, -228,            /* 375: "", "Greek_and_Coptic" */
+    0, -227,            /* 377: "", "Greek_Extended" */
+    0, -230,            /* 379: "", "Gujarati" */
+    0, -232,            /* 381: "", "Gurmukhi" */
+    0, -240,            /* 383: "", "Halfwidth_and_Fullwidth_Forms" */
+    0, -245,            /* 385: "", "Hangul_Compatibility_Jamo" */
+    0, -246,            /* 387: "", "Hangul_Jamo" */
+    0, -248,            /* 389: "", "Hangul_Syllables" */
+    0, -251,            /* 391: "", "Hanunoo" */
+    0, -254,            /* 393: "", "Hebrew" */
+    0, -260,            /* 395: "", "High_Private_Use_Surrogates" */
+    0, -261,            /* 397: "", "High_Surrogates" */
+    0, -263,            /* 399: "", "Hiragana" */
+    0, -281,            /* 401: "", "Ideographic_Description_Characters" */
+    0, -276,            /* 403: "", "IPA_Extensions" */
+    0, -304,            /* 405: "", "Kanbun" */
+    0, -305,            /* 407: "", "Kangxi_Radicals" */
+    0, -306,            /* 409: "", "Kannada" */
+    0, -308,            /* 411: "", "Katakana" */
+    0, -310,            /* 413: "", "Katakana_Phonetic_Extensions" */
+    0, -313,            /* 415: "", "Kharoshthi" */
+    0, -314,            /* 417: "", "Khmer" */
+    0, -315,            /* 419: "", "Khmer_Symbols" */
+    0, -333,            /* 421: "", "Lao" */
+    0, -336,            /* 423: "", "Latin-1_Supplement" */
+    0, -337,            /* 425: "", "Latin_Extended-A" */
+    0, -339,            /* 427: "", "Latin_Extended_Additional" */
+    0, -338,            /* 429: "", "Latin_Extended-B" */
+    0, -350,            /* 431: "", "Letterlike_Symbols" */
+    0, -352,            /* 433: "", "Limbu" */
+    0, -358,            /* 435: "", "Linear_B_Ideograms" */
+    0, -359,            /* 437: "", "Linear_B_Syllabary" */
+    0, -364,            /* 439: "", "Low_Surrogates" */
+    0, -374,            /* 441: "", "Malayalam" */
+    0, -379,            /* 443: "", "Mathematical_Alphanumeric_Symbols" */
+    0, -380,            /* 445: "", "Mathematical_Operators" */
+    0, -389,            /* 447: "", "Miscellaneous_Mathematical_Symbols-A" */
+    0, -390,            /* 449: "", "Miscellaneous_Mathematical_Symbols-B" */
+    0, -391,            /* 451: "", "Miscellaneous_Symbols" */
+    0, -392,            /* 453: "", "Miscellaneous_Symbols_and_Arrows" */
+    0, -393,            /* 455: "", "Miscellaneous_Technical" */
+    0, -398,            /* 457: "", "Modifier_Tone_Letters" */
+    0, -400,            /* 459: "", "Mongolian" */
+    0, -401,            /* 461: "", "Musical_Symbols" */
+    0, -402,            /* 463: "", "Myanmar" */
+    0, -430,            /* 465: "", "New_Tai_Lue" */
+    0, -434,            /* 467: "", "No_Block" */
+    0, -448,            /* 469: "", "Number_Forms" */
+    0, -458,            /* 471: "", "Ogham" */
+    0, -459,            /* 473: "", "Old_Italic" */
+    0, -460,            /* 475: "", "Old_Persian" */
+    0, -462,            /* 477: "", "Optical_Character_Recognition" */
+    0, -463,            /* 479: "", "Oriya" */
+    0, -466,            /* 481: "", "Osmanya" */
+    0, -487,            /* 483: "", "Phonetic_Extensions" */
+    0, -488,            /* 485: "", "Phonetic_Extensions_Supplement" */
+    0, -495,            /* 487: "", "Private_Use_Area" */
+    0, -517,            /* 489: "", "Runic" */
+    0, -541,            /* 491: "", "Shavian" */
+    0, -549,            /* 493: "", "Sinhala" */
+    0, -553,            /* 495: "", "Small_Form_Variants" */
+    0, -560,            /* 497: "", "Spacing_Modifier_Letters" */
+    0, -561,            /* 499: "", "Specials" */
+    0, -565,            /* 501: "", "Superscripts_and_Subscripts" */
+    0, -566,            /* 503: "", "Supplemental_Arrows-A" */
+    0, -567,            /* 505: "", "Supplemental_Arrows-B" */
+    0, -568,            /* 507: "", "Supplemental_Mathematical_Operators" */
+    0, -569,            /* 509: "", "Supplemental_Punctuation" */
+    0, -570,            /* 511: "", "Supplementary_Private_Use_Area-A" */
+    0, -571,            /* 513: "", "Supplementary_Private_Use_Area-B" */
+    0, -575,            /* 515: "", "Syloti_Nagri" */
+    0, -578,            /* 517: "", "Syriac" */
+    0, -581,            /* 519: "", "Tagalog" */
+    0, -583,            /* 521: "", "Tagbanwa" */
+    0, -584,            /* 523: "", "Tags" */
+    0, -586,            /* 525: "", "Tai_Le" */
+    0, -587,            /* 527: "", "Tai_Xuan_Jing_Symbols" */
+    0, -590,            /* 529: "", "Tamil" */
+    0, -595,            /* 531: "", "Telugu" */
+    0, -602,            /* 533: "", "Thaana" */
+    0, -603,            /* 535: "", "Thai" */
+    0, -604,            /* 537: "", "Tibetan" */
+    0, -606,            /* 539: "", "Tifinagh" */
+    0, -617,            /* 541: "", "Ugaritic" */
+    0, -620,            /* 543: "", "Unified_Canadian_Aboriginal_Syllabics" */
+    0, -631,            /* 545: "", "Variation_Selectors" */
+    0, -632,            /* 547: "", "Variation_Selectors_Supplement" */
+    0, -634,            /* 549: "", "Vertical_Forms" */
+    0, -662,            /* 551: "", "Yijing_Hexagram_Symbols" */
+    0, -659,            /* 553: "", "Yi_Radicals" */
+    0, -660,            /* 555: "", "Yi_Syllables" */
+    421, -444,          /* 557: "NR", "Not_Reordered" */
+    456, -473,          /* 559: "OV", "Overlay" */
+    12, -40,            /* 561: "ATBL", "Attached_Below_Left" */
+    11, -39,            /* 563: "ATB", "Attached_Below" */
+    10, -38,            /* 565: "ATAR", "Attached_Above_Right" */
+    46, -52,            /* 567: "BL", "Below_Left" */
+    41, -51,            /* 569: "B", "Below" */
+    48, -53,            /* 571: "BR", "Below_Right" */
+    319, -343,          /* 573: "L", "Left" */
+    506, -512,          /* 575: "R", "Right" */
+    4, -15,             /* 577: "AL", "Above_Left" */
+    1, -14,             /* 579: "A", "Above" */
+    7, -16,             /* 581: "AR", "Above_Right" */
+    144, -166,          /* 583: "DB", "Double_Below" */
+    143, -165,          /* 585: "DA", "Double_Above" */
+    277, -288,          /* 587: "IS", "Iota_Subscript" */
+    419, -446,          /* 589: "NK", "Nukta" */
+    300, -303,          /* 591: "KV", "Kana_Voicing" */
+    628, -635,          /* 593: "VR", "Virama" */
+    680, -100,          /* 595: "can", "Canonical" */
+    688, -111,          /* 597: "enc", "Circle" */
+    684, -124,          /* 599: "com", "Compat" */
+    689, -195,          /* 601: "fin", "Final" */
+    690, -198,          /* 603: "font", "Font" */
+    691, -200,          /* 605: "fra", "Fraction" */
+    696, -284,          /* 607: "init", "Initial" */
+    698, -289,          /* 609: "iso", "Isolated" */
+    704, -384,          /* 611: "med", "Medial" */
+    707, -427,          /* 613: "nar", "Narrow" */
+    708, -436,          /* 615: "nb", "Nobreak" */
+    713, -439,          /* 617: "none", "None" */
+    722, -552,          /* 619: "sml", "Small" */
+    724, -562,          /* 621: "sqr", "Square" */
+    726, -563,          /* 623: "sub", "Sub" */
+    728, -564,          /* 625: "sup", "Super" */
+    732, -633,          /* 627: "vert", "Vertical" */
+    733, -644,          /* 629: "wide", "Wide" */
+    1, -25,             /* 631: "A", "Ambiguous" */
+    190, -202,          /* 633: "F", "Fullwidth" */
+    234, -239,          /* 635: "H", "Halfwidth" */
+    425, -427,          /* 637: "Na", "Narrow" */
+    404, -429,          /* 639: "N", "Neutral" */
+    637, -644,          /* 641: "W", "Wide" */
+    382, -559,          /* 643: "Mc", "Spacing_Mark" */
+    483, -126,          /* 645: "Pc", "Connector_Punctuation" */
+    107, 128, -683,     /* 647: "Cc", "Control", "cntrl" */
+    531, -134,          /* 650: "Sc", "Currency_Symbol" */
+    484, -149,          /* 652: "Pd", "Dash_Punctuation" */
+    428, 152, -685,     /* 654: "Nd", "Decimal_Number", "digit" */
+    383, -177,          /* 657: "Me", "Enclosing_Mark" */
+    485, -113,          /* 659: "Pe", "Close_Punctuation" */
+    486, -196,          /* 661: "Pf", "Final_Punctuation" */
+    108, -199,          /* 663: "Cf", "Format" */
+    114, -618,          /* 665: "Cn", "Unassigned" */
+    489, -285,          /* 667: "Pi", "Initial_Punctuation" */
+    432, -349,          /* 669: "Nl", "Letter_Number" */
+    670, -356,          /* 671: "Zl", "Line_Separator" */
+    360, -367,          /* 673: "Ll", "Lowercase_Letter" */
+    551, -378,          /* 675: "Sm", "Math_Symbol" */
+    361, -396,          /* 677: "Lm", "Modifier_Letter" */
+    550, -397,          /* 679: "Sk", "Modifier_Symbol" */
+    395, -440,          /* 681: "Mn", "Nonspacing_Mark" */
+    362, -468,          /* 683: "Lo", "Other_Letter" */
+    433, -470,          /* 685: "No", "Other_Number" */
+    490, -471,          /* 687: "Po", "Other_Punctuation" */
+    554, -472,          /* 689: "So", "Other_Symbol" */
+    671, -478,          /* 691: "Zp", "Paragraph_Separator" */
+    115, -494,          /* 693: "Co", "Private_Use" */
+    672, -558,          /* 695: "Zs", "Space_Separator" */
+    496, -461,          /* 697: "Ps", "Open_Punctuation" */
+    133, -572,          /* 699: "Cs", "Surrogate" */
+    369, -607,          /* 701: "Lt", "Titlecase_Letter" */
+    370, -625,          /* 703: "Lu", "Uppercase_Letter" */
+    82, -467,           /* 705: "C", "Other" */
+    320, -106,          /* 707: "LC", "Cased_Letter" */
+    319, -348,          /* 709: "L", "Letter" */
+    371, -376,          /* 711: "M", "Mark" */
+    404, -447,          /* 713: "N", "Number" */
+    474, 497, -717,     /* 715: "P", "Punctuation", "punct" */
+    519, -576,          /* 718: "S", "Symbol" */
+    665, -540,          /* 720: "Z", "Separator" */
+    319, -342,          /* 722: "L", "Leading_Jamo" */
+    328, -329,          /* 724: "LVT", "LVT_Syllable" */
+    327, -330,          /* 726: "LV", "LV_Syllable" */
+    405, -443,          /* 728: "NA", "Not_Applicable" */
+    580, -610,          /* 730: "T", "Trailing_Jamo" */
+    627, -636,          /* 732: "V", "Vowel_Jamo" */
+    0, -19,             /* 734: "", "Ain" */
+    0, -20,             /* 736: "", "Alaph" */
+    0, -21,             /* 738: "", "Alef" */
+    0, -50,             /* 740: "", "Beh" */
+    0, -56,             /* 742: "", "Beth" */
+    0, -146,            /* 744: "", "Dal" */
+    0, -147,            /* 746: "", "Dalath_Rish" */
+    0, -169,            /* 748: "", "E" */
+    0, -193,            /* 750: "", "Fe" */
+    0, -194,            /* 752: "", "Feh" */
+    0, -197,            /* 754: "", "Final_Semkath" */
+    0, -205,            /* 756: "", "Gaf" */
+    0, -206,            /* 758: "", "Gamal" */
+    0, -238,            /* 760: "", "Hah" */
+    0, -241,            /* 762: "", "Hamza_On_Heh_Goal" */
+    0, -252,            /* 764: "", "He" */
+    0, -255,            /* 766: "", "Heh" */
+    0, -256,            /* 768: "", "Heh_Goal" */
+    0, -257,            /* 770: "", "Heth" */
+    0, -301,            /* 772: "", "Kaf" */
+    0, -307,            /* 774: "", "Kaph" */
+    0, -311,            /* 776: "", "Khaph" */
+    0, -318,            /* 778: "", "Knotted_Heh" */
+    0, -331,            /* 780: "", "Lam" */
+    0, -332,            /* 782: "", "Lamadh" */
+    0, -385,            /* 784: "", "Meem" */
+    0, -388,            /* 786: "", "Mim" */
+    0, -442,            /* 788: "", "Noon" */
+    0, -435,            /* 790: "", "No_Joining_Group" */
+    0, -452,            /* 792: "", "Nun" */
+    0, -485,            /* 794: "", "Pe" */
+    0, -502,            /* 796: "", "Qaf" */
+    0, -503,            /* 798: "", "Qaph" */
+    0, -510,            /* 800: "", "Reh" */
+    0, -511,            /* 802: "", "Reversed_Pe" */
+    0, -529,            /* 804: "", "Sad" */
+    0, -530,            /* 806: "", "Sadhe" */
+    0, -533,            /* 808: "", "Seen" */
+    0, -536,            /* 810: "", "Semkath" */
+    0, -543,            /* 812: "", "Shin" */
+    0, -573,            /* 814: "", "Swash_Kaf" */
+    0, -579,            /* 816: "", "Syriac_Waw" */
+    0, -585,            /* 818: "", "Tah" */
+    0, -592,            /* 820: "", "Taw" */
+    0, -593,            /* 822: "", "Teh_Marbuta" */
+    0, -598,            /* 824: "", "Teth" */
+    0, -642,            /* 826: "", "Waw" */
+    0, -654,            /* 828: "", "Yeh" */
+    0, -655,            /* 830: "", "Yeh_Barree" */
+    0, -656,            /* 832: "", "Yeh_With_Tail" */
+    0, -663,            /* 834: "", "Yudh" */
+    0, -664,            /* 836: "", "Yudh_He" */
+    0, -668,            /* 838: "", "Zain" */
+    0, -669,            /* 840: "", "Zhain" */
+    142, -168,          /* 842: "D", "Dual_Joining" */
+    82, -295,           /* 844: "C", "Join_Causing" */
+    319, -344,          /* 846: "L", "Left_Joining" */
+    613, -437,          /* 848: "U", "Non_Joining" */
+    506, -513,          /* 850: "R", "Right_Joining" */
+    580, -611,          /* 852: "T", "Transparent" */
+    4, -23,             /* 854: "AL", "Alphabetic" */
+    3, -25,             /* 856: "AI", "Ambiguous" */
+    43, -73,            /* 858: "BA", "Break_After" */
+    44, -74,            /* 860: "BB", "Break_Before" */
+    42, -75,            /* 862: "B2", "Break_Both" */
+    528, -76,           /* 864: "SY", "Break_Symbols" */
+    97, -103,           /* 866: "CR", "Carriage_Return" */
+    94, -113,           /* 868: "CL", "Close_Punctuation" */
+    95, -120,           /* 870: "CM", "Combining_Mark" */
+    520, -125,          /* 872: "SA", "Complex_Context" */
+    83, -127,           /* 874: "CB", "Contingent_Break" */
+    173, -185,          /* 876: "EX", "Exclamation" */
+    204, -216,          /* 878: "GL", "Glue" */
+    235, -235,          /* 880: "H2", "H2" */
+    236, -236,          /* 882: "H3", "H3" */
+    237, -265,          /* 884: "HY", "Hyphen" */
+    266, -280,          /* 886: "ID", "Ideographic" */
+    277, -282,          /* 888: "IS", "Infix_Numeric" */
+    275, 286, -287,     /* 890: "IN", "Inseparable", "Inseperable" */
+    291, -291,          /* 893: "JL", "JL" */
+    292, -292,          /* 895: "JT", "JT" */
+    293, -293,          /* 897: "JV", "JV" */
+    322, -355,          /* 899: "LF", "Line_Feed" */
+    45, -375,           /* 901: "BK", "Mandatory_Break" */
+    420, -431,          /* 903: "NL", "Next_Line" */
+    422, -441,          /* 905: "NS", "Nonstarter" */
+    455, -461,          /* 907: "OP", "Open_Punctuation" */
+    476, -492,          /* 909: "PO", "Postfix_Numeric" */
+    477, -493,          /* 911: "PR", "Prefix_Numeric" */
+    499, -504,          /* 913: "QU", "Quotation" */
+    525, -557,          /* 915: "SP", "Space" */
+    524, -572,          /* 917: "SG", "Surrogate" */
+    651, -622,          /* 919: "XX", "Unknown" */
+    639, -646,          /* 921: "WJ", "Word_Joiner" */
+    666, -667,          /* 923: "ZW", "ZWSpace" */
+    150, -151,          /* 925: "De", "Decimal" */
+    160, -163,          /* 927: "Di", "Digit" */
+    439, -439,          /* 929: "None", "None" */
+    445, -449,          /* 931: "Nu", "Numeric" */
+    28, -29,            /* 933: "Arab", "Arabic" */
+    36, -35,            /* 935: "Armn", "Armenian" */
+    54, -55,            /* 937: "Beng", "Bengali" */
+    65, -66,            /* 939: "Bopo", "Bopomofo" */
+    70, -71,            /* 941: "Brai", "Braille" */
+    77, -78,            /* 943: "Bugi", "Buginese" */
+    79, -80,            /* 945: "Buhd", "Buhid" */
+    102, -99,           /* 947: "Cans", "Canadian_Aboriginal" */
+    109, -110,          /* 949: "Cher", "Cherokee" */
+    673, -121,          /* 951: "Zyyy", "Common" */
+    130, 131, -500,     /* 953: "Copt", "Coptic", "Qaac" */
+    132, -136,          /* 956: "Cprt", "Cypriot" */
+    141, -138,          /* 958: "Cyrl", "Cyrillic" */
+    167, -157,          /* 960: "Dsrt", "Deseret" */
+    158, -159,          /* 962: "Deva", "Devanagari" */
+    178, -179,          /* 964: "Ethi", "Ethiopic" */
+    211, -212,          /* 966: "Geor", "Georgian" */
+    214, -215,          /* 968: "Glag", "Glagolitic" */
+    217, -218,          /* 970: "Goth", "Gothic" */
+    229, -226,          /* 972: "Grek", "Greek" */
+    231, -230,          /* 974: "Gujr", "Gujarati" */
+    233, -232,          /* 976: "Guru", "Gurmukhi" */
+    249, -242,          /* 978: "Hani", "Han" */
+    243, -244,          /* 980: "Hang", "Hangul" */
+    250, -251,          /* 982: "Hano", "Hanunoo" */
+    253, -254,          /* 984: "Hebr", "Hebrew" */
+    262, -263,          /* 986: "Hira", "Hiragana" */
+    501, -283,          /* 988: "Qaai", "Inherited" */
+    317, -306,          /* 990: "Knda", "Kannada" */
+    302, -308,          /* 992: "Kana", "Katakana" */
+    264, -309,          /* 994: "Hrkt", "Katakana_Or_Hiragana" */
+    312, -313,          /* 996: "Khar", "Kharoshthi" */
+    316, -314,          /* 998: "Khmr", "Khmer" */
+    334, -333,          /* 1000: "Laoo", "Lao" */
+    340, -335,          /* 1002: "Latn", "Latin" */
+    351, -352,          /* 1004: "Limb", "Limbu" */
+    353, -357,          /* 1006: "Linb", "Linear_B" */
+    394, -374,          /* 1008: "Mlym", "Malayalam" */
+    399, -400,          /* 1010: "Mong", "Mongolian" */
+    403, -402,          /* 1012: "Mymr", "Myanmar" */
+    589, -430,          /* 1014: "Talu", "New_Tai_Lue" */
+    457, -458,          /* 1016: "Ogam", "Ogham" */
+    290, -459,          /* 1018: "Ital", "Old_Italic" */
+    652, -460,          /* 1020: "Xpeo", "Old_Persian" */
+    464, -463,          /* 1022: "Orya", "Oriya" */
+    465, -466,          /* 1024: "Osma", "Osmanya" */
+    518, -517,          /* 1026: "Runr", "Runic" */
+    542, -541,          /* 1028: "Shaw", "Shavian" */
+    548, -549,          /* 1030: "Sinh", "Sinhala" */
+    574, -575,          /* 1032: "Sylo", "Syloti_Nagri" */
+    577, -578,          /* 1034: "Syrc", "Syriac" */
+    600, -581,          /* 1036: "Tglg", "Tagalog" */
+    582, -583,          /* 1038: "Tagb", "Tagbanwa" */
+    588, -586,          /* 1040: "Tale", "Tai_Le" */
+    591, -590,          /* 1042: "Taml", "Tamil" */
+    594, -595,          /* 1044: "Telu", "Telugu" */
+    601, -602,          /* 1046: "Thaa", "Thaana" */
+    603, -603,          /* 1048: "Thai", "Thai" */
+    605, -604,          /* 1050: "Tibt", "Tibetan" */
+    599, -606,          /* 1052: "Tfng", "Tifinagh" */
+    616, -617,          /* 1054: "Ugar", "Ugaritic" */
+    661, -658,          /* 1056: "Yiii", "Yi" */
 };
 
 #define MAX_NAMES_PER_GROUP 3
@@ -1368,568 +1378,568 @@ const Alias VALUES_WB[] = {
 const int32_t VALUES_bc_COUNT = 19;
 
 const Alias VALUES_bc[] = {
-    Alias((int32_t) U_ARABIC_NUMBER, 217),
-    Alias((int32_t) U_BLOCK_SEPARATOR, 219),
-    Alias((int32_t) U_BOUNDARY_NEUTRAL, 221),
-    Alias((int32_t) U_COMMON_NUMBER_SEPARATOR, 223),
-    Alias((int32_t) U_DIR_NON_SPACING_MARK, 225),
-    Alias((int32_t) U_EUROPEAN_NUMBER, 227),
-    Alias((int32_t) U_EUROPEAN_NUMBER_SEPARATOR, 229),
-    Alias((int32_t) U_EUROPEAN_NUMBER_TERMINATOR, 231),
-    Alias((int32_t) U_LEFT_TO_RIGHT, 233),
-    Alias((int32_t) U_LEFT_TO_RIGHT_EMBEDDING, 235),
-    Alias((int32_t) U_LEFT_TO_RIGHT_OVERRIDE, 237),
-    Alias((int32_t) U_OTHER_NEUTRAL, 239),
-    Alias((int32_t) U_POP_DIRECTIONAL_FORMAT, 241),
-    Alias((int32_t) U_RIGHT_TO_LEFT, 243),
-    Alias((int32_t) U_RIGHT_TO_LEFT_ARABIC, 245),
-    Alias((int32_t) U_RIGHT_TO_LEFT_EMBEDDING, 247),
-    Alias((int32_t) U_RIGHT_TO_LEFT_OVERRIDE, 249),
-    Alias((int32_t) U_SEGMENT_SEPARATOR, 251),
-    Alias((int32_t) U_WHITE_SPACE_NEUTRAL, 253),
+    Alias((int32_t) U_ARABIC_NUMBER, 222),
+    Alias((int32_t) U_BLOCK_SEPARATOR, 224),
+    Alias((int32_t) U_BOUNDARY_NEUTRAL, 226),
+    Alias((int32_t) U_COMMON_NUMBER_SEPARATOR, 228),
+    Alias((int32_t) U_DIR_NON_SPACING_MARK, 230),
+    Alias((int32_t) U_EUROPEAN_NUMBER, 232),
+    Alias((int32_t) U_EUROPEAN_NUMBER_SEPARATOR, 234),
+    Alias((int32_t) U_EUROPEAN_NUMBER_TERMINATOR, 236),
+    Alias((int32_t) U_LEFT_TO_RIGHT, 238),
+    Alias((int32_t) U_LEFT_TO_RIGHT_EMBEDDING, 240),
+    Alias((int32_t) U_LEFT_TO_RIGHT_OVERRIDE, 242),
+    Alias((int32_t) U_OTHER_NEUTRAL, 244),
+    Alias((int32_t) U_POP_DIRECTIONAL_FORMAT, 246),
+    Alias((int32_t) U_RIGHT_TO_LEFT, 248),
+    Alias((int32_t) U_RIGHT_TO_LEFT_ARABIC, 250),
+    Alias((int32_t) U_RIGHT_TO_LEFT_EMBEDDING, 252),
+    Alias((int32_t) U_RIGHT_TO_LEFT_OVERRIDE, 254),
+    Alias((int32_t) U_SEGMENT_SEPARATOR, 256),
+    Alias((int32_t) U_WHITE_SPACE_NEUTRAL, 258),
 };
 
 const int32_t VALUES_binprop_COUNT = 2;
 
 const Alias VALUES_binprop[] = {
-    Alias((int32_t) 0, 255),
-    Alias((int32_t) 1, 257),
+    Alias((int32_t) 0, 260),
+    Alias((int32_t) 1, 262),
 };
 
 const int32_t VALUES_blk_COUNT = 146;
 
 const Alias VALUES_blk[] = {
-    Alias((int32_t) UBLOCK_AEGEAN_NUMBERS, 259),
-    Alias((int32_t) UBLOCK_ALPHABETIC_PRESENTATION_FORMS, 261),
-    Alias((int32_t) UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION, 263),
-    Alias((int32_t) UBLOCK_ANCIENT_GREEK_NUMBERS, 265),
-    Alias((int32_t) UBLOCK_ARABIC, 267),
-    Alias((int32_t) UBLOCK_ARABIC_PRESENTATION_FORMS_A, 269),
-    Alias((int32_t) UBLOCK_ARABIC_PRESENTATION_FORMS_B, 271),
-    Alias((int32_t) UBLOCK_ARABIC_SUPPLEMENT, 273),
-    Alias((int32_t) UBLOCK_ARMENIAN, 275),
-    Alias((int32_t) UBLOCK_ARROWS, 277),
-    Alias((int32_t) UBLOCK_BASIC_LATIN, 279),
-    Alias((int32_t) UBLOCK_BENGALI, 281),
-    Alias((int32_t) UBLOCK_BLOCK_ELEMENTS, 283),
-    Alias((int32_t) UBLOCK_BOPOMOFO, 285),
-    Alias((int32_t) UBLOCK_BOPOMOFO_EXTENDED, 287),
-    Alias((int32_t) UBLOCK_BOX_DRAWING, 289),
-    Alias((int32_t) UBLOCK_BRAILLE_PATTERNS, 291),
-    Alias((int32_t) UBLOCK_BUGINESE, 293),
-    Alias((int32_t) UBLOCK_BUHID, 295),
-    Alias((int32_t) UBLOCK_BYZANTINE_MUSICAL_SYMBOLS, 297),
-    Alias((int32_t) UBLOCK_CHEROKEE, 299),
-    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY, 301),
-    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_FORMS, 303),
-    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, 305),
-    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, 307),
-    Alias((int32_t) UBLOCK_CJK_RADICALS_SUPPLEMENT, 309),
-    Alias((int32_t) UBLOCK_CJK_STROKES, 311),
-    Alias((int32_t) UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION, 313),
-    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS, 315),
-    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, 317),
-    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, 319),
-    Alias((int32_t) UBLOCK_COMBINING_DIACRITICAL_MARKS, 321),
-    Alias((int32_t) UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT, 323),
-    Alias((int32_t) UBLOCK_COMBINING_HALF_MARKS, 325),
-    Alias((int32_t) UBLOCK_COMBINING_MARKS_FOR_SYMBOLS, 327),
-    Alias((int32_t) UBLOCK_CONTROL_PICTURES, 329),
-    Alias((int32_t) UBLOCK_COPTIC, 331),
-    Alias((int32_t) UBLOCK_CURRENCY_SYMBOLS, 333),
-    Alias((int32_t) UBLOCK_CYPRIOT_SYLLABARY, 335),
-    Alias((int32_t) UBLOCK_CYRILLIC, 337),
-    Alias((int32_t) UBLOCK_CYRILLIC_SUPPLEMENT, 339),
-    Alias((int32_t) UBLOCK_DESERET, 342),
-    Alias((int32_t) UBLOCK_DEVANAGARI, 344),
-    Alias((int32_t) UBLOCK_DINGBATS, 346),
-    Alias((int32_t) UBLOCK_ENCLOSED_ALPHANUMERICS, 348),
-    Alias((int32_t) UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS, 350),
-    Alias((int32_t) UBLOCK_ETHIOPIC, 352),
-    Alias((int32_t) UBLOCK_ETHIOPIC_EXTENDED, 354),
-    Alias((int32_t) UBLOCK_ETHIOPIC_SUPPLEMENT, 356),
-    Alias((int32_t) UBLOCK_GENERAL_PUNCTUATION, 358),
-    Alias((int32_t) UBLOCK_GEOMETRIC_SHAPES, 360),
-    Alias((int32_t) UBLOCK_GEORGIAN, 362),
-    Alias((int32_t) UBLOCK_GEORGIAN_SUPPLEMENT, 364),
-    Alias((int32_t) UBLOCK_GLAGOLITIC, 366),
-    Alias((int32_t) UBLOCK_GOTHIC, 368),
-    Alias((int32_t) UBLOCK_GREEK, 370),
-    Alias((int32_t) UBLOCK_GREEK_EXTENDED, 372),
-    Alias((int32_t) UBLOCK_GUJARATI, 374),
-    Alias((int32_t) UBLOCK_GURMUKHI, 376),
-    Alias((int32_t) UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, 378),
-    Alias((int32_t) UBLOCK_HANGUL_COMPATIBILITY_JAMO, 380),
-    Alias((int32_t) UBLOCK_HANGUL_JAMO, 382),
-    Alias((int32_t) UBLOCK_HANGUL_SYLLABLES, 384),
-    Alias((int32_t) UBLOCK_HANUNOO, 386),
-    Alias((int32_t) UBLOCK_HEBREW, 388),
-    Alias((int32_t) UBLOCK_HIGH_PRIVATE_USE_SURROGATES, 390),
-    Alias((int32_t) UBLOCK_HIGH_SURROGATES, 392),
-    Alias((int32_t) UBLOCK_HIRAGANA, 394),
-    Alias((int32_t) UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS, 396),
-    Alias((int32_t) UBLOCK_IPA_EXTENSIONS, 398),
-    Alias((int32_t) UBLOCK_KANBUN, 400),
-    Alias((int32_t) UBLOCK_KANGXI_RADICALS, 402),
-    Alias((int32_t) UBLOCK_KANNADA, 404),
-    Alias((int32_t) UBLOCK_KATAKANA, 406),
-    Alias((int32_t) UBLOCK_KATAKANA_PHONETIC_EXTENSIONS, 408),
-    Alias((int32_t) UBLOCK_KHAROSHTHI, 410),
-    Alias((int32_t) UBLOCK_KHMER, 412),
-    Alias((int32_t) UBLOCK_KHMER_SYMBOLS, 414),
-    Alias((int32_t) UBLOCK_LAO, 416),
-    Alias((int32_t) UBLOCK_LATIN_1_SUPPLEMENT, 418),
-    Alias((int32_t) UBLOCK_LATIN_EXTENDED_A, 420),
-    Alias((int32_t) UBLOCK_LATIN_EXTENDED_ADDITIONAL, 422),
-    Alias((int32_t) UBLOCK_LATIN_EXTENDED_B, 424),
-    Alias((int32_t) UBLOCK_LETTERLIKE_SYMBOLS, 426),
-    Alias((int32_t) UBLOCK_LIMBU, 428),
-    Alias((int32_t) UBLOCK_LINEAR_B_IDEOGRAMS, 430),
-    Alias((int32_t) UBLOCK_LINEAR_B_SYLLABARY, 432),
-    Alias((int32_t) UBLOCK_LOW_SURROGATES, 434),
-    Alias((int32_t) UBLOCK_MALAYALAM, 436),
-    Alias((int32_t) UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS, 438),
-    Alias((int32_t) UBLOCK_MATHEMATICAL_OPERATORS, 440),
-    Alias((int32_t) UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A, 442),
-    Alias((int32_t) UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B, 444),
-    Alias((int32_t) UBLOCK_MISCELLANEOUS_SYMBOLS, 446),
-    Alias((int32_t) UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS, 448),
-    Alias((int32_t) UBLOCK_MISCELLANEOUS_TECHNICAL, 450),
-    Alias((int32_t) UBLOCK_MODIFIER_TONE_LETTERS, 452),
-    Alias((int32_t) UBLOCK_MONGOLIAN, 454),
-    Alias((int32_t) UBLOCK_MUSICAL_SYMBOLS, 456),
-    Alias((int32_t) UBLOCK_MYANMAR, 458),
-    Alias((int32_t) UBLOCK_NEW_TAI_LUE, 460),
-    Alias((int32_t) UBLOCK_NO_BLOCK, 462),
-    Alias((int32_t) UBLOCK_NUMBER_FORMS, 464),
-    Alias((int32_t) UBLOCK_OGHAM, 466),
-    Alias((int32_t) UBLOCK_OLD_ITALIC, 468),
-    Alias((int32_t) UBLOCK_OLD_PERSIAN, 470),
-    Alias((int32_t) UBLOCK_OPTICAL_CHARACTER_RECOGNITION, 472),
-    Alias((int32_t) UBLOCK_ORIYA, 474),
-    Alias((int32_t) UBLOCK_OSMANYA, 476),
-    Alias((int32_t) UBLOCK_PHONETIC_EXTENSIONS, 478),
-    Alias((int32_t) UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT, 480),
-    Alias((int32_t) UBLOCK_PRIVATE_USE_AREA, 482),
-    Alias((int32_t) UBLOCK_RUNIC, 484),
-    Alias((int32_t) UBLOCK_SHAVIAN, 486),
-    Alias((int32_t) UBLOCK_SINHALA, 488),
-    Alias((int32_t) UBLOCK_SMALL_FORM_VARIANTS, 490),
-    Alias((int32_t) UBLOCK_SPACING_MODIFIER_LETTERS, 492),
-    Alias((int32_t) UBLOCK_SPECIALS, 494),
-    Alias((int32_t) UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS, 496),
-    Alias((int32_t) UBLOCK_SUPPLEMENTAL_ARROWS_A, 498),
-    Alias((int32_t) UBLOCK_SUPPLEMENTAL_ARROWS_B, 500),
-    Alias((int32_t) UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS, 502),
-    Alias((int32_t) UBLOCK_SUPPLEMENTAL_PUNCTUATION, 504),
-    Alias((int32_t) UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A, 506),
-    Alias((int32_t) UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B, 508),
-    Alias((int32_t) UBLOCK_SYLOTI_NAGRI, 510),
-    Alias((int32_t) UBLOCK_SYRIAC, 512),
-    Alias((int32_t) UBLOCK_TAGALOG, 514),
-    Alias((int32_t) UBLOCK_TAGBANWA, 516),
-    Alias((int32_t) UBLOCK_TAGS, 518),
-    Alias((int32_t) UBLOCK_TAI_LE, 520),
-    Alias((int32_t) UBLOCK_TAI_XUAN_JING_SYMBOLS, 522),
-    Alias((int32_t) UBLOCK_TAMIL, 524),
-    Alias((int32_t) UBLOCK_TELUGU, 526),
-    Alias((int32_t) UBLOCK_THAANA, 528),
-    Alias((int32_t) UBLOCK_THAI, 530),
-    Alias((int32_t) UBLOCK_TIBETAN, 532),
-    Alias((int32_t) UBLOCK_TIFINAGH, 534),
-    Alias((int32_t) UBLOCK_UGARITIC, 536),
-    Alias((int32_t) UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS, 538),
-    Alias((int32_t) UBLOCK_VARIATION_SELECTORS, 540),
-    Alias((int32_t) UBLOCK_VARIATION_SELECTORS_SUPPLEMENT, 542),
-    Alias((int32_t) UBLOCK_VERTICAL_FORMS, 544),
-    Alias((int32_t) UBLOCK_YIJING_HEXAGRAM_SYMBOLS, 546),
-    Alias((int32_t) UBLOCK_YI_RADICALS, 548),
-    Alias((int32_t) UBLOCK_YI_SYLLABLES, 550),
+    Alias((int32_t) UBLOCK_AEGEAN_NUMBERS, 264),
+    Alias((int32_t) UBLOCK_ALPHABETIC_PRESENTATION_FORMS, 266),
+    Alias((int32_t) UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION, 268),
+    Alias((int32_t) UBLOCK_ANCIENT_GREEK_NUMBERS, 270),
+    Alias((int32_t) UBLOCK_ARABIC, 272),
+    Alias((int32_t) UBLOCK_ARABIC_PRESENTATION_FORMS_A, 274),
+    Alias((int32_t) UBLOCK_ARABIC_PRESENTATION_FORMS_B, 276),
+    Alias((int32_t) UBLOCK_ARABIC_SUPPLEMENT, 278),
+    Alias((int32_t) UBLOCK_ARMENIAN, 280),
+    Alias((int32_t) UBLOCK_ARROWS, 282),
+    Alias((int32_t) UBLOCK_BASIC_LATIN, 284),
+    Alias((int32_t) UBLOCK_BENGALI, 286),
+    Alias((int32_t) UBLOCK_BLOCK_ELEMENTS, 288),
+    Alias((int32_t) UBLOCK_BOPOMOFO, 290),
+    Alias((int32_t) UBLOCK_BOPOMOFO_EXTENDED, 292),
+    Alias((int32_t) UBLOCK_BOX_DRAWING, 294),
+    Alias((int32_t) UBLOCK_BRAILLE_PATTERNS, 296),
+    Alias((int32_t) UBLOCK_BUGINESE, 298),
+    Alias((int32_t) UBLOCK_BUHID, 300),
+    Alias((int32_t) UBLOCK_BYZANTINE_MUSICAL_SYMBOLS, 302),
+    Alias((int32_t) UBLOCK_CHEROKEE, 304),
+    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY, 306),
+    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_FORMS, 308),
+    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, 310),
+    Alias((int32_t) UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT, 312),
+    Alias((int32_t) UBLOCK_CJK_RADICALS_SUPPLEMENT, 314),
+    Alias((int32_t) UBLOCK_CJK_STROKES, 316),
+    Alias((int32_t) UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION, 318),
+    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS, 320),
+    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A, 322),
+    Alias((int32_t) UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, 324),
+    Alias((int32_t) UBLOCK_COMBINING_DIACRITICAL_MARKS, 326),
+    Alias((int32_t) UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT, 328),
+    Alias((int32_t) UBLOCK_COMBINING_HALF_MARKS, 330),
+    Alias((int32_t) UBLOCK_COMBINING_MARKS_FOR_SYMBOLS, 332),
+    Alias((int32_t) UBLOCK_CONTROL_PICTURES, 334),
+    Alias((int32_t) UBLOCK_COPTIC, 336),
+    Alias((int32_t) UBLOCK_CURRENCY_SYMBOLS, 338),
+    Alias((int32_t) UBLOCK_CYPRIOT_SYLLABARY, 340),
+    Alias((int32_t) UBLOCK_CYRILLIC, 342),
+    Alias((int32_t) UBLOCK_CYRILLIC_SUPPLEMENT, 344),
+    Alias((int32_t) UBLOCK_DESERET, 347),
+    Alias((int32_t) UBLOCK_DEVANAGARI, 349),
+    Alias((int32_t) UBLOCK_DINGBATS, 351),
+    Alias((int32_t) UBLOCK_ENCLOSED_ALPHANUMERICS, 353),
+    Alias((int32_t) UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS, 355),
+    Alias((int32_t) UBLOCK_ETHIOPIC, 357),
+    Alias((int32_t) UBLOCK_ETHIOPIC_EXTENDED, 359),
+    Alias((int32_t) UBLOCK_ETHIOPIC_SUPPLEMENT, 361),
+    Alias((int32_t) UBLOCK_GENERAL_PUNCTUATION, 363),
+    Alias((int32_t) UBLOCK_GEOMETRIC_SHAPES, 365),
+    Alias((int32_t) UBLOCK_GEORGIAN, 367),
+    Alias((int32_t) UBLOCK_GEORGIAN_SUPPLEMENT, 369),
+    Alias((int32_t) UBLOCK_GLAGOLITIC, 371),
+    Alias((int32_t) UBLOCK_GOTHIC, 373),
+    Alias((int32_t) UBLOCK_GREEK, 375),
+    Alias((int32_t) UBLOCK_GREEK_EXTENDED, 377),
+    Alias((int32_t) UBLOCK_GUJARATI, 379),
+    Alias((int32_t) UBLOCK_GURMUKHI, 381),
+    Alias((int32_t) UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS, 383),
+    Alias((int32_t) UBLOCK_HANGUL_COMPATIBILITY_JAMO, 385),
+    Alias((int32_t) UBLOCK_HANGUL_JAMO, 387),
+    Alias((int32_t) UBLOCK_HANGUL_SYLLABLES, 389),
+    Alias((int32_t) UBLOCK_HANUNOO, 391),
+    Alias((int32_t) UBLOCK_HEBREW, 393),
+    Alias((int32_t) UBLOCK_HIGH_PRIVATE_USE_SURROGATES, 395),
+    Alias((int32_t) UBLOCK_HIGH_SURROGATES, 397),
+    Alias((int32_t) UBLOCK_HIRAGANA, 399),
+    Alias((int32_t) UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS, 401),
+    Alias((int32_t) UBLOCK_IPA_EXTENSIONS, 403),
+    Alias((int32_t) UBLOCK_KANBUN, 405),
+    Alias((int32_t) UBLOCK_KANGXI_RADICALS, 407),
+    Alias((int32_t) UBLOCK_KANNADA, 409),
+    Alias((int32_t) UBLOCK_KATAKANA, 411),
+    Alias((int32_t) UBLOCK_KATAKANA_PHONETIC_EXTENSIONS, 413),
+    Alias((int32_t) UBLOCK_KHAROSHTHI, 415),
+    Alias((int32_t) UBLOCK_KHMER, 417),
+    Alias((int32_t) UBLOCK_KHMER_SYMBOLS, 419),
+    Alias((int32_t) UBLOCK_LAO, 421),
+    Alias((int32_t) UBLOCK_LATIN_1_SUPPLEMENT, 423),
+    Alias((int32_t) UBLOCK_LATIN_EXTENDED_A, 425),
+    Alias((int32_t) UBLOCK_LATIN_EXTENDED_ADDITIONAL, 427),
+    Alias((int32_t) UBLOCK_LATIN_EXTENDED_B, 429),
+    Alias((int32_t) UBLOCK_LETTERLIKE_SYMBOLS, 431),
+    Alias((int32_t) UBLOCK_LIMBU, 433),
+    Alias((int32_t) UBLOCK_LINEAR_B_IDEOGRAMS, 435),
+    Alias((int32_t) UBLOCK_LINEAR_B_SYLLABARY, 437),
+    Alias((int32_t) UBLOCK_LOW_SURROGATES, 439),
+    Alias((int32_t) UBLOCK_MALAYALAM, 441),
+    Alias((int32_t) UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS, 443),
+    Alias((int32_t) UBLOCK_MATHEMATICAL_OPERATORS, 445),
+    Alias((int32_t) UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A, 447),
+    Alias((int32_t) UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B, 449),
+    Alias((int32_t) UBLOCK_MISCELLANEOUS_SYMBOLS, 451),
+    Alias((int32_t) UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS, 453),
+    Alias((int32_t) UBLOCK_MISCELLANEOUS_TECHNICAL, 455),
+    Alias((int32_t) UBLOCK_MODIFIER_TONE_LETTERS, 457),
+    Alias((int32_t) UBLOCK_MONGOLIAN, 459),
+    Alias((int32_t) UBLOCK_MUSICAL_SYMBOLS, 461),
+    Alias((int32_t) UBLOCK_MYANMAR, 463),
+    Alias((int32_t) UBLOCK_NEW_TAI_LUE, 465),
+    Alias((int32_t) UBLOCK_NO_BLOCK, 467),
+    Alias((int32_t) UBLOCK_NUMBER_FORMS, 469),
+    Alias((int32_t) UBLOCK_OGHAM, 471),
+    Alias((int32_t) UBLOCK_OLD_ITALIC, 473),
+    Alias((int32_t) UBLOCK_OLD_PERSIAN, 475),
+    Alias((int32_t) UBLOCK_OPTICAL_CHARACTER_RECOGNITION, 477),
+    Alias((int32_t) UBLOCK_ORIYA, 479),
+    Alias((int32_t) UBLOCK_OSMANYA, 481),
+    Alias((int32_t) UBLOCK_PHONETIC_EXTENSIONS, 483),
+    Alias((int32_t) UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT, 485),
+    Alias((int32_t) UBLOCK_PRIVATE_USE_AREA, 487),
+    Alias((int32_t) UBLOCK_RUNIC, 489),
+    Alias((int32_t) UBLOCK_SHAVIAN, 491),
+    Alias((int32_t) UBLOCK_SINHALA, 493),
+    Alias((int32_t) UBLOCK_SMALL_FORM_VARIANTS, 495),
+    Alias((int32_t) UBLOCK_SPACING_MODIFIER_LETTERS, 497),
+    Alias((int32_t) UBLOCK_SPECIALS, 499),
+    Alias((int32_t) UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS, 501),
+    Alias((int32_t) UBLOCK_SUPPLEMENTAL_ARROWS_A, 503),
+    Alias((int32_t) UBLOCK_SUPPLEMENTAL_ARROWS_B, 505),
+    Alias((int32_t) UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS, 507),
+    Alias((int32_t) UBLOCK_SUPPLEMENTAL_PUNCTUATION, 509),
+    Alias((int32_t) UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A, 511),
+    Alias((int32_t) UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B, 513),
+    Alias((int32_t) UBLOCK_SYLOTI_NAGRI, 515),
+    Alias((int32_t) UBLOCK_SYRIAC, 517),
+    Alias((int32_t) UBLOCK_TAGALOG, 519),
+    Alias((int32_t) UBLOCK_TAGBANWA, 521),
+    Alias((int32_t) UBLOCK_TAGS, 523),
+    Alias((int32_t) UBLOCK_TAI_LE, 525),
+    Alias((int32_t) UBLOCK_TAI_XUAN_JING_SYMBOLS, 527),
+    Alias((int32_t) UBLOCK_TAMIL, 529),
+    Alias((int32_t) UBLOCK_TELUGU, 531),
+    Alias((int32_t) UBLOCK_THAANA, 533),
+    Alias((int32_t) UBLOCK_THAI, 535),
+    Alias((int32_t) UBLOCK_TIBETAN, 537),
+    Alias((int32_t) UBLOCK_TIFINAGH, 539),
+    Alias((int32_t) UBLOCK_UGARITIC, 541),
+    Alias((int32_t) UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS, 543),
+    Alias((int32_t) UBLOCK_VARIATION_SELECTORS, 545),
+    Alias((int32_t) UBLOCK_VARIATION_SELECTORS_SUPPLEMENT, 547),
+    Alias((int32_t) UBLOCK_VERTICAL_FORMS, 549),
+    Alias((int32_t) UBLOCK_YIJING_HEXAGRAM_SYMBOLS, 551),
+    Alias((int32_t) UBLOCK_YI_RADICALS, 553),
+    Alias((int32_t) UBLOCK_YI_SYLLABLES, 555),
 };
 
 const int32_t VALUES_ccc_COUNT = 19;
 
 const Alias VALUES_ccc[] = {
-    Alias((int32_t) 0, 552),
-    Alias((int32_t) 1, 554),
-    Alias((int32_t) 200, 556),
-    Alias((int32_t) 202, 558),
-    Alias((int32_t) 216, 560),
-    Alias((int32_t) 218, 562),
-    Alias((int32_t) 220, 564),
-    Alias((int32_t) 222, 566),
-    Alias((int32_t) 224, 568),
-    Alias((int32_t) 226, 570),
-    Alias((int32_t) 228, 572),
-    Alias((int32_t) 230, 574),
-    Alias((int32_t) 232, 576),
-    Alias((int32_t) 233, 578),
-    Alias((int32_t) 234, 580),
-    Alias((int32_t) 240, 582),
-    Alias((int32_t) 7, 584),
-    Alias((int32_t) 8, 586),
-    Alias((int32_t) 9, 588),
+    Alias((int32_t) 0, 557),
+    Alias((int32_t) 1, 559),
+    Alias((int32_t) 200, 561),
+    Alias((int32_t) 202, 563),
+    Alias((int32_t) 216, 565),
+    Alias((int32_t) 218, 567),
+    Alias((int32_t) 220, 569),
+    Alias((int32_t) 222, 571),
+    Alias((int32_t) 224, 573),
+    Alias((int32_t) 226, 575),
+    Alias((int32_t) 228, 577),
+    Alias((int32_t) 230, 579),
+    Alias((int32_t) 232, 581),
+    Alias((int32_t) 233, 583),
+    Alias((int32_t) 234, 585),
+    Alias((int32_t) 240, 587),
+    Alias((int32_t) 7, 589),
+    Alias((int32_t) 8, 591),
+    Alias((int32_t) 9, 593),
 };
 
 const int32_t VALUES_dt_COUNT = 18;
 
 const Alias VALUES_dt[] = {
-    Alias((int32_t) U_DT_CANONICAL, 590),
-    Alias((int32_t) U_DT_CIRCLE, 592),
-    Alias((int32_t) U_DT_COMPAT, 594),
-    Alias((int32_t) U_DT_FINAL, 596),
-    Alias((int32_t) U_DT_FONT, 598),
-    Alias((int32_t) U_DT_FRACTION, 600),
-    Alias((int32_t) U_DT_INITIAL, 602),
-    Alias((int32_t) U_DT_ISOLATED, 604),
-    Alias((int32_t) U_DT_MEDIAL, 606),
-    Alias((int32_t) U_DT_NARROW, 608),
-    Alias((int32_t) U_DT_NOBREAK, 610),
-    Alias((int32_t) U_DT_NONE, 612),
-    Alias((int32_t) U_DT_SMALL, 614),
-    Alias((int32_t) U_DT_SQUARE, 616),
-    Alias((int32_t) U_DT_SUB, 618),
-    Alias((int32_t) U_DT_SUPER, 620),
-    Alias((int32_t) U_DT_VERTICAL, 622),
-    Alias((int32_t) U_DT_WIDE, 624),
+    Alias((int32_t) U_DT_CANONICAL, 595),
+    Alias((int32_t) U_DT_CIRCLE, 597),
+    Alias((int32_t) U_DT_COMPAT, 599),
+    Alias((int32_t) U_DT_FINAL, 601),
+    Alias((int32_t) U_DT_FONT, 603),
+    Alias((int32_t) U_DT_FRACTION, 605),
+    Alias((int32_t) U_DT_INITIAL, 607),
+    Alias((int32_t) U_DT_ISOLATED, 609),
+    Alias((int32_t) U_DT_MEDIAL, 611),
+    Alias((int32_t) U_DT_NARROW, 613),
+    Alias((int32_t) U_DT_NOBREAK, 615),
+    Alias((int32_t) U_DT_NONE, 617),
+    Alias((int32_t) U_DT_SMALL, 619),
+    Alias((int32_t) U_DT_SQUARE, 621),
+    Alias((int32_t) U_DT_SUB, 623),
+    Alias((int32_t) U_DT_SUPER, 625),
+    Alias((int32_t) U_DT_VERTICAL, 627),
+    Alias((int32_t) U_DT_WIDE, 629),
 };
 
 const int32_t VALUES_ea_COUNT = 6;
 
 const Alias VALUES_ea[] = {
-    Alias((int32_t) U_EA_AMBIGUOUS, 626),
-    Alias((int32_t) U_EA_FULLWIDTH, 628),
-    Alias((int32_t) U_EA_HALFWIDTH, 630),
-    Alias((int32_t) U_EA_NARROW, 632),
-    Alias((int32_t) U_EA_NEUTRAL, 634),
-    Alias((int32_t) U_EA_WIDE, 636),
+    Alias((int32_t) U_EA_AMBIGUOUS, 631),
+    Alias((int32_t) U_EA_FULLWIDTH, 633),
+    Alias((int32_t) U_EA_HALFWIDTH, 635),
+    Alias((int32_t) U_EA_NARROW, 637),
+    Alias((int32_t) U_EA_NEUTRAL, 639),
+    Alias((int32_t) U_EA_WIDE, 641),
 };
 
 const int32_t VALUES_gc_COUNT = 30;
 
 const Alias VALUES_gc[] = {
-    Alias((int32_t) U_COMBINING_SPACING_MARK, 638),
-    Alias((int32_t) U_CONNECTOR_PUNCTUATION, 640),
-    Alias((int32_t) U_CONTROL_CHAR, 642),
-    Alias((int32_t) U_CURRENCY_SYMBOL, 645),
-    Alias((int32_t) U_DASH_PUNCTUATION, 647),
-    Alias((int32_t) U_DECIMAL_DIGIT_NUMBER, 649),
-    Alias((int32_t) U_ENCLOSING_MARK, 652),
-    Alias((int32_t) U_END_PUNCTUATION, 654),
-    Alias((int32_t) U_FINAL_PUNCTUATION, 656),
-    Alias((int32_t) U_FORMAT_CHAR, 658),
-    Alias((int32_t) U_GENERAL_OTHER_TYPES, 660),
-    Alias((int32_t) U_INITIAL_PUNCTUATION, 662),
-    Alias((int32_t) U_LETTER_NUMBER, 664),
-    Alias((int32_t) U_LINE_SEPARATOR, 666),
-    Alias((int32_t) U_LOWERCASE_LETTER, 668),
-    Alias((int32_t) U_MATH_SYMBOL, 670),
-    Alias((int32_t) U_MODIFIER_LETTER, 672),
-    Alias((int32_t) U_MODIFIER_SYMBOL, 674),
-    Alias((int32_t) U_NON_SPACING_MARK, 676),
-    Alias((int32_t) U_OTHER_LETTER, 678),
-    Alias((int32_t) U_OTHER_NUMBER, 680),
-    Alias((int32_t) U_OTHER_PUNCTUATION, 682),
-    Alias((int32_t) U_OTHER_SYMBOL, 684),
-    Alias((int32_t) U_PARAGRAPH_SEPARATOR, 686),
-    Alias((int32_t) U_PRIVATE_USE_CHAR, 688),
-    Alias((int32_t) U_SPACE_SEPARATOR, 690),
-    Alias((int32_t) U_START_PUNCTUATION, 692),
-    Alias((int32_t) U_SURROGATE, 694),
-    Alias((int32_t) U_TITLECASE_LETTER, 696),
-    Alias((int32_t) U_UPPERCASE_LETTER, 698),
+    Alias((int32_t) U_COMBINING_SPACING_MARK, 643),
+    Alias((int32_t) U_CONNECTOR_PUNCTUATION, 645),
+    Alias((int32_t) U_CONTROL_CHAR, 647),
+    Alias((int32_t) U_CURRENCY_SYMBOL, 650),
+    Alias((int32_t) U_DASH_PUNCTUATION, 652),
+    Alias((int32_t) U_DECIMAL_DIGIT_NUMBER, 654),
+    Alias((int32_t) U_ENCLOSING_MARK, 657),
+    Alias((int32_t) U_END_PUNCTUATION, 659),
+    Alias((int32_t) U_FINAL_PUNCTUATION, 661),
+    Alias((int32_t) U_FORMAT_CHAR, 663),
+    Alias((int32_t) U_GENERAL_OTHER_TYPES, 665),
+    Alias((int32_t) U_INITIAL_PUNCTUATION, 667),
+    Alias((int32_t) U_LETTER_NUMBER, 669),
+    Alias((int32_t) U_LINE_SEPARATOR, 671),
+    Alias((int32_t) U_LOWERCASE_LETTER, 673),
+    Alias((int32_t) U_MATH_SYMBOL, 675),
+    Alias((int32_t) U_MODIFIER_LETTER, 677),
+    Alias((int32_t) U_MODIFIER_SYMBOL, 679),
+    Alias((int32_t) U_NON_SPACING_MARK, 681),
+    Alias((int32_t) U_OTHER_LETTER, 683),
+    Alias((int32_t) U_OTHER_NUMBER, 685),
+    Alias((int32_t) U_OTHER_PUNCTUATION, 687),
+    Alias((int32_t) U_OTHER_SYMBOL, 689),
+    Alias((int32_t) U_PARAGRAPH_SEPARATOR, 691),
+    Alias((int32_t) U_PRIVATE_USE_CHAR, 693),
+    Alias((int32_t) U_SPACE_SEPARATOR, 695),
+    Alias((int32_t) U_START_PUNCTUATION, 697),
+    Alias((int32_t) U_SURROGATE, 699),
+    Alias((int32_t) U_TITLECASE_LETTER, 701),
+    Alias((int32_t) U_UPPERCASE_LETTER, 703),
 };
 
 const int32_t VALUES_gcm_COUNT = 38;
 
 const Alias VALUES_gcm[] = {
-    Alias((int32_t) U_GC_CC_MASK, 642),
-    Alias((int32_t) U_GC_CF_MASK, 658),
-    Alias((int32_t) U_GC_CN_MASK, 660),
-    Alias((int32_t) U_GC_CO_MASK, 688),
-    Alias((int32_t) U_GC_CS_MASK, 694),
-    Alias((int32_t) U_GC_C_MASK, 700),
-    Alias((int32_t) U_GC_LC_MASK, 702),
-    Alias((int32_t) U_GC_LL_MASK, 668),
-    Alias((int32_t) U_GC_LM_MASK, 672),
-    Alias((int32_t) U_GC_LO_MASK, 678),
-    Alias((int32_t) U_GC_LT_MASK, 696),
-    Alias((int32_t) U_GC_LU_MASK, 698),
-    Alias((int32_t) U_GC_L_MASK, 704),
-    Alias((int32_t) U_GC_MC_MASK, 638),
-    Alias((int32_t) U_GC_ME_MASK, 652),
-    Alias((int32_t) U_GC_MN_MASK, 676),
-    Alias((int32_t) U_GC_M_MASK, 706),
-    Alias((int32_t) U_GC_ND_MASK, 649),
-    Alias((int32_t) U_GC_NL_MASK, 664),
-    Alias((int32_t) U_GC_NO_MASK, 680),
-    Alias((int32_t) U_GC_N_MASK, 708),
-    Alias((int32_t) U_GC_PC_MASK, 640),
-    Alias((int32_t) U_GC_PD_MASK, 647),
-    Alias((int32_t) U_GC_PE_MASK, 654),
-    Alias((int32_t) U_GC_PF_MASK, 656),
-    Alias((int32_t) U_GC_PI_MASK, 662),
-    Alias((int32_t) U_GC_PO_MASK, 682),
-    Alias((int32_t) U_GC_PS_MASK, 692),
-    Alias((int32_t) U_GC_P_MASK, 710),
-    Alias((int32_t) U_GC_SC_MASK, 645),
-    Alias((int32_t) U_GC_SK_MASK, 674),
-    Alias((int32_t) U_GC_SM_MASK, 670),
-    Alias((int32_t) U_GC_SO_MASK, 684),
-    Alias((int32_t) U_GC_S_MASK, 713),
-    Alias((int32_t) U_GC_ZL_MASK, 666),
-    Alias((int32_t) U_GC_ZP_MASK, 686),
-    Alias((int32_t) U_GC_ZS_MASK, 690),
-    Alias((int32_t) U_GC_Z_MASK, 715),
+    Alias((int32_t) U_GC_CC_MASK, 647),
+    Alias((int32_t) U_GC_CF_MASK, 663),
+    Alias((int32_t) U_GC_CN_MASK, 665),
+    Alias((int32_t) U_GC_CO_MASK, 693),
+    Alias((int32_t) U_GC_CS_MASK, 699),
+    Alias((int32_t) U_GC_C_MASK, 705),
+    Alias((int32_t) U_GC_LC_MASK, 707),
+    Alias((int32_t) U_GC_LL_MASK, 673),
+    Alias((int32_t) U_GC_LM_MASK, 677),
+    Alias((int32_t) U_GC_LO_MASK, 683),
+    Alias((int32_t) U_GC_LT_MASK, 701),
+    Alias((int32_t) U_GC_LU_MASK, 703),
+    Alias((int32_t) U_GC_L_MASK, 709),
+    Alias((int32_t) U_GC_MC_MASK, 643),
+    Alias((int32_t) U_GC_ME_MASK, 657),
+    Alias((int32_t) U_GC_MN_MASK, 681),
+    Alias((int32_t) U_GC_M_MASK, 711),
+    Alias((int32_t) U_GC_ND_MASK, 654),
+    Alias((int32_t) U_GC_NL_MASK, 669),
+    Alias((int32_t) U_GC_NO_MASK, 685),
+    Alias((int32_t) U_GC_N_MASK, 713),
+    Alias((int32_t) U_GC_PC_MASK, 645),
+    Alias((int32_t) U_GC_PD_MASK, 652),
+    Alias((int32_t) U_GC_PE_MASK, 659),
+    Alias((int32_t) U_GC_PF_MASK, 661),
+    Alias((int32_t) U_GC_PI_MASK, 667),
+    Alias((int32_t) U_GC_PO_MASK, 687),
+    Alias((int32_t) U_GC_PS_MASK, 697),
+    Alias((int32_t) U_GC_P_MASK, 715),
+    Alias((int32_t) U_GC_SC_MASK, 650),
+    Alias((int32_t) U_GC_SK_MASK, 679),
+    Alias((int32_t) U_GC_SM_MASK, 675),
+    Alias((int32_t) U_GC_SO_MASK, 689),
+    Alias((int32_t) U_GC_S_MASK, 718),
+    Alias((int32_t) U_GC_ZL_MASK, 671),
+    Alias((int32_t) U_GC_ZP_MASK, 691),
+    Alias((int32_t) U_GC_ZS_MASK, 695),
+    Alias((int32_t) U_GC_Z_MASK, 720),
 };
 
 const int32_t VALUES_hst_COUNT = 6;
 
 const Alias VALUES_hst[] = {
-    Alias((int32_t) U_HST_LEADING_JAMO, 717),
-    Alias((int32_t) U_HST_LVT_SYLLABLE, 719),
-    Alias((int32_t) U_HST_LV_SYLLABLE, 721),
-    Alias((int32_t) U_HST_NOT_APPLICABLE, 723),
-    Alias((int32_t) U_HST_TRAILING_JAMO, 725),
-    Alias((int32_t) U_HST_VOWEL_JAMO, 727),
+    Alias((int32_t) U_HST_LEADING_JAMO, 722),
+    Alias((int32_t) U_HST_LVT_SYLLABLE, 724),
+    Alias((int32_t) U_HST_LV_SYLLABLE, 726),
+    Alias((int32_t) U_HST_NOT_APPLICABLE, 728),
+    Alias((int32_t) U_HST_TRAILING_JAMO, 730),
+    Alias((int32_t) U_HST_VOWEL_JAMO, 732),
 };
 
 const int32_t VALUES_jg_COUNT = 54;
 
 const Alias VALUES_jg[] = {
-    Alias((int32_t) U_JG_AIN, 729),
-    Alias((int32_t) U_JG_ALAPH, 731),
-    Alias((int32_t) U_JG_ALEF, 733),
-    Alias((int32_t) U_JG_BEH, 735),
-    Alias((int32_t) U_JG_BETH, 737),
-    Alias((int32_t) U_JG_DAL, 739),
-    Alias((int32_t) U_JG_DALATH_RISH, 741),
-    Alias((int32_t) U_JG_E, 743),
-    Alias((int32_t) U_JG_FE, 745),
-    Alias((int32_t) U_JG_FEH, 747),
-    Alias((int32_t) U_JG_FINAL_SEMKATH, 749),
-    Alias((int32_t) U_JG_GAF, 751),
-    Alias((int32_t) U_JG_GAMAL, 753),
-    Alias((int32_t) U_JG_HAH, 755),
-    Alias((int32_t) U_JG_HAMZA_ON_HEH_GOAL, 757),
-    Alias((int32_t) U_JG_HE, 759),
-    Alias((int32_t) U_JG_HEH, 761),
-    Alias((int32_t) U_JG_HEH_GOAL, 763),
-    Alias((int32_t) U_JG_HETH, 765),
-    Alias((int32_t) U_JG_KAF, 767),
-    Alias((int32_t) U_JG_KAPH, 769),
-    Alias((int32_t) U_JG_KHAPH, 771),
-    Alias((int32_t) U_JG_KNOTTED_HEH, 773),
-    Alias((int32_t) U_JG_LAM, 775),
-    Alias((int32_t) U_JG_LAMADH, 777),
-    Alias((int32_t) U_JG_MEEM, 779),
-    Alias((int32_t) U_JG_MIM, 781),
-    Alias((int32_t) U_JG_NOON, 783),
-    Alias((int32_t) U_JG_NO_JOINING_GROUP, 785),
-    Alias((int32_t) U_JG_NUN, 787),
-    Alias((int32_t) U_JG_PE, 789),
-    Alias((int32_t) U_JG_QAF, 791),
-    Alias((int32_t) U_JG_QAPH, 793),
-    Alias((int32_t) U_JG_REH, 795),
-    Alias((int32_t) U_JG_REVERSED_PE, 797),
-    Alias((int32_t) U_JG_SAD, 799),
-    Alias((int32_t) U_JG_SADHE, 801),
-    Alias((int32_t) U_JG_SEEN, 803),
-    Alias((int32_t) U_JG_SEMKATH, 805),
-    Alias((int32_t) U_JG_SHIN, 807),
-    Alias((int32_t) U_JG_SWASH_KAF, 809),
-    Alias((int32_t) U_JG_SYRIAC_WAW, 811),
-    Alias((int32_t) U_JG_TAH, 813),
-    Alias((int32_t) U_JG_TAW, 815),
-    Alias((int32_t) U_JG_TEH_MARBUTA, 817),
-    Alias((int32_t) U_JG_TETH, 819),
-    Alias((int32_t) U_JG_WAW, 821),
-    Alias((int32_t) U_JG_YEH, 823),
-    Alias((int32_t) U_JG_YEH_BARREE, 825),
-    Alias((int32_t) U_JG_YEH_WITH_TAIL, 827),
-    Alias((int32_t) U_JG_YUDH, 829),
-    Alias((int32_t) U_JG_YUDH_HE, 831),
-    Alias((int32_t) U_JG_ZAIN, 833),
-    Alias((int32_t) U_JG_ZHAIN, 835),
+    Alias((int32_t) U_JG_AIN, 734),
+    Alias((int32_t) U_JG_ALAPH, 736),
+    Alias((int32_t) U_JG_ALEF, 738),
+    Alias((int32_t) U_JG_BEH, 740),
+    Alias((int32_t) U_JG_BETH, 742),
+    Alias((int32_t) U_JG_DAL, 744),
+    Alias((int32_t) U_JG_DALATH_RISH, 746),
+    Alias((int32_t) U_JG_E, 748),
+    Alias((int32_t) U_JG_FE, 750),
+    Alias((int32_t) U_JG_FEH, 752),
+    Alias((int32_t) U_JG_FINAL_SEMKATH, 754),
+    Alias((int32_t) U_JG_GAF, 756),
+    Alias((int32_t) U_JG_GAMAL, 758),
+    Alias((int32_t) U_JG_HAH, 760),
+    Alias((int32_t) U_JG_HAMZA_ON_HEH_GOAL, 762),
+    Alias((int32_t) U_JG_HE, 764),
+    Alias((int32_t) U_JG_HEH, 766),
+    Alias((int32_t) U_JG_HEH_GOAL, 768),
+    Alias((int32_t) U_JG_HETH, 770),
+    Alias((int32_t) U_JG_KAF, 772),
+    Alias((int32_t) U_JG_KAPH, 774),
+    Alias((int32_t) U_JG_KHAPH, 776),
+    Alias((int32_t) U_JG_KNOTTED_HEH, 778),
+    Alias((int32_t) U_JG_LAM, 780),
+    Alias((int32_t) U_JG_LAMADH, 782),
+    Alias((int32_t) U_JG_MEEM, 784),
+    Alias((int32_t) U_JG_MIM, 786),
+    Alias((int32_t) U_JG_NOON, 788),
+    Alias((int32_t) U_JG_NO_JOINING_GROUP, 790),
+    Alias((int32_t) U_JG_NUN, 792),
+    Alias((int32_t) U_JG_PE, 794),
+    Alias((int32_t) U_JG_QAF, 796),
+    Alias((int32_t) U_JG_QAPH, 798),
+    Alias((int32_t) U_JG_REH, 800),
+    Alias((int32_t) U_JG_REVERSED_PE, 802),
+    Alias((int32_t) U_JG_SAD, 804),
+    Alias((int32_t) U_JG_SADHE, 806),
+    Alias((int32_t) U_JG_SEEN, 808),
+    Alias((int32_t) U_JG_SEMKATH, 810),
+    Alias((int32_t) U_JG_SHIN, 812),
+    Alias((int32_t) U_JG_SWASH_KAF, 814),
+    Alias((int32_t) U_JG_SYRIAC_WAW, 816),
+    Alias((int32_t) U_JG_TAH, 818),
+    Alias((int32_t) U_JG_TAW, 820),
+    Alias((int32_t) U_JG_TEH_MARBUTA, 822),
+    Alias((int32_t) U_JG_TETH, 824),
+    Alias((int32_t) U_JG_WAW, 826),
+    Alias((int32_t) U_JG_YEH, 828),
+    Alias((int32_t) U_JG_YEH_BARREE, 830),
+    Alias((int32_t) U_JG_YEH_WITH_TAIL, 832),
+    Alias((int32_t) U_JG_YUDH, 834),
+    Alias((int32_t) U_JG_YUDH_HE, 836),
+    Alias((int32_t) U_JG_ZAIN, 838),
+    Alias((int32_t) U_JG_ZHAIN, 840),
 };
 
 const int32_t VALUES_jt_COUNT = 6;
 
 const Alias VALUES_jt[] = {
-    Alias((int32_t) U_JT_DUAL_JOINING, 837),
-    Alias((int32_t) U_JT_JOIN_CAUSING, 839),
-    Alias((int32_t) U_JT_LEFT_JOINING, 841),
-    Alias((int32_t) U_JT_NON_JOINING, 843),
-    Alias((int32_t) U_JT_RIGHT_JOINING, 845),
-    Alias((int32_t) U_JT_TRANSPARENT, 847),
+    Alias((int32_t) U_JT_DUAL_JOINING, 842),
+    Alias((int32_t) U_JT_JOIN_CAUSING, 844),
+    Alias((int32_t) U_JT_LEFT_JOINING, 846),
+    Alias((int32_t) U_JT_NON_JOINING, 848),
+    Alias((int32_t) U_JT_RIGHT_JOINING, 850),
+    Alias((int32_t) U_JT_TRANSPARENT, 852),
 };
 
 const int32_t VALUES_lb_COUNT = 36;
 
 const Alias VALUES_lb[] = {
-    Alias((int32_t) U_LB_ALPHABETIC, 849),
-    Alias((int32_t) U_LB_AMBIGUOUS, 851),
-    Alias((int32_t) U_LB_BREAK_AFTER, 853),
-    Alias((int32_t) U_LB_BREAK_BEFORE, 855),
-    Alias((int32_t) U_LB_BREAK_BOTH, 857),
-    Alias((int32_t) U_LB_BREAK_SYMBOLS, 859),
-    Alias((int32_t) U_LB_CARRIAGE_RETURN, 861),
-    Alias((int32_t) U_LB_CLOSE_PUNCTUATION, 863),
-    Alias((int32_t) U_LB_COMBINING_MARK, 865),
-    Alias((int32_t) U_LB_COMPLEX_CONTEXT, 867),
-    Alias((int32_t) U_LB_CONTINGENT_BREAK, 869),
-    Alias((int32_t) U_LB_EXCLAMATION, 871),
-    Alias((int32_t) U_LB_GLUE, 873),
-    Alias((int32_t) U_LB_H2, 875),
-    Alias((int32_t) U_LB_H3, 877),
-    Alias((int32_t) U_LB_HYPHEN, 879),
-    Alias((int32_t) U_LB_IDEOGRAPHIC, 881),
-    Alias((int32_t) U_LB_INFIX_NUMERIC, 883),
-    Alias((int32_t) U_LB_INSEPARABLE, 885),
-    Alias((int32_t) U_LB_JL, 888),
-    Alias((int32_t) U_LB_JT, 890),
-    Alias((int32_t) U_LB_JV, 892),
-    Alias((int32_t) U_LB_LINE_FEED, 894),
-    Alias((int32_t) U_LB_MANDATORY_BREAK, 896),
-    Alias((int32_t) U_LB_NEXT_LINE, 898),
-    Alias((int32_t) U_LB_NONSTARTER, 900),
+    Alias((int32_t) U_LB_ALPHABETIC, 854),
+    Alias((int32_t) U_LB_AMBIGUOUS, 856),
+    Alias((int32_t) U_LB_BREAK_AFTER, 858),
+    Alias((int32_t) U_LB_BREAK_BEFORE, 860),
+    Alias((int32_t) U_LB_BREAK_BOTH, 862),
+    Alias((int32_t) U_LB_BREAK_SYMBOLS, 864),
+    Alias((int32_t) U_LB_CARRIAGE_RETURN, 866),
+    Alias((int32_t) U_LB_CLOSE_PUNCTUATION, 868),
+    Alias((int32_t) U_LB_COMBINING_MARK, 870),
+    Alias((int32_t) U_LB_COMPLEX_CONTEXT, 872),
+    Alias((int32_t) U_LB_CONTINGENT_BREAK, 874),
+    Alias((int32_t) U_LB_EXCLAMATION, 876),
+    Alias((int32_t) U_LB_GLUE, 878),
+    Alias((int32_t) U_LB_H2, 880),
+    Alias((int32_t) U_LB_H3, 882),
+    Alias((int32_t) U_LB_HYPHEN, 884),
+    Alias((int32_t) U_LB_IDEOGRAPHIC, 886),
+    Alias((int32_t) U_LB_INFIX_NUMERIC, 888),
+    Alias((int32_t) U_LB_INSEPARABLE, 890),
+    Alias((int32_t) U_LB_JL, 893),
+    Alias((int32_t) U_LB_JT, 895),
+    Alias((int32_t) U_LB_JV, 897),
+    Alias((int32_t) U_LB_LINE_FEED, 899),
+    Alias((int32_t) U_LB_MANDATORY_BREAK, 901),
+    Alias((int32_t) U_LB_NEXT_LINE, 903),
+    Alias((int32_t) U_LB_NONSTARTER, 905),
     Alias((int32_t) U_LB_NUMERIC, 34),
-    Alias((int32_t) U_LB_OPEN_PUNCTUATION, 902),
-    Alias((int32_t) U_LB_POSTFIX_NUMERIC, 904),
-    Alias((int32_t) U_LB_PREFIX_NUMERIC, 906),
-    Alias((int32_t) U_LB_QUOTATION, 908),
-    Alias((int32_t) U_LB_SPACE, 910),
-    Alias((int32_t) U_LB_SURROGATE, 912),
-    Alias((int32_t) U_LB_UNKNOWN, 914),
-    Alias((int32_t) U_LB_WORD_JOINER, 916),
-    Alias((int32_t) U_LB_ZWSPACE, 918),
+    Alias((int32_t) U_LB_OPEN_PUNCTUATION, 907),
+    Alias((int32_t) U_LB_POSTFIX_NUMERIC, 909),
+    Alias((int32_t) U_LB_PREFIX_NUMERIC, 911),
+    Alias((int32_t) U_LB_QUOTATION, 913),
+    Alias((int32_t) U_LB_SPACE, 915),
+    Alias((int32_t) U_LB_SURROGATE, 917),
+    Alias((int32_t) U_LB_UNKNOWN, 919),
+    Alias((int32_t) U_LB_WORD_JOINER, 921),
+    Alias((int32_t) U_LB_ZWSPACE, 923),
 };
 
 const int32_t VALUES_lccc_COUNT = 19;
 
 const Alias VALUES_lccc[] = {
-    Alias((int32_t) 0, 552),
-    Alias((int32_t) 1, 554),
-    Alias((int32_t) 200, 556),
-    Alias((int32_t) 202, 558),
-    Alias((int32_t) 216, 560),
-    Alias((int32_t) 218, 562),
-    Alias((int32_t) 220, 564),
-    Alias((int32_t) 222, 566),
-    Alias((int32_t) 224, 568),
-    Alias((int32_t) 226, 570),
-    Alias((int32_t) 228, 572),
-    Alias((int32_t) 230, 574),
-    Alias((int32_t) 232, 576),
-    Alias((int32_t) 233, 578),
-    Alias((int32_t) 234, 580),
-    Alias((int32_t) 240, 582),
-    Alias((int32_t) 7, 584),
-    Alias((int32_t) 8, 586),
-    Alias((int32_t) 9, 588),
+    Alias((int32_t) 0, 557),
+    Alias((int32_t) 1, 559),
+    Alias((int32_t) 200, 561),
+    Alias((int32_t) 202, 563),
+    Alias((int32_t) 216, 565),
+    Alias((int32_t) 218, 567),
+    Alias((int32_t) 220, 569),
+    Alias((int32_t) 222, 571),
+    Alias((int32_t) 224, 573),
+    Alias((int32_t) 226, 575),
+    Alias((int32_t) 228, 577),
+    Alias((int32_t) 230, 579),
+    Alias((int32_t) 232, 581),
+    Alias((int32_t) 233, 583),
+    Alias((int32_t) 234, 585),
+    Alias((int32_t) 240, 587),
+    Alias((int32_t) 7, 589),
+    Alias((int32_t) 8, 591),
+    Alias((int32_t) 9, 593),
 };
 
 const int32_t VALUES_nt_COUNT = 4;
 
 const Alias VALUES_nt[] = {
-    Alias((int32_t) U_NT_DECIMAL, 920),
-    Alias((int32_t) U_NT_DIGIT, 922),
-    Alias((int32_t) U_NT_NONE, 924),
-    Alias((int32_t) U_NT_NUMERIC, 926),
+    Alias((int32_t) U_NT_DECIMAL, 925),
+    Alias((int32_t) U_NT_DIGIT, 927),
+    Alias((int32_t) U_NT_NONE, 929),
+    Alias((int32_t) U_NT_NUMERIC, 931),
 };
 
 const int32_t VALUES_sc_COUNT = 62;
 
 const Alias VALUES_sc[] = {
-    Alias((int32_t) USCRIPT_ARABIC, 928),
-    Alias((int32_t) USCRIPT_ARMENIAN, 930),
-    Alias((int32_t) USCRIPT_BENGALI, 932),
-    Alias((int32_t) USCRIPT_BOPOMOFO, 934),
-    Alias((int32_t) USCRIPT_BRAILLE, 936),
-    Alias((int32_t) USCRIPT_BUGINESE, 938),
-    Alias((int32_t) USCRIPT_BUHID, 940),
-    Alias((int32_t) USCRIPT_CANADIAN_ABORIGINAL, 942),
-    Alias((int32_t) USCRIPT_CHEROKEE, 944),
-    Alias((int32_t) USCRIPT_COMMON, 946),
-    Alias((int32_t) USCRIPT_COPTIC, 948),
-    Alias((int32_t) USCRIPT_CYPRIOT, 951),
-    Alias((int32_t) USCRIPT_CYRILLIC, 953),
-    Alias((int32_t) USCRIPT_DESERET, 955),
-    Alias((int32_t) USCRIPT_DEVANAGARI, 957),
-    Alias((int32_t) USCRIPT_ETHIOPIC, 959),
-    Alias((int32_t) USCRIPT_GEORGIAN, 961),
-    Alias((int32_t) USCRIPT_GLAGOLITIC, 963),
-    Alias((int32_t) USCRIPT_GOTHIC, 965),
-    Alias((int32_t) USCRIPT_GREEK, 967),
-    Alias((int32_t) USCRIPT_GUJARATI, 969),
-    Alias((int32_t) USCRIPT_GURMUKHI, 971),
-    Alias((int32_t) USCRIPT_HAN, 973),
-    Alias((int32_t) USCRIPT_HANGUL, 975),
-    Alias((int32_t) USCRIPT_HANUNOO, 977),
-    Alias((int32_t) USCRIPT_HEBREW, 979),
-    Alias((int32_t) USCRIPT_HIRAGANA, 981),
-    Alias((int32_t) USCRIPT_INHERITED, 983),
-    Alias((int32_t) USCRIPT_KANNADA, 985),
-    Alias((int32_t) USCRIPT_KATAKANA, 987),
-    Alias((int32_t) USCRIPT_KATAKANA_OR_HIRAGANA, 989),
-    Alias((int32_t) USCRIPT_KHAROSHTHI, 991),
-    Alias((int32_t) USCRIPT_KHMER, 993),
-    Alias((int32_t) USCRIPT_LAO, 995),
-    Alias((int32_t) USCRIPT_LATIN, 997),
-    Alias((int32_t) USCRIPT_LIMBU, 999),
-    Alias((int32_t) USCRIPT_LINEAR_B, 1001),
-    Alias((int32_t) USCRIPT_MALAYALAM, 1003),
-    Alias((int32_t) USCRIPT_MONGOLIAN, 1005),
-    Alias((int32_t) USCRIPT_MYANMAR, 1007),
-    Alias((int32_t) USCRIPT_NEW_TAI_LUE, 1009),
-    Alias((int32_t) USCRIPT_OGHAM, 1011),
-    Alias((int32_t) USCRIPT_OLD_ITALIC, 1013),
-    Alias((int32_t) USCRIPT_OLD_PERSIAN, 1015),
-    Alias((int32_t) USCRIPT_ORIYA, 1017),
-    Alias((int32_t) USCRIPT_OSMANYA, 1019),
-    Alias((int32_t) USCRIPT_RUNIC, 1021),
-    Alias((int32_t) USCRIPT_SHAVIAN, 1023),
-    Alias((int32_t) USCRIPT_SINHALA, 1025),
-    Alias((int32_t) USCRIPT_SYLOTI_NAGRI, 1027),
-    Alias((int32_t) USCRIPT_SYRIAC, 1029),
-    Alias((int32_t) USCRIPT_TAGALOG, 1031),
-    Alias((int32_t) USCRIPT_TAGBANWA, 1033),
-    Alias((int32_t) USCRIPT_TAI_LE, 1035),
-    Alias((int32_t) USCRIPT_TAMIL, 1037),
-    Alias((int32_t) USCRIPT_TELUGU, 1039),
-    Alias((int32_t) USCRIPT_THAANA, 1041),
-    Alias((int32_t) USCRIPT_THAI, 1043),
-    Alias((int32_t) USCRIPT_TIBETAN, 1045),
-    Alias((int32_t) USCRIPT_TIFINAGH, 1047),
-    Alias((int32_t) USCRIPT_UGARITIC, 1049),
-    Alias((int32_t) USCRIPT_YI, 1051),
+    Alias((int32_t) USCRIPT_ARABIC, 933),
+    Alias((int32_t) USCRIPT_ARMENIAN, 935),
+    Alias((int32_t) USCRIPT_BENGALI, 937),
+    Alias((int32_t) USCRIPT_BOPOMOFO, 939),
+    Alias((int32_t) USCRIPT_BRAILLE, 941),
+    Alias((int32_t) USCRIPT_BUGINESE, 943),
+    Alias((int32_t) USCRIPT_BUHID, 945),
+    Alias((int32_t) USCRIPT_CANADIAN_ABORIGINAL, 947),
+    Alias((int32_t) USCRIPT_CHEROKEE, 949),
+    Alias((int32_t) USCRIPT_COMMON, 951),
+    Alias((int32_t) USCRIPT_COPTIC, 953),
+    Alias((int32_t) USCRIPT_CYPRIOT, 956),
+    Alias((int32_t) USCRIPT_CYRILLIC, 958),
+    Alias((int32_t) USCRIPT_DESERET, 960),
+    Alias((int32_t) USCRIPT_DEVANAGARI, 962),
+    Alias((int32_t) USCRIPT_ETHIOPIC, 964),
+    Alias((int32_t) USCRIPT_GEORGIAN, 966),
+    Alias((int32_t) USCRIPT_GLAGOLITIC, 968),
+    Alias((int32_t) USCRIPT_GOTHIC, 970),
+    Alias((int32_t) USCRIPT_GREEK, 972),
+    Alias((int32_t) USCRIPT_GUJARATI, 974),
+    Alias((int32_t) USCRIPT_GURMUKHI, 976),
+    Alias((int32_t) USCRIPT_HAN, 978),
+    Alias((int32_t) USCRIPT_HANGUL, 980),
+    Alias((int32_t) USCRIPT_HANUNOO, 982),
+    Alias((int32_t) USCRIPT_HEBREW, 984),
+    Alias((int32_t) USCRIPT_HIRAGANA, 986),
+    Alias((int32_t) USCRIPT_INHERITED, 988),
+    Alias((int32_t) USCRIPT_KANNADA, 990),
+    Alias((int32_t) USCRIPT_KATAKANA, 992),
+    Alias((int32_t) USCRIPT_KATAKANA_OR_HIRAGANA, 994),
+    Alias((int32_t) USCRIPT_KHAROSHTHI, 996),
+    Alias((int32_t) USCRIPT_KHMER, 998),
+    Alias((int32_t) USCRIPT_LAO, 1000),
+    Alias((int32_t) USCRIPT_LATIN, 1002),
+    Alias((int32_t) USCRIPT_LIMBU, 1004),
+    Alias((int32_t) USCRIPT_LINEAR_B, 1006),
+    Alias((int32_t) USCRIPT_MALAYALAM, 1008),
+    Alias((int32_t) USCRIPT_MONGOLIAN, 1010),
+    Alias((int32_t) USCRIPT_MYANMAR, 1012),
+    Alias((int32_t) USCRIPT_NEW_TAI_LUE, 1014),
+    Alias((int32_t) USCRIPT_OGHAM, 1016),
+    Alias((int32_t) USCRIPT_OLD_ITALIC, 1018),
+    Alias((int32_t) USCRIPT_OLD_PERSIAN, 1020),
+    Alias((int32_t) USCRIPT_ORIYA, 1022),
+    Alias((int32_t) USCRIPT_OSMANYA, 1024),
+    Alias((int32_t) USCRIPT_RUNIC, 1026),
+    Alias((int32_t) USCRIPT_SHAVIAN, 1028),
+    Alias((int32_t) USCRIPT_SINHALA, 1030),
+    Alias((int32_t) USCRIPT_SYLOTI_NAGRI, 1032),
+    Alias((int32_t) USCRIPT_SYRIAC, 1034),
+    Alias((int32_t) USCRIPT_TAGALOG, 1036),
+    Alias((int32_t) USCRIPT_TAGBANWA, 1038),
+    Alias((int32_t) USCRIPT_TAI_LE, 1040),
+    Alias((int32_t) USCRIPT_TAMIL, 1042),
+    Alias((int32_t) USCRIPT_TELUGU, 1044),
+    Alias((int32_t) USCRIPT_THAANA, 1046),
+    Alias((int32_t) USCRIPT_THAI, 1048),
+    Alias((int32_t) USCRIPT_TIBETAN, 1050),
+    Alias((int32_t) USCRIPT_TIFINAGH, 1052),
+    Alias((int32_t) USCRIPT_UGARITIC, 1054),
+    Alias((int32_t) USCRIPT_YI, 1056),
 };
 
 const int32_t VALUES_tccc_COUNT = 19;
 
 const Alias VALUES_tccc[] = {
-    Alias((int32_t) 0, 552),
-    Alias((int32_t) 1, 554),
-    Alias((int32_t) 200, 556),
-    Alias((int32_t) 202, 558),
-    Alias((int32_t) 216, 560),
-    Alias((int32_t) 218, 562),
-    Alias((int32_t) 220, 564),
-    Alias((int32_t) 222, 566),
-    Alias((int32_t) 224, 568),
-    Alias((int32_t) 226, 570),
-    Alias((int32_t) 228, 572),
-    Alias((int32_t) 230, 574),
-    Alias((int32_t) 232, 576),
-    Alias((int32_t) 233, 578),
-    Alias((int32_t) 234, 580),
-    Alias((int32_t) 240, 582),
-    Alias((int32_t) 7, 584),
-    Alias((int32_t) 8, 586),
-    Alias((int32_t) 9, 588),
+    Alias((int32_t) 0, 557),
+    Alias((int32_t) 1, 559),
+    Alias((int32_t) 200, 561),
+    Alias((int32_t) 202, 563),
+    Alias((int32_t) 216, 565),
+    Alias((int32_t) 218, 567),
+    Alias((int32_t) 220, 569),
+    Alias((int32_t) 222, 571),
+    Alias((int32_t) 224, 573),
+    Alias((int32_t) 226, 575),
+    Alias((int32_t) 228, 577),
+    Alias((int32_t) 230, 579),
+    Alias((int32_t) 232, 581),
+    Alias((int32_t) 233, 583),
+    Alias((int32_t) 234, 585),
+    Alias((int32_t) 240, 587),
+    Alias((int32_t) 7, 589),
+    Alias((int32_t) 8, 591),
+    Alias((int32_t) 9, 593),
 };
 
-const int32_t PROPERTY_COUNT = 80;
+const int32_t PROPERTY_COUNT = 85;
 
 const Property PROPERTY[] = {
     Property((int32_t) UCHAR_ALPHABETIC, 56, VALUES_binprop_COUNT, VALUES_binprop),
@@ -1964,54 +1974,59 @@ const Property PROPERTY[] = {
     Property((int32_t) UCHAR_NONCHARACTER_CODE_POINT, 114, VALUES_binprop_COUNT, VALUES_binprop),
     Property((int32_t) UCHAR_PATTERN_SYNTAX, 116, VALUES_binprop_COUNT, VALUES_binprop),
     Property((int32_t) UCHAR_PATTERN_WHITE_SPACE, 118, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_QUOTATION_MARK, 120, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_RADICAL, 122, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_SEGMENT_STARTER, 124, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_SOFT_DOTTED, 126, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_S_TERM, 128, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_TERMINAL_PUNCTUATION, 130, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_UNIFIED_IDEOGRAPH, 132, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_UPPERCASE, 134, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_VARIATION_SELECTOR, 136, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_WHITE_SPACE, 138, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_XID_CONTINUE, 141, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_XID_START, 143, VALUES_binprop_COUNT, VALUES_binprop),
-    Property((int32_t) UCHAR_BIDI_CLASS, 147, VALUES_bc_COUNT, VALUES_bc),
-    Property((int32_t) UCHAR_BLOCK, 149, VALUES_blk_COUNT, VALUES_blk),
-    Property((int32_t) UCHAR_CANONICAL_COMBINING_CLASS, 151, VALUES_ccc_COUNT, VALUES_ccc),
-    Property((int32_t) UCHAR_DECOMPOSITION_TYPE, 153, VALUES_dt_COUNT, VALUES_dt),
-    Property((int32_t) UCHAR_EAST_ASIAN_WIDTH, 155, VALUES_ea_COUNT, VALUES_ea),
-    Property((int32_t) UCHAR_GENERAL_CATEGORY, 157, VALUES_gc_COUNT, VALUES_gc),
-    Property((int32_t) UCHAR_GRAPHEME_CLUSTER_BREAK, 159, VALUES_GCB_COUNT, VALUES_GCB),
-    Property((int32_t) UCHAR_HANGUL_SYLLABLE_TYPE, 161, VALUES_hst_COUNT, VALUES_hst),
-    Property((int32_t) UCHAR_JOINING_GROUP, 163, VALUES_jg_COUNT, VALUES_jg),
-    Property((int32_t) UCHAR_JOINING_TYPE, 165, VALUES_jt_COUNT, VALUES_jt),
-    Property((int32_t) UCHAR_LEAD_CANONICAL_COMBINING_CLASS, 167, VALUES_lccc_COUNT, VALUES_lccc),
-    Property((int32_t) UCHAR_LINE_BREAK, 169, VALUES_lb_COUNT, VALUES_lb),
-    Property((int32_t) UCHAR_NFC_QUICK_CHECK, 171, VALUES_NFC_QC_COUNT, VALUES_NFC_QC),
-    Property((int32_t) UCHAR_NFD_QUICK_CHECK, 173, VALUES_NFD_QC_COUNT, VALUES_NFD_QC),
-    Property((int32_t) UCHAR_NFKC_QUICK_CHECK, 175, VALUES_NFKC_QC_COUNT, VALUES_NFKC_QC),
-    Property((int32_t) UCHAR_NFKD_QUICK_CHECK, 177, VALUES_NFKD_QC_COUNT, VALUES_NFKD_QC),
-    Property((int32_t) UCHAR_NUMERIC_TYPE, 179, VALUES_nt_COUNT, VALUES_nt),
-    Property((int32_t) UCHAR_SCRIPT, 181, VALUES_sc_COUNT, VALUES_sc),
-    Property((int32_t) UCHAR_SENTENCE_BREAK, 183, VALUES_SB_COUNT, VALUES_SB),
-    Property((int32_t) UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, 185, VALUES_tccc_COUNT, VALUES_tccc),
-    Property((int32_t) UCHAR_WORD_BREAK, 187, VALUES_WB_COUNT, VALUES_WB),
-    Property((int32_t) UCHAR_AGE, 191, 0, NULL),
-    Property((int32_t) UCHAR_BIDI_MIRRORING_GLYPH, 193, 0, NULL),
-    Property((int32_t) UCHAR_CASE_FOLDING, 195, 0, NULL),
-    Property((int32_t) UCHAR_ISO_COMMENT, 197, 0, NULL),
-    Property((int32_t) UCHAR_LOWERCASE_MAPPING, 199, 0, NULL),
-    Property((int32_t) UCHAR_NAME, 201, 0, NULL),
-    Property((int32_t) UCHAR_SIMPLE_CASE_FOLDING, 203, 0, NULL),
-    Property((int32_t) UCHAR_SIMPLE_LOWERCASE_MAPPING, 205, 0, NULL),
-    Property((int32_t) UCHAR_SIMPLE_TITLECASE_MAPPING, 207, 0, NULL),
-    Property((int32_t) UCHAR_SIMPLE_UPPERCASE_MAPPING, 209, 0, NULL),
-    Property((int32_t) UCHAR_TITLECASE_MAPPING, 211, 0, NULL),
-    Property((int32_t) UCHAR_UNICODE_1_NAME, 213, 0, NULL),
-    Property((int32_t) UCHAR_UPPERCASE_MAPPING, 215, 0, NULL),
-    Property((int32_t) UCHAR_NUMERIC_VALUE, 145, 0, NULL),
-    Property((int32_t) UCHAR_GENERAL_CATEGORY_MASK, 189, VALUES_gcm_COUNT, VALUES_gcm),
+    Property((int32_t) UCHAR_POSIX_ALNUM, 120, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_POSIX_BLANK, 121, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_POSIX_GRAPH, 122, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_POSIX_PRINT, 123, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_POSIX_XDIGIT, 124, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_QUOTATION_MARK, 125, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_RADICAL, 127, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_SEGMENT_STARTER, 129, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_SOFT_DOTTED, 131, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_S_TERM, 133, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_TERMINAL_PUNCTUATION, 135, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_UNIFIED_IDEOGRAPH, 137, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_UPPERCASE, 139, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_VARIATION_SELECTOR, 141, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_WHITE_SPACE, 143, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_XID_CONTINUE, 146, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_XID_START, 148, VALUES_binprop_COUNT, VALUES_binprop),
+    Property((int32_t) UCHAR_BIDI_CLASS, 152, VALUES_bc_COUNT, VALUES_bc),
+    Property((int32_t) UCHAR_BLOCK, 154, VALUES_blk_COUNT, VALUES_blk),
+    Property((int32_t) UCHAR_CANONICAL_COMBINING_CLASS, 156, VALUES_ccc_COUNT, VALUES_ccc),
+    Property((int32_t) UCHAR_DECOMPOSITION_TYPE, 158, VALUES_dt_COUNT, VALUES_dt),
+    Property((int32_t) UCHAR_EAST_ASIAN_WIDTH, 160, VALUES_ea_COUNT, VALUES_ea),
+    Property((int32_t) UCHAR_GENERAL_CATEGORY, 162, VALUES_gc_COUNT, VALUES_gc),
+    Property((int32_t) UCHAR_GRAPHEME_CLUSTER_BREAK, 164, VALUES_GCB_COUNT, VALUES_GCB),
+    Property((int32_t) UCHAR_HANGUL_SYLLABLE_TYPE, 166, VALUES_hst_COUNT, VALUES_hst),
+    Property((int32_t) UCHAR_JOINING_GROUP, 168, VALUES_jg_COUNT, VALUES_jg),
+    Property((int32_t) UCHAR_JOINING_TYPE, 170, VALUES_jt_COUNT, VALUES_jt),
+    Property((int32_t) UCHAR_LEAD_CANONICAL_COMBINING_CLASS, 172, VALUES_lccc_COUNT, VALUES_lccc),
+    Property((int32_t) UCHAR_LINE_BREAK, 174, VALUES_lb_COUNT, VALUES_lb),
+    Property((int32_t) UCHAR_NFC_QUICK_CHECK, 176, VALUES_NFC_QC_COUNT, VALUES_NFC_QC),
+    Property((int32_t) UCHAR_NFD_QUICK_CHECK, 178, VALUES_NFD_QC_COUNT, VALUES_NFD_QC),
+    Property((int32_t) UCHAR_NFKC_QUICK_CHECK, 180, VALUES_NFKC_QC_COUNT, VALUES_NFKC_QC),
+    Property((int32_t) UCHAR_NFKD_QUICK_CHECK, 182, VALUES_NFKD_QC_COUNT, VALUES_NFKD_QC),
+    Property((int32_t) UCHAR_NUMERIC_TYPE, 184, VALUES_nt_COUNT, VALUES_nt),
+    Property((int32_t) UCHAR_SCRIPT, 186, VALUES_sc_COUNT, VALUES_sc),
+    Property((int32_t) UCHAR_SENTENCE_BREAK, 188, VALUES_SB_COUNT, VALUES_SB),
+    Property((int32_t) UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, 190, VALUES_tccc_COUNT, VALUES_tccc),
+    Property((int32_t) UCHAR_WORD_BREAK, 192, VALUES_WB_COUNT, VALUES_WB),
+    Property((int32_t) UCHAR_AGE, 196, 0, NULL),
+    Property((int32_t) UCHAR_BIDI_MIRRORING_GLYPH, 198, 0, NULL),
+    Property((int32_t) UCHAR_CASE_FOLDING, 200, 0, NULL),
+    Property((int32_t) UCHAR_ISO_COMMENT, 202, 0, NULL),
+    Property((int32_t) UCHAR_LOWERCASE_MAPPING, 204, 0, NULL),
+    Property((int32_t) UCHAR_NAME, 206, 0, NULL),
+    Property((int32_t) UCHAR_SIMPLE_CASE_FOLDING, 208, 0, NULL),
+    Property((int32_t) UCHAR_SIMPLE_LOWERCASE_MAPPING, 210, 0, NULL),
+    Property((int32_t) UCHAR_SIMPLE_TITLECASE_MAPPING, 212, 0, NULL),
+    Property((int32_t) UCHAR_SIMPLE_UPPERCASE_MAPPING, 214, 0, NULL),
+    Property((int32_t) UCHAR_TITLECASE_MAPPING, 216, 0, NULL),
+    Property((int32_t) UCHAR_UNICODE_1_NAME, 218, 0, NULL),
+    Property((int32_t) UCHAR_UPPERCASE_MAPPING, 220, 0, NULL),
+    Property((int32_t) UCHAR_NUMERIC_VALUE, 150, 0, NULL),
+    Property((int32_t) UCHAR_GENERAL_CATEGORY_MASK, 194, VALUES_gcm_COUNT, VALUES_gcm),
 };
 
 /*eof*/
diff --git a/icu4c/source/tools/genpname/preparse.pl b/icu4c/source/tools/genpname/preparse.pl
index 7424209be9..06dd37db70 100755
--- a/icu4c/source/tools/genpname/preparse.pl
+++ b/icu4c/source/tools/genpname/preparse.pl
@@ -65,6 +65,9 @@ my $UNIDATA_DIR = "$ICU_DIR/source/data/unidata";
 # Get the current year from the system
 my $YEAR = 1900+@{[localtime]}[5]; # Get the current year
 
+# Used to make "n/a" property aliases (Unicode or Synthetic) unique
+my $propNA = 0;
+
 #----------------------------------------------------------------------
 # Top level property keys for binary, enumerated, string, and double props
 my @TOP     = qw( _bp _ep _sp _dp _mp );
@@ -304,7 +307,7 @@ END
                 $i = $groupToInt{$groupString};
             } else {
                 my @names = split(/\|/, $groupString);
-                die "Error: Wrong number of names in " . $groupString if (@names < 2);
+                die "Error: Wrong number of names in " . $groupString if (@names < 1);
                 $i = @nameGroups; # index of group we are making 
                 $groupToInt{$groupString} = $i; # Cache for reuse
                 push @nameGroups, map { $stringToID{$_} } @names;
@@ -589,7 +592,12 @@ sub merge_PropertyAliases {
                 die "Error: Property $long_name not found (or used more than once)";
             }
 
-            my $value = $pa->{$long_name} . "|" . $long_name;
+            my $value;
+            if($pa->{$long_name} =~ m|^n/a\d*$|) {
+                $value = $long_name;
+            } else {
+                $value = $pa->{$long_name} . "|" . $long_name;
+            }
             if (exists $additional_property_aliases{$long_name}) {
                 $value .= "|" . $additional_property_aliases{$long_name};
             }
@@ -689,8 +697,8 @@ sub merge_PropertyValueAliases {
             my $l = $n;
             my $r = $pva->{$n};
             # convert |n/a\d+| to blank
-            $l = '' if ($l =~ m|^n/a\d+$|);
-            $r = '' if ($r =~ m|^n/a\d+$|);
+            $l = '' if ($l =~ m|^n/a\d*$|);
+            $r = '' if ($r =~ m|^n/a\d*$|);
 
             $hh->{$enum} = "$l|$r";
             # Don't delete the 'gc' properties because we need to share
@@ -766,8 +774,6 @@ sub read_PropertyAliases {
     my $in = new FileHandle($filename, 'r');
     die "Error: Cannot open $filename" if (!defined $in);
 
-    my $sym = 0; # Used to make "n/a" strings unique
-
     while (<$in>) {
 
         # Read version (embedded in a comment)
@@ -795,9 +801,12 @@ sub read_PropertyAliases {
             }
 
             # Make "n/a" strings unique
+            if ($short eq 'n/a') {
+                $short .= sprintf("%03d", $propNA++);
+            }
             my $long = $fields[0];
             if ($long eq 'n/a') {
-                $long .= sprintf("%03d", $sym++);
+                $long .= sprintf("%03d", $propNA++);
             }
 
             # Add long name->short name to the hash=pa hash table
@@ -847,7 +856,7 @@ sub read_PropertyValueAliases {
     my $in = new FileHandle($filename, 'r');
     die "Error: Cannot open $filename" if (!defined $in);
 
-    my $sym = 0; # Used to make "n/a" strings unique
+    my $valueNA = 0; # Used to make "n/a" strings unique
 
     while (<$in>) {
 
@@ -868,7 +877,7 @@ sub read_PropertyValueAliases {
             die "Error: Wrong number of fields in $filename"
                 if (@fields < 2 || @fields > 3);
             # Make "n/a" strings unique
-            $fields[0] .= sprintf("%03d", $sym++) if ($fields[0] eq 'n/a');
+            $fields[0] .= sprintf("%03d", $valueNA++) if ($fields[0] eq 'n/a');
             # Squash extra fields together
             while (@fields > 2) {
                 my $f = pop @fields;