This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
https://perl5.git.perl.org / perl5.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mktables: Handle platforms with 3 digit exponents
[perl5.git] / charclass_invlists.h
diff --git a/charclass_invlists.h b/charclass_invlists.h
index d0174b2..d77a74b 100644 (file)
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -7,7 +7,7 @@
 /* See the generating file for comments */
 
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 static const UV Latin1_invlist[] = {
        2,      /* Number of elements */
@@ -27,14 +27,14 @@ static const UV AboveLatin1_invlist[] = {
        0x100
 };
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */
-       1373,   /* Number of elements */
+static const UV Case_Folding_invlist[] = {  /* for ASCII/Latin1 */
+       1381,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -653,6 +653,10 @@ static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -1384,6 +1388,8 @@ static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -1409,10 +1415,20 @@ static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -1954,6 +1970,7 @@ static const unsigned int * const CF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 CF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* CF_AUX_TABLE_1 */,
@@ -2031,7 +2048,7 @@ static const U8 CF_AUX_TABLE_lengths[] = {
        2       /* CF_AUX_TABLE_73 */
 };
 
-static const int Case_Folding_invmap[] = { /* for ASCII/Latin1 */
+static const int Case_Folding_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x61,
        0,
@@ -2647,6 +2664,10 @@ static const int Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -3378,6 +3399,8 @@ static const int Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        CF_use_AUX_TABLE_63,
@@ -3403,19 +3426,25 @@ static const int Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */
-       1392,   /* Number of elements */
+static const UV Case_Folding_invlist[] = {  /* for EBCDIC 1047 */
+       1400,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -4053,6 +4082,10 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -4784,6 +4817,8 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -4809,10 +4844,23 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -5354,6 +5402,7 @@ static const unsigned int * const CF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 CF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* CF_AUX_TABLE_1 */,
@@ -5431,7 +5480,7 @@ static const U8 CF_AUX_TABLE_lengths[] = {
        2       /* CF_AUX_TABLE_73 */
 };
 
-static const int Case_Folding_invmap[] = { /* for EBCDIC 1047 */
+static const int Case_Folding_invmap[] = {  /* for EBCDIC 1047 */
        0,
        CF_use_AUX_TABLE_1,
        0,
@@ -6066,6 +6115,10 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -6797,6 +6850,8 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        CF_use_AUX_TABLE_63,
@@ -6822,19 +6877,25 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */
-       1388,   /* Number of elements */
+static const UV Case_Folding_invlist[] = {  /* for EBCDIC 037 */
+       1396,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -7468,6 +7529,10 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -8199,6 +8264,8 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -8224,10 +8291,23 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -8769,6 +8849,7 @@ static const unsigned int * const CF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 CF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* CF_AUX_TABLE_1 */,
@@ -8846,7 +8927,7 @@ static const U8 CF_AUX_TABLE_lengths[] = {
        2       /* CF_AUX_TABLE_73 */
 };
 
-static const int Case_Folding_invmap[] = { /* for EBCDIC 037 */
+static const int Case_Folding_invmap[] = {  /* for EBCDIC 037 */
        0,
        CF_use_AUX_TABLE_1,
        0,
@@ -9477,6 +9558,10 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -10208,6 +10293,8 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        CF_use_AUX_TABLE_63,
@@ -10233,16 +10320,22 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
-       1237,   /* Number of elements */
+static const UV Lowercase_Mapping_invlist[] = {  /* for ASCII/Latin1 */
+       1245,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -10829,6 +10922,10 @@ static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0x13A0,
        0x13F0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -11471,6 +11568,8 @@ static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -11481,10 +11580,20 @@ static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -11508,12 +11617,13 @@ static const unsigned int * const LC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 LC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* LC_AUX_TABLE_1 */
 };
 
-static const int Lowercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
+static const int Lowercase_Mapping_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x61,
        0,
@@ -12097,6 +12207,10 @@ static const int Lowercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0xAB70,
        0x13F8,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -12739,6 +12853,8 @@ static const int Lowercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0xFF41,
        0,
        0x10428,
@@ -12749,19 +12865,25 @@ static const int Lowercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
-       1255,   /* Number of elements */
+static const UV Lowercase_Mapping_invlist[] = {  /* for EBCDIC 1047 */
+       1263,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -13366,6 +13488,10 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0x13A0,
        0x13F0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -14008,6 +14134,8 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -14018,10 +14146,23 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -14045,12 +14186,13 @@ static const unsigned int * const LC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 LC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* LC_AUX_TABLE_1 */
 };
 
-static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
+static const int Lowercase_Mapping_invmap[] = {  /* for EBCDIC 1047 */
        0,
        0x42,
        0,
@@ -14652,6 +14794,10 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0xAB70,
        0x13F8,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -15294,6 +15440,8 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0xFF41,
        0,
        0x10428,
@@ -15304,19 +15452,25 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */
-       1251,   /* Number of elements */
+static const UV Lowercase_Mapping_invlist[] = {  /* for EBCDIC 037 */
+       1259,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -15917,6 +16071,10 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0x13A0,
        0x13F0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -16559,6 +16717,8 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -16569,10 +16729,23 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -16596,12 +16769,13 @@ static const unsigned int * const LC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 LC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* LC_AUX_TABLE_1 */
 };
 
-static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 037 */
+static const int Lowercase_Mapping_invmap[] = {  /* for EBCDIC 037 */
        0,
        0x42,
        0,
@@ -17199,6 +17373,10 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0xAB70,
        0x13F8,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -17841,6 +18019,8 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0xFF41,
        0,
        0x10428,
@@ -17851,15 +18031,21 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for ASCII/Latin1 */
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = {  /* for ASCII/Latin1 */
        45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -17918,7 +18104,7 @@ static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 1047 */
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = {  /* for EBCDIC 1047 */
        45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -17977,7 +18163,7 @@ static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 037 */
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = {  /* for EBCDIC 037 */
        45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -18033,8 +18219,8 @@ static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
-       1690,   /* Number of elements */
+static const UV _Perl_GCB_invlist[] = {  /* for ASCII/Latin1 */
+       1767,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -18046,8 +18232,11 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x20,
        0x7F,
        0xA0,
+       0xA9,
+       0xAA,
        0xAD,
        0xAE,
+       0xAF,
        0x300,
        0x370,
        0x483,
@@ -18091,6 +18280,8 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -18101,7 +18292,7 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -18138,6 +18329,8 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA04,
@@ -18209,6 +18402,7 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0xC00,
        0xC01,
        0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC45,
@@ -18462,26 +18656,98 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x2010,
        0x2028,
        0x202F,
+       0x203C,
+       0x203D,
+       0x2049,
+       0x204A,
        0x2060,
        0x2070,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x2122,
+       0x2123,
+       0x2139,
+       0x213A,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
+       0x24C2,
+       0x24C3,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -18490,8 +18756,15 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x2E00,
        0x302A,
        0x3030,
+       0x3031,
+       0x303D,
+       0x303E,
        0x3099,
        0x309B,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0xA66F,
        0xA673,
        0xA674,
@@ -18517,6 +18790,8 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -19410,6 +19685,10 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11001,
        0x11002,
@@ -19426,12 +19705,16 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
        0x1112C,
        0x1112D,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
@@ -19443,7 +19726,7 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x111C1,
        0x111C2,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x1122F,
@@ -19461,7 +19744,7 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x11300,
        0x11302,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x1133F,
@@ -19487,6 +19770,8 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114B1,
        0x114B3,
@@ -19531,9 +19816,12 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -19577,6 +19865,18 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -19630,98 +19930,61 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
        0x1E8D7,
        0x1E944,
        0x1E94B,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
+       0x1F130,
+       0x1F16C,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0000,
        0xE0020,
        0xE0080,
@@ -19732,7 +19995,7 @@ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
 
 #  endif       /* ASCII/Latin1 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -19742,25 +20005,26 @@ typedef enum {
        GCB_Other = 0,
        GCB_CR = 1,
        GCB_Control = 2,
-       GCB_E_Base = 3,
-       GCB_E_Base_GAZ = 4,
-       GCB_E_Modifier = 5,
-       GCB_Extend = 6,
-       GCB_Glue_After_Zwj = 7,
-       GCB_L = 8,
-       GCB_LF = 9,
-       GCB_LV = 10,
-       GCB_LVT = 11,
-       GCB_Prepend = 12,
-       GCB_Regional_Indicator = 13,
-       GCB_SpacingMark = 14,
-       GCB_T = 15,
-       GCB_V = 16,
-       GCB_ZWJ = 17,
-       GCB_EDGE = 18
+       GCB_Extend = 3,
+       GCB_L = 4,
+       GCB_LF = 5,
+       GCB_LV = 6,
+       GCB_LVT = 7,
+       GCB_Prepend = 8,
+       GCB_Regional_Indicator = 9,
+       GCB_SpacingMark = 10,
+       GCB_T = 11,
+       GCB_V = 12,
+       GCB_XPG_XX = 13,
+       GCB_ZWJ = 14,
+       GCB_EDGE = 15,
+       GCB_E_Base = 16,
+       GCB_E_Base_GAZ = 16,
+       GCB_E_Modifier = 16,
+       GCB_Glue_After_Zwj = 16
 } GCB_enum;
 
-static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
+static const GCB_enum _Perl_GCB_invmap[] = {  /* for ASCII/Latin1 */
        GCB_Control,
        GCB_LF,
        GCB_Control,
@@ -19769,7 +20033,10 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -19825,6 +20092,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_Prepend,
        GCB_Extend,
        GCB_SpacingMark,
@@ -19862,6 +20131,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_Extend,
@@ -19931,6 +20202,7 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
+       GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
@@ -20185,25 +20457,97 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -20212,9 +20556,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -20243,6 +20594,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_L,
@@ -21133,6 +21486,10 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -21149,12 +21506,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Prepend,
        GCB_Other,
+       GCB_Prepend,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -21211,6 +21572,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -21254,11 +21617,14 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Prepend,
        GCB_Extend,
@@ -21300,6 +21666,18 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Prepend,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -21353,97 +21731,60 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_Regional_Indicator,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Modifier,
-       GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base_GAZ,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Regional_Indicator,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Extend,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -21457,15 +21798,15 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
-       1690,   /* Number of elements */
+static const UV _Perl_GCB_invlist[] = {  /* for EBCDIC 1047 */
+       1768,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -21475,6 +21816,10 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x15,
        0x16,
        0x40,
+       0xAF,
+       0xB0,
+       0xB4,
+       0xB5,
        0xCA,
        0xCB,
        0xFF,
@@ -21522,6 +21867,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -21532,7 +21879,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -21569,6 +21916,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA04,
@@ -21640,6 +21989,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0xC00,
        0xC01,
        0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC45,
@@ -21893,26 +22243,98 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x2010,
        0x2028,
        0x202F,
+       0x203C,
+       0x203D,
+       0x2049,
+       0x204A,
        0x2060,
        0x2070,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x2122,
+       0x2123,
+       0x2139,
+       0x213A,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
+       0x24C2,
+       0x24C3,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -21921,8 +22343,15 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x2E00,
        0x302A,
        0x3030,
+       0x3031,
+       0x303D,
+       0x303E,
        0x3099,
        0x309B,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0xA66F,
        0xA673,
        0xA674,
@@ -21948,6 +22377,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -22841,6 +23272,10 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11001,
        0x11002,
@@ -22857,12 +23292,16 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
        0x1112C,
        0x1112D,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
@@ -22874,7 +23313,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x111C1,
        0x111C2,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x1122F,
@@ -22892,7 +23331,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x11300,
        0x11302,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x1133F,
@@ -22918,6 +23357,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114B1,
        0x114B3,
@@ -22962,9 +23403,12 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -23008,6 +23452,18 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -23061,98 +23517,61 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
        0x1E8D7,
        0x1E944,
        0x1E94B,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
+       0x1F130,
+       0x1F16C,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0000,
        0xE0020,
        0xE0080,
@@ -23163,7 +23582,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
 
 #  endif       /* EBCDIC 1047 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -23176,31 +23595,36 @@ typedef enum {
        GCB_Other = 0,
        GCB_CR = 1,
        GCB_Control = 2,
-       GCB_E_Base = 3,
-       GCB_E_Base_GAZ = 4,
-       GCB_E_Modifier = 5,
-       GCB_Extend = 6,
-       GCB_Glue_After_Zwj = 7,
-       GCB_L = 8,
-       GCB_LF = 9,
-       GCB_LV = 10,
-       GCB_LVT = 11,
-       GCB_Prepend = 12,
-       GCB_Regional_Indicator = 13,
-       GCB_SpacingMark = 14,
-       GCB_T = 15,
-       GCB_V = 16,
-       GCB_ZWJ = 17,
-       GCB_EDGE = 18
+       GCB_Extend = 3,
+       GCB_L = 4,
+       GCB_LF = 5,
+       GCB_LV = 6,
+       GCB_LVT = 7,
+       GCB_Prepend = 8,
+       GCB_Regional_Indicator = 9,
+       GCB_SpacingMark = 10,
+       GCB_T = 11,
+       GCB_V = 12,
+       GCB_XPG_XX = 13,
+       GCB_ZWJ = 14,
+       GCB_EDGE = 15,
+       GCB_E_Base = 16,
+       GCB_E_Base_GAZ = 16,
+       GCB_E_Modifier = 16,
+       GCB_Glue_After_Zwj = 16
 } GCB_enum;
 
-static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
+static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 1047 */
        GCB_Control,
        GCB_CR,
        GCB_Control,
        GCB_LF,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Control,
@@ -23259,6 +23683,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_Prepend,
        GCB_Extend,
        GCB_SpacingMark,
@@ -23296,6 +23722,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_Extend,
@@ -23365,6 +23793,7 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
+       GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
@@ -23619,25 +24048,97 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -23646,9 +24147,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -23677,6 +24185,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_L,
@@ -24567,6 +25077,10 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -24583,12 +25097,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Prepend,
        GCB_Other,
+       GCB_Prepend,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -24645,6 +25163,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -24688,11 +25208,14 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Prepend,
        GCB_Extend,
@@ -24734,6 +25257,18 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Prepend,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -24787,97 +25322,60 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_Regional_Indicator,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Modifier,
-       GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base_GAZ,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Regional_Indicator,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Extend,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -24891,15 +25389,15 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
-       1690,   /* Number of elements */
+static const UV _Perl_GCB_invlist[] = {  /* for EBCDIC 037 */
+       1768,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -24909,6 +25407,10 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x25,
        0x26,
        0x40,
+       0xAF,
+       0xB0,
+       0xB4,
+       0xB5,
        0xCA,
        0xCB,
        0xFF,
@@ -24956,6 +25458,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -24966,7 +25470,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -25003,6 +25507,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA04,
@@ -25074,6 +25580,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0xC00,
        0xC01,
        0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC45,
@@ -25327,26 +25834,98 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x2010,
        0x2028,
        0x202F,
+       0x203C,
+       0x203D,
+       0x2049,
+       0x204A,
        0x2060,
        0x2070,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x2122,
+       0x2123,
+       0x2139,
+       0x213A,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
+       0x24C2,
+       0x24C3,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -25355,8 +25934,15 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x2E00,
        0x302A,
        0x3030,
+       0x3031,
+       0x303D,
+       0x303E,
        0x3099,
        0x309B,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0xA66F,
        0xA673,
        0xA674,
@@ -25382,6 +25968,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -26275,6 +26863,10 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11001,
        0x11002,
@@ -26291,12 +26883,16 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
        0x1112C,
        0x1112D,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
@@ -26308,7 +26904,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x111C1,
        0x111C2,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x1122F,
@@ -26326,7 +26922,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x11300,
        0x11302,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x1133F,
@@ -26352,6 +26948,8 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114B1,
        0x114B3,
@@ -26396,9 +26994,12 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -26442,6 +27043,18 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -26495,98 +27108,61 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
        0x1E8D7,
        0x1E944,
        0x1E94B,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
+       0x1F130,
+       0x1F16C,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0000,
        0xE0020,
        0xE0080,
@@ -26597,7 +27173,7 @@ static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -26610,31 +27186,36 @@ typedef enum {
        GCB_Other = 0,
        GCB_CR = 1,
        GCB_Control = 2,
-       GCB_E_Base = 3,
-       GCB_E_Base_GAZ = 4,
-       GCB_E_Modifier = 5,
-       GCB_Extend = 6,
-       GCB_Glue_After_Zwj = 7,
-       GCB_L = 8,
-       GCB_LF = 9,
-       GCB_LV = 10,
-       GCB_LVT = 11,
-       GCB_Prepend = 12,
-       GCB_Regional_Indicator = 13,
-       GCB_SpacingMark = 14,
-       GCB_T = 15,
-       GCB_V = 16,
-       GCB_ZWJ = 17,
-       GCB_EDGE = 18
+       GCB_Extend = 3,
+       GCB_L = 4,
+       GCB_LF = 5,
+       GCB_LV = 6,
+       GCB_LVT = 7,
+       GCB_Prepend = 8,
+       GCB_Regional_Indicator = 9,
+       GCB_SpacingMark = 10,
+       GCB_T = 11,
+       GCB_V = 12,
+       GCB_XPG_XX = 13,
+       GCB_ZWJ = 14,
+       GCB_EDGE = 15,
+       GCB_E_Base = 16,
+       GCB_E_Base_GAZ = 16,
+       GCB_E_Modifier = 16,
+       GCB_Glue_After_Zwj = 16
 } GCB_enum;
 
-static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
+static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 037 */
        GCB_Control,
        GCB_CR,
        GCB_Control,
        GCB_LF,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Control,
@@ -26693,6 +27274,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_Prepend,
        GCB_Extend,
        GCB_SpacingMark,
@@ -26730,6 +27313,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_Extend,
@@ -26799,6 +27384,7 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
+       GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
@@ -27053,25 +27639,97 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -27080,9 +27738,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
+       GCB_XPG_XX,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -27111,6 +27776,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Other,
        GCB_L,
@@ -28001,6 +28668,10 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -28017,12 +28688,16 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Other,
        GCB_Prepend,
        GCB_Other,
+       GCB_Prepend,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -28079,6 +28754,8 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
@@ -28122,11 +28799,14 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
        GCB_Extend,
        GCB_SpacingMark,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
        GCB_SpacingMark,
        GCB_Prepend,
        GCB_Extend,
@@ -28168,6 +28848,18 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Prepend,
        GCB_Extend,
        GCB_Other,
+       GCB_SpacingMark,
+       GCB_Other,
+       GCB_Extend,
+       GCB_Other,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Extend,
+       GCB_Other,
+       GCB_Extend,
+       GCB_SpacingMark,
+       GCB_Other,
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
@@ -28221,97 +28913,60 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_Regional_Indicator,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Modifier,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base_GAZ,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_Glue_After_Zwj,
-       GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Regional_Indicator,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
+       GCB_Extend,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_Glue_After_Zwj,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
-       GCB_E_Base,
+       GCB_XPG_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -28325,12 +28980,12 @@ static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */
-       1289,   /* Number of elements */
+static const UV _Perl_IVCF_invlist[] = {  /* for ASCII/Latin1 */
+       1297,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -28965,6 +29620,10 @@ static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */
        0x530,
        0x561,
        0x587,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F0,
        0x13F6,
@@ -29607,6 +30266,8 @@ static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xFB05,
@@ -29622,9 +30283,19 @@ static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922
 };
 
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -29833,6 +30504,7 @@ static const unsigned int * const IVCF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 IVCF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* IVCF_AUX_TABLE_1 */,
@@ -29864,7 +30536,7 @@ static const U8 IVCF_AUX_TABLE_lengths[] = {
        2       /* IVCF_AUX_TABLE_27 */
 };
 
-static const int _Perl_IVCF_invmap[] = { /* for ASCII/Latin1 */
+static const int _Perl_IVCF_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x41,
        IVCF_use_AUX_TABLE_1,
@@ -30496,6 +31168,10 @@ static const int _Perl_IVCF_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x531,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0xAB70,
        0x13F8,
        0,
@@ -31138,6 +31814,8 @@ static const int _Perl_IVCF_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0xFB06,
@@ -31153,18 +31831,24 @@ static const int _Perl_IVCF_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */
-       1303,   /* Number of elements */
+static const UV _Perl_IVCF_invlist[] = {  /* for EBCDIC 1047 */
+       1311,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -31813,6 +32497,10 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */
        0x530,
        0x561,
        0x587,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F0,
        0x13F6,
@@ -32455,6 +33143,8 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xFB05,
@@ -32470,9 +33160,22 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922
 };
 
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -32681,6 +33384,7 @@ static const unsigned int * const IVCF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 IVCF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* IVCF_AUX_TABLE_1 */,
@@ -32712,7 +33416,7 @@ static const U8 IVCF_AUX_TABLE_lengths[] = {
        2       /* IVCF_AUX_TABLE_27 */
 };
 
-static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 1047 */
+static const int _Perl_IVCF_invmap[] = {  /* for EBCDIC 1047 */
        0,
        0xC0,
        IVCF_use_AUX_TABLE_1,
@@ -33358,6 +34062,10 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x531,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0xAB70,
        0x13F8,
        0,
@@ -34000,6 +34708,8 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0xFB06,
@@ -34015,18 +34725,24 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */
-       1303,   /* Number of elements */
+static const UV _Perl_IVCF_invlist[] = {  /* for EBCDIC 037 */
+       1311,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -34675,6 +35391,10 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */
        0x530,
        0x561,
        0x587,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F0,
        0x13F6,
@@ -35317,6 +36037,8 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xFB05,
@@ -35332,9 +36054,22 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922
 };
 
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -35543,6 +36278,7 @@ static const unsigned int * const IVCF_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 IVCF_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* IVCF_AUX_TABLE_1 */,
@@ -35574,7 +36310,7 @@ static const U8 IVCF_AUX_TABLE_lengths[] = {
        2       /* IVCF_AUX_TABLE_27 */
 };
 
-static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 037 */
+static const int _Perl_IVCF_invmap[] = {  /* for EBCDIC 037 */
        0,
        0xC0,
        IVCF_use_AUX_TABLE_1,
@@ -36220,6 +36956,10 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 037 */
        0,
        0x531,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0xAB70,
        0x13F8,
        0,
@@ -36862,6 +37602,8 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0xFB06,
@@ -36877,15 +37619,21 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
-       2313,   /* Number of elements */
+static const UV _Perl_LB_invlist[] = {  /* for ASCII/Latin1 */
+       2353,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -36978,7 +37726,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x609,
        0x60C,
@@ -37021,6 +37769,9 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x7F8,
        0x7F9,
        0x7FA,
+       0x7FD,
+       0x7FE,
+       0x800,
        0x816,
        0x81A,
        0x81B,
@@ -37031,7 +37782,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -37067,6 +37818,8 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x9FA,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -37133,7 +37886,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0xBF9,
        0xBFA,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -37148,6 +37901,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0xC70,
        0xC81,
        0xC84,
+       0xC85,
        0xCBC,
        0xCBD,
        0xCBE,
@@ -37638,7 +38392,11 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -37733,7 +38491,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -37797,6 +38555,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -38818,6 +39577,12 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x10AF7,
        0x10B39,
        0x10B40,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -38840,6 +39605,8 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x11136,
        0x11140,
        0x11144,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11175,
@@ -38852,7 +39619,6 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x111C7,
        0x111C8,
        0x111C9,
-       0x111CA,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -38875,7 +39641,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x112FA,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -38899,6 +39665,8 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x1145A,
        0x1145B,
        0x1145C,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x114D0,
@@ -38931,6 +39699,8 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x1173A,
        0x1173C,
        0x1173F,
+       0x1182C,
+       0x1183B,
        0x118E0,
        0x118EA,
        0x11A01,
@@ -38980,6 +39750,16 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EF3,
+       0x11EF7,
        0x12470,
        0x12475,
        0x13258,
@@ -39012,6 +39792,8 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x16B45,
        0x16B50,
        0x16B5A,
+       0x16E97,
+       0x16E99,
        0x16F51,
        0x16F7F,
        0x16F8F,
@@ -39019,7 +39801,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -39074,12 +39856,14 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1F000,
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -39189,6 +39973,10 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
        0x1F93A,
        0x1F93D,
        0x1F93F,
+       0x1F9B5,
+       0x1F9B7,
+       0x1F9B8,
+       0x1F9BA,
        0x1F9D1,
        0x1F9DE,
        0x1FFFE,
@@ -39206,7 +39994,7 @@ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
 
 #  endif       /* ASCII/Latin1 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -39254,7 +40042,7 @@ typedef enum {
        LB_EDGE = 38
 } LB_enum;
 
-static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
+static const LB_enum _Perl_LB_invmap[] = {  /* for ASCII/Latin1 */
        LB_Combining_Mark,
        LB_Break_After,
        LB_Line_Feed,
@@ -39388,6 +40176,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Exclamation,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Prefix_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -39445,6 +40236,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -39513,6 +40306,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -40005,6 +40799,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Open_Punctuation,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
@@ -40163,6 +40961,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -41186,6 +41985,12 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Break_After,
        LB_Alphabetic,
@@ -41208,6 +42013,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -41217,7 +42024,6 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Break_After,
        LB_Alphabetic,
        LB_Break_After,
-       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Numeric,
@@ -41267,6 +42073,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -41297,6 +42105,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -41346,6 +42156,16 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
        LB_Open_Punctuation,
@@ -41378,6 +42198,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -41440,7 +42262,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Alphabetic,
        LB_Open_Punctuation,
        LB_Alphabetic,
-       LB_Ideographic,
+       LB_Postfix_Numeric,
+       LB_Alphabetic,
+       LB_Postfix_Numeric,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -41557,6 +42381,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
        LB_Ideographic,
        LB_E_Base,
        LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -41574,15 +42402,15 @@ static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
-       2325,   /* Number of elements */
+static const UV _Perl_LB_invlist[] = {  /* for EBCDIC 1047 */
+       2365,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -41687,7 +42515,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x609,
        0x60C,
@@ -41730,6 +42558,9 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x7F8,
        0x7F9,
        0x7FA,
+       0x7FD,
+       0x7FE,
+       0x800,
        0x816,
        0x81A,
        0x81B,
@@ -41740,7 +42571,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -41776,6 +42607,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x9FA,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -41842,7 +42675,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0xBF9,
        0xBFA,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -41857,6 +42690,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0xC70,
        0xC81,
        0xC84,
+       0xC85,
        0xCBC,
        0xCBD,
        0xCBE,
@@ -42347,7 +43181,11 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -42442,7 +43280,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -42506,6 +43344,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -43527,6 +44366,12 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x10AF7,
        0x10B39,
        0x10B40,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -43549,6 +44394,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x11136,
        0x11140,
        0x11144,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11175,
@@ -43561,7 +44408,6 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x111C7,
        0x111C8,
        0x111C9,
-       0x111CA,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -43584,7 +44430,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x112FA,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -43608,6 +44454,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x1145A,
        0x1145B,
        0x1145C,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x114D0,
@@ -43640,6 +44488,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x1173A,
        0x1173C,
        0x1173F,
+       0x1182C,
+       0x1183B,
        0x118E0,
        0x118EA,
        0x11A01,
@@ -43689,6 +44539,16 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EF3,
+       0x11EF7,
        0x12470,
        0x12475,
        0x13258,
@@ -43721,6 +44581,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x16B45,
        0x16B50,
        0x16B5A,
+       0x16E97,
+       0x16E99,
        0x16F51,
        0x16F7F,
        0x16F8F,
@@ -43728,7 +44590,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -43783,12 +44645,14 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1F000,
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -43898,6 +44762,10 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
        0x1F93A,
        0x1F93D,
        0x1F93F,
+       0x1F9B5,
+       0x1F9B7,
+       0x1F9B8,
+       0x1F9BA,
        0x1F9D1,
        0x1F9DE,
        0x1FFFE,
@@ -43915,7 +44783,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
 
 #  endif       /* EBCDIC 1047 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -43966,7 +44834,7 @@ typedef enum {
        LB_EDGE = 38
 } LB_enum;
 
-static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
+static const LB_enum _Perl_LB_invmap[] = {  /* for EBCDIC 1047 */
        LB_Combining_Mark,
        LB_Break_After,
        LB_Combining_Mark,
@@ -44112,6 +44980,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Exclamation,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Prefix_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -44169,6 +45040,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -44237,6 +45110,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -44729,6 +45603,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Open_Punctuation,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
@@ -44887,6 +45765,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -45910,6 +46789,12 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Break_After,
        LB_Alphabetic,
@@ -45932,6 +46817,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -45941,7 +46828,6 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Break_After,
        LB_Alphabetic,
        LB_Break_After,
-       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Numeric,
@@ -45991,6 +46877,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -46021,6 +46909,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -46070,6 +46960,16 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
        LB_Open_Punctuation,
@@ -46102,6 +47002,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -46164,7 +47066,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Alphabetic,
        LB_Open_Punctuation,
        LB_Alphabetic,
-       LB_Ideographic,
+       LB_Postfix_Numeric,
+       LB_Alphabetic,
+       LB_Postfix_Numeric,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -46281,6 +47185,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
        LB_Ideographic,
        LB_E_Base,
        LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -46298,15 +47206,15 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
-       2325,   /* Number of elements */
+static const UV _Perl_LB_invlist[] = {  /* for EBCDIC 037 */
+       2365,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -46411,7 +47319,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x609,
        0x60C,
@@ -46454,6 +47362,9 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x7F8,
        0x7F9,
        0x7FA,
+       0x7FD,
+       0x7FE,
+       0x800,
        0x816,
        0x81A,
        0x81B,
@@ -46464,7 +47375,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -46500,6 +47411,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x9FA,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -46566,7 +47479,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0xBF9,
        0xBFA,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -46581,6 +47494,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0xC70,
        0xC81,
        0xC84,
+       0xC85,
        0xCBC,
        0xCBD,
        0xCBE,
@@ -47071,7 +47985,11 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -47166,7 +48084,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -47230,6 +48148,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -48251,6 +49170,12 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x10AF7,
        0x10B39,
        0x10B40,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -48273,6 +49198,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x11136,
        0x11140,
        0x11144,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11175,
@@ -48285,7 +49212,6 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x111C7,
        0x111C8,
        0x111C9,
-       0x111CA,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -48308,7 +49234,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x112FA,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -48332,6 +49258,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x1145A,
        0x1145B,
        0x1145C,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x114D0,
@@ -48364,6 +49292,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x1173A,
        0x1173C,
        0x1173F,
+       0x1182C,
+       0x1183B,
        0x118E0,
        0x118EA,
        0x11A01,
@@ -48413,6 +49343,16 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EF3,
+       0x11EF7,
        0x12470,
        0x12475,
        0x13258,
@@ -48445,6 +49385,8 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x16B45,
        0x16B50,
        0x16B5A,
+       0x16E97,
+       0x16E99,
        0x16F51,
        0x16F7F,
        0x16F8F,
@@ -48452,7 +49394,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -48507,12 +49449,14 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1F000,
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -48622,6 +49566,10 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
        0x1F93A,
        0x1F93D,
        0x1F93F,
+       0x1F9B5,
+       0x1F9B7,
+       0x1F9B8,
+       0x1F9BA,
        0x1F9D1,
        0x1F9DE,
        0x1FFFE,
@@ -48639,7 +49587,7 @@ static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -48690,7 +49638,7 @@ typedef enum {
        LB_EDGE = 38
 } LB_enum;
 
-static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
+static const LB_enum _Perl_LB_invmap[] = {  /* for EBCDIC 037 */
        LB_Combining_Mark,
        LB_Break_After,
        LB_Combining_Mark,
@@ -48836,6 +49784,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Exclamation,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Prefix_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -48893,6 +49844,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -48961,6 +49914,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
+       LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
@@ -49453,6 +50407,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Open_Punctuation,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
@@ -49611,6 +50569,7 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
+       LB_Combining_Mark,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -50634,6 +51593,12 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Break_After,
        LB_Alphabetic,
@@ -50656,6 +51621,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_Before,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -50665,7 +51632,6 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Break_After,
        LB_Alphabetic,
        LB_Break_After,
-       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Numeric,
@@ -50715,6 +51681,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -50745,6 +51713,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -50794,6 +51764,16 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
+       LB_Numeric,
+       LB_Alphabetic,
+       LB_Combining_Mark,
+       LB_Alphabetic,
        LB_Break_After,
        LB_Alphabetic,
        LB_Open_Punctuation,
@@ -50826,6 +51806,8 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Numeric,
        LB_Alphabetic,
+       LB_Break_After,
+       LB_Alphabetic,
        LB_Combining_Mark,
        LB_Alphabetic,
        LB_Combining_Mark,
@@ -50888,7 +51870,9 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Alphabetic,
        LB_Open_Punctuation,
        LB_Alphabetic,
-       LB_Ideographic,
+       LB_Postfix_Numeric,
+       LB_Alphabetic,
+       LB_Postfix_Numeric,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -51005,6 +51989,10 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
        LB_Ideographic,
        LB_E_Base,
        LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
+       LB_E_Base,
+       LB_Ideographic,
        LB_Alphabetic,
        LB_Ideographic,
        LB_Alphabetic,
@@ -51022,12 +52010,12 @@ static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
-       3002,   /* Number of elements */
+static const UV _Perl_SB_invlist[] = {  /* for ASCII/Latin1 */
+       3065,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -51648,8 +52636,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -51664,7 +52651,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -51674,7 +52661,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x620,
        0x64B,
        0x660,
@@ -51720,6 +52707,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -51729,6 +52718,12 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x828,
        0x829,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x859,
        0x85C,
@@ -51738,7 +52733,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -51788,6 +52783,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -51922,7 +52919,6 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -52138,6 +53134,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x10D0,
        0x10FB,
        0x10FC,
+       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -52233,7 +53231,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -52311,6 +53309,10 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -52933,7 +53935,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -52943,7 +53945,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -53174,6 +54176,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F7,
        0xA7F8,
        0xA7FB,
@@ -53202,7 +54206,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -53493,7 +54497,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -53523,6 +54527,20 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11003,
        0x11038,
@@ -53537,6 +54555,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x110BD,
        0x110BE,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -53549,6 +54569,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x11140,
        0x11141,
        0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -53560,7 +54582,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x111C1,
        0x111C5,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -53610,7 +54632,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -53636,6 +54658,8 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -53669,13 +54693,16 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118C0,
        0x118E0,
@@ -53702,6 +54729,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x11A9A,
        0x11A9B,
        0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -53738,6 +54766,24 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -53774,6 +54820,11 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E60,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -53785,7 +54836,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -54037,7 +55088,7 @@ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
 
 #  endif       /* ASCII/Latin1 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -54062,7 +55113,7 @@ typedef enum {
        SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
+static const SB_enum _Perl_SB_invmap[] = {  /* for ASCII/Latin1 */
        SB_Other,
        SB_Sp,
        SB_LF,
@@ -54681,7 +55732,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_SContinue,
        SB_Other,
        SB_Lower,
-       SB_Other,
        SB_STerm,
        SB_Other,
        SB_Extend,
@@ -54752,6 +55802,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_STerm,
        SB_OLetter,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -54761,6 +55813,12 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_OLetter,
        SB_Extend,
        SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_Other,
@@ -54822,6 +55880,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_Extend,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -54954,7 +56014,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Numeric,
        SB_Other,
        SB_Extend,
-       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -55167,9 +56226,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_Upper,
        SB_Other,
-       SB_OLetter,
+       SB_Lower,
        SB_Other,
        SB_OLetter,
+       SB_Lower,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -55343,6 +56404,10 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_STerm,
        SB_Lower,
        SB_Other,
+       SB_Upper,
+       SB_Other,
+       SB_Upper,
+       SB_Other,
        SB_Extend,
        SB_Other,
        SB_Extend,
@@ -56200,7 +57265,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Upper,
        SB_Lower,
        SB_Upper,
-       SB_Other,
+       SB_Lower,
+       SB_Upper,
+       SB_Lower,
        SB_Upper,
        SB_Lower,
        SB_Upper,
@@ -56234,7 +57301,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
-       SB_Other,
+       SB_Extend,
        SB_Numeric,
        SB_OLetter,
        SB_Extend,
@@ -56555,6 +57622,20 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_Lower,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_Extend,
        SB_OLetter,
        SB_Extend,
@@ -56569,6 +57650,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Format,
        SB_STerm,
        SB_Other,
+       SB_Format,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_Numeric,
@@ -56580,6 +57663,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Numeric,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
+       SB_Extend,
        SB_Other,
        SB_OLetter,
        SB_Extend,
@@ -56668,6 +57753,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_Numeric,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -56708,6 +57795,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_STerm,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
        SB_Upper,
        SB_Lower,
        SB_Numeric,
@@ -56733,6 +57823,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Extend,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -56775,6 +57866,24 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_OLetter,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_STerm,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -56806,6 +57915,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
        SB_Other,
        SB_OLetter,
        SB_Other,
+       SB_Upper,
+       SB_Lower,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -57071,15 +58185,15 @@ static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
-       3026,   /* Number of elements */
+static const UV _Perl_SB_invlist[] = {  /* for EBCDIC 1047 */
+       3089,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -57724,8 +58838,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -57740,7 +58853,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -57750,7 +58863,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x620,
        0x64B,
        0x660,
@@ -57796,6 +58909,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -57805,6 +58920,12 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x828,
        0x829,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x859,
        0x85C,
@@ -57814,7 +58935,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -57864,6 +58985,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -57998,7 +59121,6 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -58214,6 +59336,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x10D0,
        0x10FB,
        0x10FC,
+       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -58309,7 +59433,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -58387,6 +59511,10 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -59009,7 +60137,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -59019,7 +60147,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -59250,6 +60378,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F7,
        0xA7F8,
        0xA7FB,
@@ -59278,7 +60408,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -59569,7 +60699,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -59599,6 +60729,20 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11003,
        0x11038,
@@ -59613,6 +60757,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x110BD,
        0x110BE,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -59625,6 +60771,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x11140,
        0x11141,
        0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -59636,7 +60784,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x111C1,
        0x111C5,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -59686,7 +60834,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -59712,6 +60860,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -59745,13 +60895,16 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118C0,
        0x118E0,
@@ -59778,6 +60931,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x11A9A,
        0x11A9B,
        0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -59814,6 +60968,24 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -59850,6 +61022,11 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E60,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -59861,7 +61038,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -60113,7 +61290,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
 
 #  endif       /* EBCDIC 1047 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -60141,7 +61318,7 @@ typedef enum {
        SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
+static const SB_enum _Perl_SB_invmap[] = {  /* for EBCDIC 1047 */
        SB_Other,
        SB_Sp,
        SB_Other,
@@ -60784,7 +61961,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_SContinue,
        SB_Other,
        SB_Lower,
-       SB_Other,
        SB_STerm,
        SB_Other,
        SB_Extend,
@@ -60855,6 +62031,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_STerm,
        SB_OLetter,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -60864,6 +62042,12 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_OLetter,
        SB_Extend,
        SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_Other,
@@ -60925,6 +62109,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_Extend,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -61057,7 +62243,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Numeric,
        SB_Other,
        SB_Extend,
-       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -61270,9 +62455,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_Upper,
        SB_Other,
-       SB_OLetter,
+       SB_Lower,
        SB_Other,
        SB_OLetter,
+       SB_Lower,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -61446,6 +62633,10 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_STerm,
        SB_Lower,
        SB_Other,
+       SB_Upper,
+       SB_Other,
+       SB_Upper,
+       SB_Other,
        SB_Extend,
        SB_Other,
        SB_Extend,
@@ -62303,7 +63494,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Upper,
        SB_Lower,
        SB_Upper,
-       SB_Other,
+       SB_Lower,
+       SB_Upper,
+       SB_Lower,
        SB_Upper,
        SB_Lower,
        SB_Upper,
@@ -62337,7 +63530,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
-       SB_Other,
+       SB_Extend,
        SB_Numeric,
        SB_OLetter,
        SB_Extend,
@@ -62658,6 +63851,20 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_Lower,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_Extend,
        SB_OLetter,
        SB_Extend,
@@ -62672,6 +63879,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Format,
        SB_STerm,
        SB_Other,
+       SB_Format,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_Numeric,
@@ -62683,6 +63892,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Numeric,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
+       SB_Extend,
        SB_Other,
        SB_OLetter,
        SB_Extend,
@@ -62771,6 +63982,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_Numeric,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -62811,6 +64024,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_STerm,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
        SB_Upper,
        SB_Lower,
        SB_Numeric,
@@ -62836,6 +64052,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Extend,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -62878,6 +64095,24 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_OLetter,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_STerm,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -62909,6 +64144,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
        SB_Other,
        SB_OLetter,
        SB_Other,
+       SB_Upper,
+       SB_Lower,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -63174,15 +64414,15 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
-       3022,   /* Number of elements */
+static const UV _Perl_SB_invlist[] = {  /* for EBCDIC 037 */
+       3085,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -63823,8 +65063,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -63839,7 +65078,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -63849,7 +65088,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x620,
        0x64B,
        0x660,
@@ -63895,6 +65134,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -63904,6 +65145,12 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x828,
        0x829,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x859,
        0x85C,
@@ -63913,7 +65160,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -63963,6 +65210,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -64097,7 +65346,6 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -64313,6 +65561,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x10D0,
        0x10FB,
        0x10FC,
+       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -64408,7 +65658,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -64486,6 +65736,10 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -65108,7 +66362,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -65118,7 +66372,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -65349,6 +66603,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F7,
        0xA7F8,
        0xA7FB,
@@ -65377,7 +66633,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -65668,7 +66924,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -65698,6 +66954,20 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11003,
        0x11038,
@@ -65712,6 +66982,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x110BD,
        0x110BE,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -65724,6 +66996,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x11140,
        0x11141,
        0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -65735,7 +67009,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x111C1,
        0x111C5,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -65785,7 +67059,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -65811,6 +67085,8 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -65844,13 +67120,16 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118C0,
        0x118E0,
@@ -65877,6 +67156,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x11A9A,
        0x11A9B,
        0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -65913,6 +67193,24 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -65949,6 +67247,11 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E60,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -65960,7 +67263,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -66212,7 +67515,7 @@ static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -66240,7 +67543,7 @@ typedef enum {
        SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
+static const SB_enum _Perl_SB_invmap[] = {  /* for EBCDIC 037 */
        SB_Other,
        SB_Sp,
        SB_Other,
@@ -66879,7 +68182,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_SContinue,
        SB_Other,
        SB_Lower,
-       SB_Other,
        SB_STerm,
        SB_Other,
        SB_Extend,
@@ -66950,6 +68252,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_STerm,
        SB_OLetter,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -66959,6 +68263,12 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_OLetter,
        SB_Extend,
        SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_Other,
@@ -67020,6 +68330,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_Extend,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -67152,7 +68464,6 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Numeric,
        SB_Other,
        SB_Extend,
-       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -67365,9 +68676,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_Upper,
        SB_Other,
-       SB_OLetter,
+       SB_Lower,
        SB_Other,
        SB_OLetter,
+       SB_Lower,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -67541,6 +68854,10 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_STerm,
        SB_Lower,
        SB_Other,
+       SB_Upper,
+       SB_Other,
+       SB_Upper,
+       SB_Other,
        SB_Extend,
        SB_Other,
        SB_Extend,
@@ -68398,7 +69715,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Upper,
        SB_Lower,
        SB_Upper,
-       SB_Other,
+       SB_Lower,
+       SB_Upper,
+       SB_Lower,
        SB_Upper,
        SB_Lower,
        SB_Upper,
@@ -68432,7 +69751,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
-       SB_Other,
+       SB_Extend,
        SB_Numeric,
        SB_OLetter,
        SB_Extend,
@@ -68753,6 +70072,20 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_Lower,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_Extend,
        SB_OLetter,
        SB_Extend,
@@ -68767,6 +70100,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Format,
        SB_STerm,
        SB_Other,
+       SB_Format,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_Numeric,
@@ -68778,6 +70113,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Numeric,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
+       SB_Extend,
        SB_Other,
        SB_OLetter,
        SB_Extend,
@@ -68866,6 +70203,8 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_Numeric,
        SB_Other,
+       SB_Extend,
+       SB_Other,
        SB_OLetter,
        SB_Extend,
        SB_OLetter,
@@ -68906,6 +70245,9 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_STerm,
        SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_Other,
        SB_Upper,
        SB_Lower,
        SB_Numeric,
@@ -68931,6 +70273,7 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Extend,
        SB_Other,
        SB_STerm,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -68973,6 +70316,24 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_OLetter,
        SB_Other,
        SB_OLetter,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_Other,
+       SB_Extend,
+       SB_OLetter,
+       SB_Other,
+       SB_Numeric,
+       SB_Other,
+       SB_OLetter,
+       SB_Extend,
+       SB_STerm,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
+       SB_Other,
+       SB_OLetter,
        SB_Other,
        SB_OLetter,
        SB_Other,
@@ -69004,6 +70365,11 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
        SB_Other,
        SB_OLetter,
        SB_Other,
+       SB_Upper,
+       SB_Lower,
+       SB_Other,
+       SB_STerm,
+       SB_Other,
        SB_OLetter,
        SB_Other,
        SB_OLetter,
@@ -69269,12 +70635,12 @@ static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
-       1580,   /* Number of elements */
+static const UV _Perl_SCX_invlist[] = {  /* for ASCII/Latin1 */
+       1612,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -69334,9 +70700,6 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
        0x589,
        0x58A,
        0x58B,
@@ -69346,7 +70709,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x605,
@@ -69354,6 +70717,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x60C,
        0x60D,
        0x61B,
+       0x61C,
        0x61D,
        0x61E,
        0x61F,
@@ -69366,6 +70730,8 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x66A,
        0x670,
        0x671,
+       0x6D4,
+       0x6D5,
        0x6DD,
        0x6DE,
        0x700,
@@ -69378,6 +70744,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x7B2,
        0x7C0,
        0x7FB,
+       0x7FD,
        0x800,
        0x82E,
        0x830,
@@ -69392,7 +70759,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -69431,7 +70798,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x9E4,
        0x9E6,
        0x9F0,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -69464,7 +70831,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xA5F,
        0xA66,
        0xA70,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -69539,11 +70906,8 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xBA3,
        0xBA5,
        0xBA8,
-       0xBAA,
        0xBAB,
        0xBAE,
-       0xBB5,
-       0xBB6,
        0xBBA,
        0xBBE,
        0xBC3,
@@ -69556,11 +70920,9 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xBD7,
        0xBD8,
        0xBE6,
-       0xBF3,
+       0xBF4,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -69584,8 +70946,6 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xC70,
        0xC78,
        0xC80,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -69796,7 +71156,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -69853,12 +71213,17 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1C50,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC0,
        0x1CC8,
        0x1CD0,
        0x1CD1,
        0x1CD2,
+       0x1CD3,
        0x1CD4,
+       0x1CD5,
        0x1CD7,
        0x1CD8,
        0x1CD9,
@@ -69868,9 +71233,14 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1CDE,
        0x1CE0,
        0x1CE1,
+       0x1CE2,
+       0x1CEA,
+       0x1CEB,
+       0x1CED,
+       0x1CEE,
        0x1CF2,
+       0x1CF4,
        0x1CF5,
-       0x1CF6,
        0x1CF7,
        0x1CF8,
        0x1CFA,
@@ -69962,13 +71332,9 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -70010,7 +71376,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -70052,7 +71418,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x30FD,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -70084,7 +71450,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x4DB6,
        0x4DC0,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -70101,13 +71467,12 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA82C,
        0xA830,
+       0xA833,
        0xA836,
        0xA83A,
        0xA840,
@@ -70121,7 +71486,6 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0xA8F2,
        0xA8F3,
        0xA8F4,
-       0xA8FE,
        0xA900,
        0xA92E,
        0xA92F,
@@ -70371,11 +71735,11 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -70408,8 +71772,15 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x10CFA,
        0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -70417,6 +71788,8 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1107F,
        0x11080,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -70424,7 +71797,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -70468,7 +71841,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11345,
        0x11347,
@@ -70490,7 +71863,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -70510,11 +71883,13 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -70524,8 +71899,6 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -70557,6 +71930,20 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -70591,6 +71978,8 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -70601,7 +71990,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x16FE1,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -70635,10 +72024,13 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
        0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -70706,6 +72098,8 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -70789,8 +72183,6 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -70811,11 +72203,11 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -70831,15 +72223,21 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -70862,7 +72260,7 @@ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */
 
 #  endif       /* ASCII/Latin1 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
@@ -70902,121 +72300,128 @@ typedef enum {
        SCX_Cyrillic = 28,
        SCX_Deseret = 29,
        SCX_Devanagari = 30,
-       SCX_Duployan = 31,
-       SCX_Egyptian_Hieroglyphs = 32,
-       SCX_Elbasan = 33,
-       SCX_Ethiopic = 34,
-       SCX_Georgian = 35,
-       SCX_Glagolitic = 36,
-       SCX_Gothic = 37,
-       SCX_Grantha = 38,
-       SCX_Greek = 39,
-       SCX_Gujarati = 40,
-       SCX_Gurmukhi = 41,
-       SCX_Han = 42,
-       SCX_Hanb = 43,
-       SCX_Hangul = 44,
-       SCX_Hanunoo = 45,
-       SCX_Hatran = 46,
-       SCX_Hebrew = 47,
-       SCX_Hiragana = 48,
-       SCX_Imperial_Aramaic = 49,
-       SCX_Inherited = 50,
-       SCX_Inscriptional_Pahlavi = 51,
-       SCX_Inscriptional_Parthian = 52,
-       SCX_Javanese = 53,
-       SCX_Jpan = 54,
-       SCX_Kaithi = 55,
-       SCX_Kannada = 56,
-       SCX_Katakana = 57,
-       SCX_Kayah_Li = 58,
-       SCX_Kharoshthi = 59,
-       SCX_Khmer = 60,
-       SCX_Khojki = 61,
-       SCX_Khudawadi = 62,
-       SCX_Kore = 63,
-       SCX_Lao = 64,
-       SCX_Latin = 65,
-       SCX_Lepcha = 66,
-       SCX_Limbu = 67,
-       SCX_Linear_A = 68,
-       SCX_Linear_B = 69,
-       SCX_Lisu = 70,
-       SCX_Lycian = 71,
-       SCX_Lydian = 72,
-       SCX_Mahajani = 73,
-       SCX_Malayalam = 74,
-       SCX_Mandaic = 75,
-       SCX_Manichaean = 76,
-       SCX_Marchen = 77,
-       SCX_Masaram_Gondi = 78,
-       SCX_Meetei_Mayek = 79,
-       SCX_Mende_Kikakui = 80,
-       SCX_Meroitic_Cursive = 81,
-       SCX_Meroitic_Hieroglyphs = 82,
-       SCX_Miao = 83,
-       SCX_Modi = 84,
-       SCX_Mongolian = 85,
-       SCX_Mro = 86,
-       SCX_Multani = 87,
-       SCX_Myanmar = 88,
-       SCX_Nabataean = 89,
-       SCX_New_Tai_Lue = 90,
-       SCX_Newa = 91,
-       SCX_Nko = 92,
-       SCX_Nushu = 93,
-       SCX_Ogham = 94,
-       SCX_Ol_Chiki = 95,
-       SCX_Old_Hungarian = 96,
-       SCX_Old_Italic = 97,
-       SCX_Old_North_Arabian = 98,
-       SCX_Old_Permic = 99,
-       SCX_Old_Persian = 100,
-       SCX_Old_South_Arabian = 101,
-       SCX_Old_Turkic = 102,
-       SCX_Oriya = 103,
-       SCX_Osage = 104,
-       SCX_Osmanya = 105,
-       SCX_Pahawh_Hmong = 106,
-       SCX_Palmyrene = 107,
-       SCX_Pau_Cin_Hau = 108,
-       SCX_Phags_Pa = 109,
-       SCX_Phoenician = 110,
-       SCX_Psalter_Pahlavi = 111,
-       SCX_Rejang = 112,
-       SCX_Runic = 113,
-       SCX_Samaritan = 114,
-       SCX_Saurashtra = 115,
-       SCX_Sharada = 116,
-       SCX_Shavian = 117,
-       SCX_Siddham = 118,
-       SCX_SignWriting = 119,
-       SCX_Sinhala = 120,
-       SCX_Sora_Sompeng = 121,
-       SCX_Soyombo = 122,
-       SCX_Sundanese = 123,
-       SCX_Syloti_Nagri = 124,
-       SCX_Syriac = 125,
-       SCX_Tagalog = 126,
-       SCX_Tagbanwa = 127,
-       SCX_Tai_Le = 128,
-       SCX_Tai_Tham = 129,
-       SCX_Tai_Viet = 130,
-       SCX_Takri = 131,
-       SCX_Tamil = 132,
-       SCX_Tangut = 133,
-       SCX_Telugu = 134,
-       SCX_Thaana = 135,
-       SCX_Thai = 136,
-       SCX_Tibetan = 137,
-       SCX_Tifinagh = 138,
-       SCX_Tirhuta = 139,
-       SCX_Ugaritic = 140,
-       SCX_Vai = 141,
-       SCX_Warang_Citi = 142,
-       SCX_Yi = 143,
-       SCX_Zanabazar_Square = 144,
-       SCX_INVALID = 145,
+       SCX_Dogra = 31,
+       SCX_Duployan = 32,
+       SCX_Egyptian_Hieroglyphs = 33,
+       SCX_Elbasan = 34,
+       SCX_Ethiopic = 35,
+       SCX_Georgian = 36,
+       SCX_Glagolitic = 37,
+       SCX_Gothic = 38,
+       SCX_Grantha = 39,
+       SCX_Greek = 40,
+       SCX_Gujarati = 41,
+       SCX_Gunjala_Gondi = 42,
+       SCX_Gurmukhi = 43,
+       SCX_Han = 44,
+       SCX_Hanb = 45,
+       SCX_Hangul = 46,
+       SCX_Hanifi_Rohingya = 47,
+       SCX_Hanunoo = 48,
+       SCX_Hatran = 49,
+       SCX_Hebrew = 50,
+       SCX_Hiragana = 51,
+       SCX_Imperial_Aramaic = 52,
+       SCX_Inherited = 53,
+       SCX_Inscriptional_Pahlavi = 54,
+       SCX_Inscriptional_Parthian = 55,
+       SCX_Javanese = 56,
+       SCX_Jpan = 57,
+       SCX_Kaithi = 58,
+       SCX_Kannada = 59,
+       SCX_Katakana = 60,
+       SCX_Kayah_Li = 61,
+       SCX_Kharoshthi = 62,
+       SCX_Khmer = 63,
+       SCX_Khojki = 64,
+       SCX_Khudawadi = 65,
+       SCX_Kore = 66,
+       SCX_Lao = 67,
+       SCX_Latin = 68,
+       SCX_Lepcha = 69,
+       SCX_Limbu = 70,
+       SCX_Linear_A = 71,
+       SCX_Linear_B = 72,
+       SCX_Lisu = 73,
+       SCX_Lycian = 74,
+       SCX_Lydian = 75,
+       SCX_Mahajani = 76,
+       SCX_Makasar = 77,
+       SCX_Malayalam = 78,
+       SCX_Mandaic = 79,
+       SCX_Manichaean = 80,
+       SCX_Marchen = 81,
+       SCX_Masaram_Gondi = 82,
+       SCX_Medefaidrin = 83,
+       SCX_Meetei_Mayek = 84,
+       SCX_Mende_Kikakui = 85,
+       SCX_Meroitic_Cursive = 86,
+       SCX_Meroitic_Hieroglyphs = 87,
+       SCX_Miao = 88,
+       SCX_Modi = 89,
+       SCX_Mongolian = 90,
+       SCX_Mro = 91,
+       SCX_Multani = 92,
+       SCX_Myanmar = 93,
+       SCX_Nabataean = 94,
+       SCX_New_Tai_Lue = 95,
+       SCX_Newa = 96,
+       SCX_Nko = 97,
+       SCX_Nushu = 98,
+       SCX_Ogham = 99,
+       SCX_Ol_Chiki = 100,
+       SCX_Old_Hungarian = 101,
+       SCX_Old_Italic = 102,
+       SCX_Old_North_Arabian = 103,
+       SCX_Old_Permic = 104,
+       SCX_Old_Persian = 105,
+       SCX_Old_Sogdian = 106,
+       SCX_Old_South_Arabian = 107,
+       SCX_Old_Turkic = 108,
+       SCX_Oriya = 109,
+       SCX_Osage = 110,
+       SCX_Osmanya = 111,
+       SCX_Pahawh_Hmong = 112,
+       SCX_Palmyrene = 113,
+       SCX_Pau_Cin_Hau = 114,
+       SCX_Phags_Pa = 115,
+       SCX_Phoenician = 116,
+       SCX_Psalter_Pahlavi = 117,
+       SCX_Rejang = 118,
+       SCX_Runic = 119,
+       SCX_Samaritan = 120,
+       SCX_Saurashtra = 121,
+       SCX_Sharada = 122,
+       SCX_Shavian = 123,
+       SCX_Siddham = 124,
+       SCX_SignWriting = 125,
+       SCX_Sinhala = 126,
+       SCX_Sogdian = 127,
+       SCX_Sora_Sompeng = 128,
+       SCX_Soyombo = 129,
+       SCX_Sundanese = 130,
+       SCX_Syloti_Nagri = 131,
+       SCX_Syriac = 132,
+       SCX_Tagalog = 133,
+       SCX_Tagbanwa = 134,
+       SCX_Tai_Le = 135,
+       SCX_Tai_Tham = 136,
+       SCX_Tai_Viet = 137,
+       SCX_Takri = 138,
+       SCX_Tamil = 139,
+       SCX_Tangut = 140,
+       SCX_Telugu = 141,
+       SCX_Thaana = 142,
+       SCX_Thai = 143,
+       SCX_Tibetan = 144,
+       SCX_Tifinagh = 145,
+       SCX_Tirhuta = 146,
+       SCX_Ugaritic = 147,
+       SCX_Vai = 148,
+       SCX_Warang_Citi = 149,
+       SCX_Yi = 150,
+       SCX_Zanabazar_Square = 151,
+       SCX_INVALID = 152,
        SCX_use_AUX_TABLE_1 = -1,
        SCX_use_AUX_TABLE_2 = -2,
        SCX_use_AUX_TABLE_3 = -3,
@@ -71061,7 +72466,11 @@ typedef enum {
        SCX_use_AUX_TABLE_42 = -42,
        SCX_use_AUX_TABLE_43 = -43,
        SCX_use_AUX_TABLE_44 = -44,
-       SCX_use_AUX_TABLE_45 = -45
+       SCX_use_AUX_TABLE_45 = -45,
+       SCX_use_AUX_TABLE_46 = -46,
+       SCX_use_AUX_TABLE_47 = -47,
+       SCX_use_AUX_TABLE_48 = -48,
+       SCX_use_AUX_TABLE_49 = -49
 } SCX_enum;
 
 #  endif       /* ASCII/Latin1 */
@@ -71099,30 +72508,44 @@ static const SCX_enum SCX_AUX_TABLE_5[] = {
 
 static const SCX_enum SCX_AUX_TABLE_6[] = {
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Syriac,
        SCX_Thaana
 };
 
 static const SCX_enum SCX_AUX_TABLE_7[] = {
+       SCX_Arabic,
+       SCX_Syriac,
+       SCX_Thaana
+};
+
+static const SCX_enum SCX_AUX_TABLE_8[] = {
        SCX_Adlam,
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Mandaic,
        SCX_Manichaean,
        SCX_Psalter_Pahlavi,
+       SCX_Sogdian,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_8[] = {
+static const SCX_enum SCX_AUX_TABLE_9[] = {
        SCX_Arabic,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_9[] = {
+static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Arabic,
        SCX_Thaana
 };
 
-static const SCX_enum SCX_AUX_TABLE_10[] = {
+static const SCX_enum SCX_AUX_TABLE_11[] = {
+       SCX_Arabic,
+       SCX_Hanifi_Rohingya
+};
+
+static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -71134,10 +72557,11 @@ static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Oriya,
        SCX_Sharada,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_11[] = {
+static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -71148,14 +72572,17 @@ static const SCX_enum SCX_AUX_TABLE_11[] = {
        SCX_Malayalam,
        SCX_Oriya,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_12[] = {
+static const SCX_enum SCX_AUX_TABLE_14[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -71170,11 +72597,13 @@ static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_13[] = {
+static const SCX_enum SCX_AUX_TABLE_15[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -71190,98 +72619,113 @@ static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_14[] = {
+static const SCX_enum SCX_AUX_TABLE_16[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Kaithi,
        SCX_Mahajani
 };
 
-static const SCX_enum SCX_AUX_TABLE_15[] = {
+static const SCX_enum SCX_AUX_TABLE_17[] = {
        SCX_Bengali,
        SCX_Chakma,
        SCX_Syloti_Nagri
 };
 
-static const SCX_enum SCX_AUX_TABLE_16[] = {
+static const SCX_enum SCX_AUX_TABLE_18[] = {
        SCX_Gurmukhi,
        SCX_Multani
 };
 
-static const SCX_enum SCX_AUX_TABLE_17[] = {
+static const SCX_enum SCX_AUX_TABLE_19[] = {
        SCX_Gujarati,
        SCX_Khojki
 };
 
-static const SCX_enum SCX_AUX_TABLE_18[] = {
+static const SCX_enum SCX_AUX_TABLE_20[] = {
        SCX_Grantha,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_19[] = {
+static const SCX_enum SCX_AUX_TABLE_21[] = {
        SCX_Chakma,
        SCX_Myanmar,
        SCX_Tai_Le
 };
 
-static const SCX_enum SCX_AUX_TABLE_20[] = {
+static const SCX_enum SCX_AUX_TABLE_22[] = {
        SCX_Georgian,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_21[] = {
+static const SCX_enum SCX_AUX_TABLE_23[] = {
        SCX_Hangul,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_22[] = {
+static const SCX_enum SCX_AUX_TABLE_24[] = {
        SCX_Buhid,
        SCX_Hanunoo,
        SCX_Tagalog,
        SCX_Tagbanwa
 };
 
-static const SCX_enum SCX_AUX_TABLE_23[] = {
+static const SCX_enum SCX_AUX_TABLE_25[] = {
        SCX_Mongolian,
        SCX_Phags_Pa
 };
 
-static const SCX_enum SCX_AUX_TABLE_24[] = {
+static const SCX_enum SCX_AUX_TABLE_26[] = {
+       SCX_Bengali,
+       SCX_Devanagari,
+       SCX_Grantha,
+       SCX_Kannada
+};
+
+static const SCX_enum SCX_AUX_TABLE_27[] = {
        SCX_Devanagari,
        SCX_Grantha
 };
 
-static const SCX_enum SCX_AUX_TABLE_25[] = {
+static const SCX_enum SCX_AUX_TABLE_28[] = {
+       SCX_Bengali,
+       SCX_Devanagari
+};
+
+static const SCX_enum SCX_AUX_TABLE_29[] = {
        SCX_Devanagari,
        SCX_Sharada
 };
 
-static const SCX_enum SCX_AUX_TABLE_26[] = {
+static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Devanagari,
        SCX_Kannada,
        SCX_Malayalam,
+       SCX_Oriya,
        SCX_Tamil,
        SCX_Telugu
 };
 
-static const SCX_enum SCX_AUX_TABLE_27[] = {
+static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Devanagari,
+       SCX_Grantha,
        SCX_Kannada
 };
 
-static const SCX_enum SCX_AUX_TABLE_28[] = {
+static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Devanagari,
        SCX_Grantha,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_29[] = {
+static const SCX_enum SCX_AUX_TABLE_33[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Jpan,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_30[] = {
+static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -71293,7 +72737,7 @@ static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Yi
 };
 
-static const SCX_enum SCX_AUX_TABLE_31[] = {
+static const SCX_enum SCX_AUX_TABLE_35[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -71304,7 +72748,7 @@ static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_32[] = {
+static const SCX_enum SCX_AUX_TABLE_36[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -71312,13 +72756,13 @@ static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_33[] = {
+static const SCX_enum SCX_AUX_TABLE_37[] = {
        SCX_Hiragana,
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_34[] = {
+static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Hiragana,
@@ -71327,34 +72771,40 @@ static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_35[] = {
+static const SCX_enum SCX_AUX_TABLE_39[] = {
        SCX_Hiragana,
        SCX_Jpan
 };
 
-static const SCX_enum SCX_AUX_TABLE_36[] = {
+static const SCX_enum SCX_AUX_TABLE_40[] = {
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_37[] = {
+static const SCX_enum SCX_AUX_TABLE_41[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
        SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
+       SCX_Malayalam,
        SCX_Modi,
        SCX_Takri,
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_38[] = {
+static const SCX_enum SCX_AUX_TABLE_42[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
+       SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
        SCX_Modi,
@@ -71362,39 +72812,48 @@ static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_39[] = {
-       SCX_Bengali,
-       SCX_Devanagari
+static const SCX_enum SCX_AUX_TABLE_43[] = {
+       SCX_Devanagari,
+       SCX_Dogra,
+       SCX_Gujarati,
+       SCX_Gurmukhi,
+       SCX_Kaithi,
+       SCX_Khojki,
+       SCX_Khudawadi,
+       SCX_Mahajani,
+       SCX_Modi,
+       SCX_Takri,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_40[] = {
+static const SCX_enum SCX_AUX_TABLE_44[] = {
        SCX_Devanagari,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_41[] = {
+static const SCX_enum SCX_AUX_TABLE_45[] = {
        SCX_Kayah_Li,
        SCX_Latin,
        SCX_Myanmar
 };
 
-static const SCX_enum SCX_AUX_TABLE_42[] = {
+static const SCX_enum SCX_AUX_TABLE_46[] = {
        SCX_Buginese,
        SCX_Javanese
 };
 
-static const SCX_enum SCX_AUX_TABLE_43[] = {
+static const SCX_enum SCX_AUX_TABLE_47[] = {
        SCX_Cypriot,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_44[] = {
+static const SCX_enum SCX_AUX_TABLE_48[] = {
        SCX_Cypriot,
        SCX_Linear_A,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_45[] = {
+static const SCX_enum SCX_AUX_TABLE_49[] = {
        SCX_Arabic,
        SCX_Coptic
 };
@@ -71445,11 +72904,16 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
        SCX_AUX_TABLE_42,
        SCX_AUX_TABLE_43,
        SCX_AUX_TABLE_44,
-       SCX_AUX_TABLE_45
+       SCX_AUX_TABLE_45,
+       SCX_AUX_TABLE_46,
+       SCX_AUX_TABLE_47,
+       SCX_AUX_TABLE_48,
+       SCX_AUX_TABLE_49
 };
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 SCX_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* SCX_AUX_TABLE_1 */,
@@ -71457,51 +72921,56 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
        2       /* SCX_AUX_TABLE_3 */,
        2       /* SCX_AUX_TABLE_4 */,
        2       /* SCX_AUX_TABLE_5 */,
-       3       /* SCX_AUX_TABLE_6 */,
-       6       /* SCX_AUX_TABLE_7 */,
-       2       /* SCX_AUX_TABLE_8 */,
+       4       /* SCX_AUX_TABLE_6 */,
+       3       /* SCX_AUX_TABLE_7 */,
+       8       /* SCX_AUX_TABLE_8 */,
        2       /* SCX_AUX_TABLE_9 */,
-       12      /* SCX_AUX_TABLE_10 */,
-       11      /* SCX_AUX_TABLE_11 */,
-       16      /* SCX_AUX_TABLE_12 */,
-       17      /* SCX_AUX_TABLE_13 */,
-       3       /* SCX_AUX_TABLE_14 */,
-       3       /* SCX_AUX_TABLE_15 */,
-       2       /* SCX_AUX_TABLE_16 */,
-       2       /* SCX_AUX_TABLE_17 */,
+       2       /* SCX_AUX_TABLE_10 */,
+       2       /* SCX_AUX_TABLE_11 */,
+       13      /* SCX_AUX_TABLE_12 */,
+       12      /* SCX_AUX_TABLE_13 */,
+       18      /* SCX_AUX_TABLE_14 */,
+       19      /* SCX_AUX_TABLE_15 */,
+       4       /* SCX_AUX_TABLE_16 */,
+       3       /* SCX_AUX_TABLE_17 */,
        2       /* SCX_AUX_TABLE_18 */,
-       3       /* SCX_AUX_TABLE_19 */,
+       2       /* SCX_AUX_TABLE_19 */,
        2       /* SCX_AUX_TABLE_20 */,
-       2       /* SCX_AUX_TABLE_21 */,
-       4       /* SCX_AUX_TABLE_22 */,
+       3       /* SCX_AUX_TABLE_21 */,
+       2       /* SCX_AUX_TABLE_22 */,
        2       /* SCX_AUX_TABLE_23 */,
-       2       /* SCX_AUX_TABLE_24 */,
+       4       /* SCX_AUX_TABLE_24 */,
        2       /* SCX_AUX_TABLE_25 */,
-       5       /* SCX_AUX_TABLE_26 */,
+       4       /* SCX_AUX_TABLE_26 */,
        2       /* SCX_AUX_TABLE_27 */,
-       3       /* SCX_AUX_TABLE_28 */,
-       4       /* SCX_AUX_TABLE_29 */,
-       9       /* SCX_AUX_TABLE_30 */,
-       8       /* SCX_AUX_TABLE_31 */,
-       5       /* SCX_AUX_TABLE_32 */,
-       3       /* SCX_AUX_TABLE_33 */,
-       6       /* SCX_AUX_TABLE_34 */,
-       2       /* SCX_AUX_TABLE_35 */,
-       2       /* SCX_AUX_TABLE_36 */,
-       10      /* SCX_AUX_TABLE_37 */,
-       9       /* SCX_AUX_TABLE_38 */,
+       2       /* SCX_AUX_TABLE_28 */,
+       2       /* SCX_AUX_TABLE_29 */,
+       6       /* SCX_AUX_TABLE_30 */,
+       3       /* SCX_AUX_TABLE_31 */,
+       3       /* SCX_AUX_TABLE_32 */,
+       4       /* SCX_AUX_TABLE_33 */,
+       9       /* SCX_AUX_TABLE_34 */,
+       8       /* SCX_AUX_TABLE_35 */,
+       5       /* SCX_AUX_TABLE_36 */,
+       3       /* SCX_AUX_TABLE_37 */,
+       6       /* SCX_AUX_TABLE_38 */,
        2       /* SCX_AUX_TABLE_39 */,
        2       /* SCX_AUX_TABLE_40 */,
-       3       /* SCX_AUX_TABLE_41 */,
-       2       /* SCX_AUX_TABLE_42 */,
-       2       /* SCX_AUX_TABLE_43 */,
-       3       /* SCX_AUX_TABLE_44 */,
-       2       /* SCX_AUX_TABLE_45 */
+       13      /* SCX_AUX_TABLE_41 */,
+       12      /* SCX_AUX_TABLE_42 */,
+       11      /* SCX_AUX_TABLE_43 */,
+       2       /* SCX_AUX_TABLE_44 */,
+       3       /* SCX_AUX_TABLE_45 */,
+       2       /* SCX_AUX_TABLE_46 */,
+       2       /* SCX_AUX_TABLE_47 */,
+       3       /* SCX_AUX_TABLE_48 */,
+       2       /* SCX_AUX_TABLE_49 */
 };
 
 /* This table, indexed by the script enum, gives the zero code point for that
  * script; 0 if the script has multiple digit sequences.  Scripts without a
  * digit sequence use ASCII [0-9], hence are marked '0' */
+
 static const UV script_zeros[] = {
        '0',    /* Unknown */
        0x1e950,        /* Adlam */
@@ -71534,6 +73003,7 @@ static const UV script_zeros[] = {
        '0',    /* Cyrillic */
        '0',    /* Deseret */
        0x966,  /* Devanagari */
+       0x966,  /* Dogra */
        '0',    /* Duployan */
        '0',    /* Egyptian_Hieroglyphs */
        '0',    /* Elbasan */
@@ -71544,10 +73014,12 @@ static const UV script_zeros[] = {
        0xbe6,  /* Grantha */
        '0',    /* Greek */
        0xae6,  /* Gujarati */
+       0x11da0,        /* Gunjala_Gondi */
        0xa66,  /* Gurmukhi */
        '0',    /* Han */
        '0',    /* Hanb */
        '0',    /* Hangul */
+       0x10d30,        /* Hanifi_Rohingya */
        '0',    /* Hanunoo */
        '0',    /* Hatran */
        '0',    /* Hebrew */
@@ -71577,11 +73049,13 @@ static const UV script_zeros[] = {
        '0',    /* Lycian */
        '0',    /* Lydian */
        0x966,  /* Mahajani */
+       '0',    /* Makasar */
        0xd66,  /* Malayalam */
        '0',    /* Mandaic */
        '0',    /* Manichaean */
        '0',    /* Marchen */
        0x11d50,        /* Masaram_Gondi */
+       '0',    /* Medefaidrin */
        0xabf0, /* Meetei_Mayek */
        '0',    /* Mende_Kikakui */
        '0',    /* Meroitic_Cursive */
@@ -71604,6 +73078,7 @@ static const UV script_zeros[] = {
        '0',    /* Old_North_Arabian */
        '0',    /* Old_Permic */
        '0',    /* Old_Persian */
+       '0',    /* Old_Sogdian */
        '0',    /* Old_South_Arabian */
        '0',    /* Old_Turkic */
        0xb66,  /* Oriya */
@@ -71624,6 +73099,7 @@ static const UV script_zeros[] = {
        '0',    /* Siddham */
        '0',    /* SignWriting */
        0xde6,  /* Sinhala */
+       '0',    /* Sogdian */
        0x110f0,        /* Sora_Sompeng */
        '0',    /* Soyombo */
        0x1bb0, /* Sundanese */
@@ -71648,7 +73124,7 @@ static const UV script_zeros[] = {
        0x118e0 /* Warang_Citi */
 };
 
-static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
+static const SCX_enum _Perl_SCX_invmap[] = {  /* for ASCII/Latin1 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
@@ -71705,9 +73181,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Armenian,
        SCX_Unknown,
        SCX_Armenian,
-       SCX_Unknown,
-       SCX_Armenian,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_5,
        SCX_Armenian,
        SCX_Unknown,
@@ -71725,17 +73198,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
+       SCX_use_AUX_TABLE_7,
        SCX_Unknown,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_7,
-       SCX_Arabic,
        SCX_use_AUX_TABLE_8,
        SCX_Arabic,
        SCX_use_AUX_TABLE_9,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_8,
+       SCX_use_AUX_TABLE_10,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_9,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_11,
        SCX_Arabic,
        SCX_Common,
        SCX_Arabic,
@@ -71749,6 +73225,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Nko,
        SCX_Unknown,
+       SCX_Nko,
        SCX_Samaritan,
        SCX_Unknown,
        SCX_Samaritan,
@@ -71767,12 +73244,12 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Common,
        SCX_Arabic,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_10,
-       SCX_use_AUX_TABLE_11,
-       SCX_Devanagari,
        SCX_use_AUX_TABLE_12,
        SCX_use_AUX_TABLE_13,
+       SCX_Devanagari,
        SCX_use_AUX_TABLE_14,
+       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_16,
        SCX_Devanagari,
        SCX_Bengali,
        SCX_Unknown,
@@ -71800,7 +73277,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Bengali,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_17,
        SCX_Bengali,
        SCX_Unknown,
        SCX_Gurmukhi,
@@ -71833,7 +73310,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Gurmukhi,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_16,
+       SCX_use_AUX_TABLE_18,
        SCX_Gurmukhi,
        SCX_Unknown,
        SCX_Gujarati,
@@ -71860,7 +73337,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Gujarati,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_17,
+       SCX_use_AUX_TABLE_19,
        SCX_Gujarati,
        SCX_Unknown,
        SCX_Gujarati,
@@ -71910,11 +73387,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
-       SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
@@ -71926,7 +73400,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Tamil,
        SCX_Unknown,
        SCX_Telugu,
@@ -71952,10 +73426,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Telugu,
        SCX_Unknown,
        SCX_Telugu,
-       SCX_Unknown,
-       SCX_Telugu,
-       SCX_Kannada,
-       SCX_Unknown,
        SCX_Kannada,
        SCX_Unknown,
        SCX_Kannada,
@@ -72078,7 +73548,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Tibetan,
        SCX_Unknown,
        SCX_Myanmar,
-       SCX_use_AUX_TABLE_19,
+       SCX_use_AUX_TABLE_21,
        SCX_Myanmar,
        SCX_Georgian,
        SCX_Unknown,
@@ -72087,9 +73557,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Georgian,
        SCX_Unknown,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_20,
+       SCX_use_AUX_TABLE_22,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Ethiopic,
        SCX_Unknown,
        SCX_Ethiopic,
@@ -72142,7 +73612,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Tagalog,
        SCX_Unknown,
        SCX_Hanunoo,
-       SCX_use_AUX_TABLE_22,
+       SCX_use_AUX_TABLE_24,
        SCX_Unknown,
        SCX_Buhid,
        SCX_Unknown,
@@ -72159,9 +73629,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Khmer,
        SCX_Unknown,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
        SCX_Unknown,
        SCX_Mongolian,
@@ -72224,26 +73694,36 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Ol_Chiki,
        SCX_Cyrillic,
        SCX_Unknown,
+       SCX_Georgian,
+       SCX_Unknown,
+       SCX_Georgian,
        SCX_Sundanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_27,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_30,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
-       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_29,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
-       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
+       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_28,
        SCX_Bengali,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_27,
        SCX_Unknown,
        SCX_Latin,
        SCX_Greek,
@@ -72308,7 +73788,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Common,
        SCX_Unknown,
        SCX_Inherited,
-       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_32,
        SCX_Unknown,
        SCX_Common,
        SCX_Greek,
@@ -72336,10 +73816,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
        SCX_Glagolitic,
        SCX_Unknown,
        SCX_Glagolitic,
@@ -72382,79 +73858,79 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_use_AUX_TABLE_3,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
-       SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_30,
-       SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_32,
-       SCX_use_AUX_TABLE_21,
-       SCX_use_AUX_TABLE_31,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_34,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_34,
-       SCX_use_AUX_TABLE_29,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_35,
-       SCX_Unknown,
+       SCX_Common,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_37,
+       SCX_Common,
        SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_30,
+       SCX_use_AUX_TABLE_38,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_39,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Yi,
        SCX_Unknown,
@@ -72474,12 +73950,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Latin,
        SCX_Unknown,
        SCX_Latin,
-       SCX_Unknown,
-       SCX_Latin,
        SCX_Syloti_Nagri,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_37,
-       SCX_use_AUX_TABLE_38,
+       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_43,
        SCX_Unknown,
        SCX_Phags_Pa,
        SCX_Unknown,
@@ -72488,22 +73963,21 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Saurashtra,
        SCX_Unknown,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_44,
        SCX_Devanagari,
-       SCX_Unknown,
        SCX_Kayah_Li,
-       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_45,
        SCX_Kayah_Li,
        SCX_Rejang,
        SCX_Unknown,
        SCX_Rejang,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Javanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_46,
        SCX_Javanese,
        SCX_Unknown,
        SCX_Javanese,
@@ -72542,15 +74016,15 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Meetei_Mayek,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Latin,
        SCX_Unknown,
@@ -72577,9 +74051,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Arabic,
        SCX_Unknown,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Unknown,
        SCX_Inherited,
        SCX_Common,
@@ -72587,7 +74061,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Inherited,
        SCX_Cyrillic,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
@@ -72605,20 +74079,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -72640,11 +74114,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Linear_B,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_44,
+       SCX_use_AUX_TABLE_48,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Greek,
        SCX_Unknown,
        SCX_Common,
@@ -72658,7 +74132,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Carian,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_45,
+       SCX_use_AUX_TABLE_49,
        SCX_Unknown,
        SCX_Old_Italic,
        SCX_Unknown,
@@ -72778,9 +74252,16 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Old_Hungarian,
        SCX_Unknown,
        SCX_Old_Hungarian,
+       SCX_Hanifi_Rohingya,
+       SCX_Unknown,
+       SCX_Hanifi_Rohingya,
        SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
+       SCX_Old_Sogdian,
+       SCX_Unknown,
+       SCX_Sogdian,
+       SCX_Unknown,
        SCX_Brahmi,
        SCX_Unknown,
        SCX_Brahmi,
@@ -72788,6 +74269,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Brahmi,
        SCX_Kaithi,
        SCX_Unknown,
+       SCX_Kaithi,
+       SCX_Unknown,
        SCX_Sora_Sompeng,
        SCX_Unknown,
        SCX_Sora_Sompeng,
@@ -72823,9 +74306,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Khudawadi,
        SCX_Unknown,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
@@ -72839,7 +74322,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
        SCX_Unknown,
        SCX_Grantha,
@@ -72886,6 +74369,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Ahom,
        SCX_Unknown,
+       SCX_Dogra,
+       SCX_Unknown,
        SCX_Warang_Citi,
        SCX_Unknown,
        SCX_Warang_Citi,
@@ -72896,8 +74381,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Soyombo,
        SCX_Unknown,
-       SCX_Soyombo,
-       SCX_Unknown,
        SCX_Pau_Cin_Hau,
        SCX_Unknown,
        SCX_Bhaiksuki,
@@ -72928,6 +74411,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Masaram_Gondi,
        SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Makasar,
+       SCX_Unknown,
        SCX_Cuneiform,
        SCX_Unknown,
        SCX_Cuneiform,
@@ -72962,6 +74459,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Pahawh_Hmong,
        SCX_Unknown,
+       SCX_Medefaidrin,
+       SCX_Unknown,
        SCX_Miao,
        SCX_Unknown,
        SCX_Miao,
@@ -72975,8 +74474,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Tangut,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_39,
        SCX_Unknown,
        SCX_Nushu,
        SCX_Unknown,
@@ -73008,7 +74507,10 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -73077,7 +74579,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Adlam,
        SCX_Unknown,
-       SCX_Arabic,
+       SCX_Common,
        SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
@@ -73145,7 +74647,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
-       SCX_Common,
+       SCX_Arabic,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -73166,14 +74668,14 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_39,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -73211,17 +74713,23 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -73235,15 +74743,15 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for ASCII/Latin1 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
-       1606,   /* Number of elements */
+static const UV _Perl_SCX_invlist[] = {  /* for EBCDIC 1047 */
+       1638,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -73329,9 +74837,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
        0x589,
        0x58A,
        0x58B,
@@ -73341,7 +74846,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x605,
@@ -73349,6 +74854,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x60C,
        0x60D,
        0x61B,
+       0x61C,
        0x61D,
        0x61E,
        0x61F,
@@ -73361,6 +74867,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x66A,
        0x670,
        0x671,
+       0x6D4,
+       0x6D5,
        0x6DD,
        0x6DE,
        0x700,
@@ -73373,6 +74881,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x7B2,
        0x7C0,
        0x7FB,
+       0x7FD,
        0x800,
        0x82E,
        0x830,
@@ -73387,7 +74896,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -73426,7 +74935,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x9E4,
        0x9E6,
        0x9F0,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -73459,7 +74968,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xA5F,
        0xA66,
        0xA70,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -73534,11 +75043,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xBA3,
        0xBA5,
        0xBA8,
-       0xBAA,
        0xBAB,
        0xBAE,
-       0xBB5,
-       0xBB6,
        0xBBA,
        0xBBE,
        0xBC3,
@@ -73551,11 +75057,9 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xBD7,
        0xBD8,
        0xBE6,
-       0xBF3,
+       0xBF4,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -73579,8 +75083,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xC70,
        0xC78,
        0xC80,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -73791,7 +75293,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -73848,12 +75350,17 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1C50,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC0,
        0x1CC8,
        0x1CD0,
        0x1CD1,
        0x1CD2,
+       0x1CD3,
        0x1CD4,
+       0x1CD5,
        0x1CD7,
        0x1CD8,
        0x1CD9,
@@ -73863,9 +75370,14 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1CDE,
        0x1CE0,
        0x1CE1,
+       0x1CE2,
+       0x1CEA,
+       0x1CEB,
+       0x1CED,
+       0x1CEE,
        0x1CF2,
+       0x1CF4,
        0x1CF5,
-       0x1CF6,
        0x1CF7,
        0x1CF8,
        0x1CFA,
@@ -73957,13 +75469,9 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -74005,7 +75513,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -74047,7 +75555,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x30FD,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -74079,7 +75587,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x4DB6,
        0x4DC0,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -74096,13 +75604,12 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA82C,
        0xA830,
+       0xA833,
        0xA836,
        0xA83A,
        0xA840,
@@ -74116,7 +75623,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0xA8F2,
        0xA8F3,
        0xA8F4,
-       0xA8FE,
        0xA900,
        0xA92E,
        0xA92F,
@@ -74366,11 +75872,11 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -74403,8 +75909,15 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x10CFA,
        0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -74412,6 +75925,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1107F,
        0x11080,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -74419,7 +75934,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -74463,7 +75978,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11345,
        0x11347,
@@ -74485,7 +76000,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -74505,11 +76020,13 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -74519,8 +76036,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -74552,6 +76067,20 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -74586,6 +76115,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -74596,7 +76127,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x16FE1,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -74630,10 +76161,13 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
        0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -74701,6 +76235,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -74784,8 +76320,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -74806,11 +76340,11 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -74826,15 +76360,21 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -74857,7 +76397,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */
 
 #  endif       /* EBCDIC 1047 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
@@ -74900,121 +76440,128 @@ typedef enum {
        SCX_Cyrillic = 28,
        SCX_Deseret = 29,
        SCX_Devanagari = 30,
-       SCX_Duployan = 31,
-       SCX_Egyptian_Hieroglyphs = 32,
-       SCX_Elbasan = 33,
-       SCX_Ethiopic = 34,
-       SCX_Georgian = 35,
-       SCX_Glagolitic = 36,
-       SCX_Gothic = 37,
-       SCX_Grantha = 38,
-       SCX_Greek = 39,
-       SCX_Gujarati = 40,
-       SCX_Gurmukhi = 41,
-       SCX_Han = 42,
-       SCX_Hanb = 43,
-       SCX_Hangul = 44,
-       SCX_Hanunoo = 45,
-       SCX_Hatran = 46,
-       SCX_Hebrew = 47,
-       SCX_Hiragana = 48,
-       SCX_Imperial_Aramaic = 49,
-       SCX_Inherited = 50,
-       SCX_Inscriptional_Pahlavi = 51,
-       SCX_Inscriptional_Parthian = 52,
-       SCX_Javanese = 53,
-       SCX_Jpan = 54,
-       SCX_Kaithi = 55,
-       SCX_Kannada = 56,
-       SCX_Katakana = 57,
-       SCX_Kayah_Li = 58,
-       SCX_Kharoshthi = 59,
-       SCX_Khmer = 60,
-       SCX_Khojki = 61,
-       SCX_Khudawadi = 62,
-       SCX_Kore = 63,
-       SCX_Lao = 64,
-       SCX_Latin = 65,
-       SCX_Lepcha = 66,
-       SCX_Limbu = 67,
-       SCX_Linear_A = 68,
-       SCX_Linear_B = 69,
-       SCX_Lisu = 70,
-       SCX_Lycian = 71,
-       SCX_Lydian = 72,
-       SCX_Mahajani = 73,
-       SCX_Malayalam = 74,
-       SCX_Mandaic = 75,
-       SCX_Manichaean = 76,
-       SCX_Marchen = 77,
-       SCX_Masaram_Gondi = 78,
-       SCX_Meetei_Mayek = 79,
-       SCX_Mende_Kikakui = 80,
-       SCX_Meroitic_Cursive = 81,
-       SCX_Meroitic_Hieroglyphs = 82,
-       SCX_Miao = 83,
-       SCX_Modi = 84,
-       SCX_Mongolian = 85,
-       SCX_Mro = 86,
-       SCX_Multani = 87,
-       SCX_Myanmar = 88,
-       SCX_Nabataean = 89,
-       SCX_New_Tai_Lue = 90,
-       SCX_Newa = 91,
-       SCX_Nko = 92,
-       SCX_Nushu = 93,
-       SCX_Ogham = 94,
-       SCX_Ol_Chiki = 95,
-       SCX_Old_Hungarian = 96,
-       SCX_Old_Italic = 97,
-       SCX_Old_North_Arabian = 98,
-       SCX_Old_Permic = 99,
-       SCX_Old_Persian = 100,
-       SCX_Old_South_Arabian = 101,
-       SCX_Old_Turkic = 102,
-       SCX_Oriya = 103,
-       SCX_Osage = 104,
-       SCX_Osmanya = 105,
-       SCX_Pahawh_Hmong = 106,
-       SCX_Palmyrene = 107,
-       SCX_Pau_Cin_Hau = 108,
-       SCX_Phags_Pa = 109,
-       SCX_Phoenician = 110,
-       SCX_Psalter_Pahlavi = 111,
-       SCX_Rejang = 112,
-       SCX_Runic = 113,
-       SCX_Samaritan = 114,
-       SCX_Saurashtra = 115,
-       SCX_Sharada = 116,
-       SCX_Shavian = 117,
-       SCX_Siddham = 118,
-       SCX_SignWriting = 119,
-       SCX_Sinhala = 120,
-       SCX_Sora_Sompeng = 121,
-       SCX_Soyombo = 122,
-       SCX_Sundanese = 123,
-       SCX_Syloti_Nagri = 124,
-       SCX_Syriac = 125,
-       SCX_Tagalog = 126,
-       SCX_Tagbanwa = 127,
-       SCX_Tai_Le = 128,
-       SCX_Tai_Tham = 129,
-       SCX_Tai_Viet = 130,
-       SCX_Takri = 131,
-       SCX_Tamil = 132,
-       SCX_Tangut = 133,
-       SCX_Telugu = 134,
-       SCX_Thaana = 135,
-       SCX_Thai = 136,
-       SCX_Tibetan = 137,
-       SCX_Tifinagh = 138,
-       SCX_Tirhuta = 139,
-       SCX_Ugaritic = 140,
-       SCX_Vai = 141,
-       SCX_Warang_Citi = 142,
-       SCX_Yi = 143,
-       SCX_Zanabazar_Square = 144,
-       SCX_INVALID = 145,
+       SCX_Dogra = 31,
+       SCX_Duployan = 32,
+       SCX_Egyptian_Hieroglyphs = 33,
+       SCX_Elbasan = 34,
+       SCX_Ethiopic = 35,
+       SCX_Georgian = 36,
+       SCX_Glagolitic = 37,
+       SCX_Gothic = 38,
+       SCX_Grantha = 39,
+       SCX_Greek = 40,
+       SCX_Gujarati = 41,
+       SCX_Gunjala_Gondi = 42,
+       SCX_Gurmukhi = 43,
+       SCX_Han = 44,
+       SCX_Hanb = 45,
+       SCX_Hangul = 46,
+       SCX_Hanifi_Rohingya = 47,
+       SCX_Hanunoo = 48,
+       SCX_Hatran = 49,
+       SCX_Hebrew = 50,
+       SCX_Hiragana = 51,
+       SCX_Imperial_Aramaic = 52,
+       SCX_Inherited = 53,
+       SCX_Inscriptional_Pahlavi = 54,
+       SCX_Inscriptional_Parthian = 55,
+       SCX_Javanese = 56,
+       SCX_Jpan = 57,
+       SCX_Kaithi = 58,
+       SCX_Kannada = 59,
+       SCX_Katakana = 60,
+       SCX_Kayah_Li = 61,
+       SCX_Kharoshthi = 62,
+       SCX_Khmer = 63,
+       SCX_Khojki = 64,
+       SCX_Khudawadi = 65,
+       SCX_Kore = 66,
+       SCX_Lao = 67,
+       SCX_Latin = 68,
+       SCX_Lepcha = 69,
+       SCX_Limbu = 70,
+       SCX_Linear_A = 71,
+       SCX_Linear_B = 72,
+       SCX_Lisu = 73,
+       SCX_Lycian = 74,
+       SCX_Lydian = 75,
+       SCX_Mahajani = 76,
+       SCX_Makasar = 77,
+       SCX_Malayalam = 78,
+       SCX_Mandaic = 79,
+       SCX_Manichaean = 80,
+       SCX_Marchen = 81,
+       SCX_Masaram_Gondi = 82,
+       SCX_Medefaidrin = 83,
+       SCX_Meetei_Mayek = 84,
+       SCX_Mende_Kikakui = 85,
+       SCX_Meroitic_Cursive = 86,
+       SCX_Meroitic_Hieroglyphs = 87,
+       SCX_Miao = 88,
+       SCX_Modi = 89,
+       SCX_Mongolian = 90,
+       SCX_Mro = 91,
+       SCX_Multani = 92,
+       SCX_Myanmar = 93,
+       SCX_Nabataean = 94,
+       SCX_New_Tai_Lue = 95,
+       SCX_Newa = 96,
+       SCX_Nko = 97,
+       SCX_Nushu = 98,
+       SCX_Ogham = 99,
+       SCX_Ol_Chiki = 100,
+       SCX_Old_Hungarian = 101,
+       SCX_Old_Italic = 102,
+       SCX_Old_North_Arabian = 103,
+       SCX_Old_Permic = 104,
+       SCX_Old_Persian = 105,
+       SCX_Old_Sogdian = 106,
+       SCX_Old_South_Arabian = 107,
+       SCX_Old_Turkic = 108,
+       SCX_Oriya = 109,
+       SCX_Osage = 110,
+       SCX_Osmanya = 111,
+       SCX_Pahawh_Hmong = 112,
+       SCX_Palmyrene = 113,
+       SCX_Pau_Cin_Hau = 114,
+       SCX_Phags_Pa = 115,
+       SCX_Phoenician = 116,
+       SCX_Psalter_Pahlavi = 117,
+       SCX_Rejang = 118,
+       SCX_Runic = 119,
+       SCX_Samaritan = 120,
+       SCX_Saurashtra = 121,
+       SCX_Sharada = 122,
+       SCX_Shavian = 123,
+       SCX_Siddham = 124,
+       SCX_SignWriting = 125,
+       SCX_Sinhala = 126,
+       SCX_Sogdian = 127,
+       SCX_Sora_Sompeng = 128,
+       SCX_Soyombo = 129,
+       SCX_Sundanese = 130,
+       SCX_Syloti_Nagri = 131,
+       SCX_Syriac = 132,
+       SCX_Tagalog = 133,
+       SCX_Tagbanwa = 134,
+       SCX_Tai_Le = 135,
+       SCX_Tai_Tham = 136,
+       SCX_Tai_Viet = 137,
+       SCX_Takri = 138,
+       SCX_Tamil = 139,
+       SCX_Tangut = 140,
+       SCX_Telugu = 141,
+       SCX_Thaana = 142,
+       SCX_Thai = 143,
+       SCX_Tibetan = 144,
+       SCX_Tifinagh = 145,
+       SCX_Tirhuta = 146,
+       SCX_Ugaritic = 147,
+       SCX_Vai = 148,
+       SCX_Warang_Citi = 149,
+       SCX_Yi = 150,
+       SCX_Zanabazar_Square = 151,
+       SCX_INVALID = 152,
        SCX_use_AUX_TABLE_1 = -1,
        SCX_use_AUX_TABLE_2 = -2,
        SCX_use_AUX_TABLE_3 = -3,
@@ -75059,7 +76606,11 @@ typedef enum {
        SCX_use_AUX_TABLE_42 = -42,
        SCX_use_AUX_TABLE_43 = -43,
        SCX_use_AUX_TABLE_44 = -44,
-       SCX_use_AUX_TABLE_45 = -45
+       SCX_use_AUX_TABLE_45 = -45,
+       SCX_use_AUX_TABLE_46 = -46,
+       SCX_use_AUX_TABLE_47 = -47,
+       SCX_use_AUX_TABLE_48 = -48,
+       SCX_use_AUX_TABLE_49 = -49
 } SCX_enum;
 
 #  endif       /* EBCDIC 1047 */
@@ -75100,30 +76651,44 @@ static const SCX_enum SCX_AUX_TABLE_5[] = {
 
 static const SCX_enum SCX_AUX_TABLE_6[] = {
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Syriac,
        SCX_Thaana
 };
 
 static const SCX_enum SCX_AUX_TABLE_7[] = {
+       SCX_Arabic,
+       SCX_Syriac,
+       SCX_Thaana
+};
+
+static const SCX_enum SCX_AUX_TABLE_8[] = {
        SCX_Adlam,
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Mandaic,
        SCX_Manichaean,
        SCX_Psalter_Pahlavi,
+       SCX_Sogdian,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_8[] = {
+static const SCX_enum SCX_AUX_TABLE_9[] = {
        SCX_Arabic,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_9[] = {
+static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Arabic,
        SCX_Thaana
 };
 
-static const SCX_enum SCX_AUX_TABLE_10[] = {
+static const SCX_enum SCX_AUX_TABLE_11[] = {
+       SCX_Arabic,
+       SCX_Hanifi_Rohingya
+};
+
+static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -75135,10 +76700,11 @@ static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Oriya,
        SCX_Sharada,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_11[] = {
+static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -75149,14 +76715,17 @@ static const SCX_enum SCX_AUX_TABLE_11[] = {
        SCX_Malayalam,
        SCX_Oriya,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_12[] = {
+static const SCX_enum SCX_AUX_TABLE_14[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -75171,11 +76740,13 @@ static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_13[] = {
+static const SCX_enum SCX_AUX_TABLE_15[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -75191,98 +76762,113 @@ static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_14[] = {
+static const SCX_enum SCX_AUX_TABLE_16[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Kaithi,
        SCX_Mahajani
 };
 
-static const SCX_enum SCX_AUX_TABLE_15[] = {
+static const SCX_enum SCX_AUX_TABLE_17[] = {
        SCX_Bengali,
        SCX_Chakma,
        SCX_Syloti_Nagri
 };
 
-static const SCX_enum SCX_AUX_TABLE_16[] = {
+static const SCX_enum SCX_AUX_TABLE_18[] = {
        SCX_Gurmukhi,
        SCX_Multani
 };
 
-static const SCX_enum SCX_AUX_TABLE_17[] = {
+static const SCX_enum SCX_AUX_TABLE_19[] = {
        SCX_Gujarati,
        SCX_Khojki
 };
 
-static const SCX_enum SCX_AUX_TABLE_18[] = {
+static const SCX_enum SCX_AUX_TABLE_20[] = {
        SCX_Grantha,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_19[] = {
+static const SCX_enum SCX_AUX_TABLE_21[] = {
        SCX_Chakma,
        SCX_Myanmar,
        SCX_Tai_Le
 };
 
-static const SCX_enum SCX_AUX_TABLE_20[] = {
+static const SCX_enum SCX_AUX_TABLE_22[] = {
        SCX_Georgian,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_21[] = {
+static const SCX_enum SCX_AUX_TABLE_23[] = {
        SCX_Hangul,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_22[] = {
+static const SCX_enum SCX_AUX_TABLE_24[] = {
        SCX_Buhid,
        SCX_Hanunoo,
        SCX_Tagalog,
        SCX_Tagbanwa
 };
 
-static const SCX_enum SCX_AUX_TABLE_23[] = {
+static const SCX_enum SCX_AUX_TABLE_25[] = {
        SCX_Mongolian,
        SCX_Phags_Pa
 };
 
-static const SCX_enum SCX_AUX_TABLE_24[] = {
+static const SCX_enum SCX_AUX_TABLE_26[] = {
+       SCX_Bengali,
+       SCX_Devanagari,
+       SCX_Grantha,
+       SCX_Kannada
+};
+
+static const SCX_enum SCX_AUX_TABLE_27[] = {
        SCX_Devanagari,
        SCX_Grantha
 };
 
-static const SCX_enum SCX_AUX_TABLE_25[] = {
+static const SCX_enum SCX_AUX_TABLE_28[] = {
+       SCX_Bengali,
+       SCX_Devanagari
+};
+
+static const SCX_enum SCX_AUX_TABLE_29[] = {
        SCX_Devanagari,
        SCX_Sharada
 };
 
-static const SCX_enum SCX_AUX_TABLE_26[] = {
+static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Devanagari,
        SCX_Kannada,
        SCX_Malayalam,
+       SCX_Oriya,
        SCX_Tamil,
        SCX_Telugu
 };
 
-static const SCX_enum SCX_AUX_TABLE_27[] = {
+static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Devanagari,
+       SCX_Grantha,
        SCX_Kannada
 };
 
-static const SCX_enum SCX_AUX_TABLE_28[] = {
+static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Devanagari,
        SCX_Grantha,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_29[] = {
+static const SCX_enum SCX_AUX_TABLE_33[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Jpan,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_30[] = {
+static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -75294,7 +76880,7 @@ static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Yi
 };
 
-static const SCX_enum SCX_AUX_TABLE_31[] = {
+static const SCX_enum SCX_AUX_TABLE_35[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -75305,7 +76891,7 @@ static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_32[] = {
+static const SCX_enum SCX_AUX_TABLE_36[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -75313,13 +76899,13 @@ static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_33[] = {
+static const SCX_enum SCX_AUX_TABLE_37[] = {
        SCX_Hiragana,
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_34[] = {
+static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Hiragana,
@@ -75328,34 +76914,40 @@ static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_35[] = {
+static const SCX_enum SCX_AUX_TABLE_39[] = {
        SCX_Hiragana,
        SCX_Jpan
 };
 
-static const SCX_enum SCX_AUX_TABLE_36[] = {
+static const SCX_enum SCX_AUX_TABLE_40[] = {
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_37[] = {
+static const SCX_enum SCX_AUX_TABLE_41[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
        SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
+       SCX_Malayalam,
        SCX_Modi,
        SCX_Takri,
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_38[] = {
+static const SCX_enum SCX_AUX_TABLE_42[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
+       SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
        SCX_Modi,
@@ -75363,39 +76955,48 @@ static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_39[] = {
-       SCX_Bengali,
-       SCX_Devanagari
+static const SCX_enum SCX_AUX_TABLE_43[] = {
+       SCX_Devanagari,
+       SCX_Dogra,
+       SCX_Gujarati,
+       SCX_Gurmukhi,
+       SCX_Kaithi,
+       SCX_Khojki,
+       SCX_Khudawadi,
+       SCX_Mahajani,
+       SCX_Modi,
+       SCX_Takri,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_40[] = {
+static const SCX_enum SCX_AUX_TABLE_44[] = {
        SCX_Devanagari,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_41[] = {
+static const SCX_enum SCX_AUX_TABLE_45[] = {
        SCX_Kayah_Li,
        SCX_Latin,
        SCX_Myanmar
 };
 
-static const SCX_enum SCX_AUX_TABLE_42[] = {
+static const SCX_enum SCX_AUX_TABLE_46[] = {
        SCX_Buginese,
        SCX_Javanese
 };
 
-static const SCX_enum SCX_AUX_TABLE_43[] = {
+static const SCX_enum SCX_AUX_TABLE_47[] = {
        SCX_Cypriot,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_44[] = {
+static const SCX_enum SCX_AUX_TABLE_48[] = {
        SCX_Cypriot,
        SCX_Linear_A,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_45[] = {
+static const SCX_enum SCX_AUX_TABLE_49[] = {
        SCX_Arabic,
        SCX_Coptic
 };
@@ -75446,11 +77047,16 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
        SCX_AUX_TABLE_42,
        SCX_AUX_TABLE_43,
        SCX_AUX_TABLE_44,
-       SCX_AUX_TABLE_45
+       SCX_AUX_TABLE_45,
+       SCX_AUX_TABLE_46,
+       SCX_AUX_TABLE_47,
+       SCX_AUX_TABLE_48,
+       SCX_AUX_TABLE_49
 };
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 SCX_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* SCX_AUX_TABLE_1 */,
@@ -75458,51 +77064,56 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
        2       /* SCX_AUX_TABLE_3 */,
        2       /* SCX_AUX_TABLE_4 */,
        2       /* SCX_AUX_TABLE_5 */,
-       3       /* SCX_AUX_TABLE_6 */,
-       6       /* SCX_AUX_TABLE_7 */,
-       2       /* SCX_AUX_TABLE_8 */,
+       4       /* SCX_AUX_TABLE_6 */,
+       3       /* SCX_AUX_TABLE_7 */,
+       8       /* SCX_AUX_TABLE_8 */,
        2       /* SCX_AUX_TABLE_9 */,
-       12      /* SCX_AUX_TABLE_10 */,
-       11      /* SCX_AUX_TABLE_11 */,
-       16      /* SCX_AUX_TABLE_12 */,
-       17      /* SCX_AUX_TABLE_13 */,
-       3       /* SCX_AUX_TABLE_14 */,
-       3       /* SCX_AUX_TABLE_15 */,
-       2       /* SCX_AUX_TABLE_16 */,
-       2       /* SCX_AUX_TABLE_17 */,
+       2       /* SCX_AUX_TABLE_10 */,
+       2       /* SCX_AUX_TABLE_11 */,
+       13      /* SCX_AUX_TABLE_12 */,
+       12      /* SCX_AUX_TABLE_13 */,
+       18      /* SCX_AUX_TABLE_14 */,
+       19      /* SCX_AUX_TABLE_15 */,
+       4       /* SCX_AUX_TABLE_16 */,
+       3       /* SCX_AUX_TABLE_17 */,
        2       /* SCX_AUX_TABLE_18 */,
-       3       /* SCX_AUX_TABLE_19 */,
+       2       /* SCX_AUX_TABLE_19 */,
        2       /* SCX_AUX_TABLE_20 */,
-       2       /* SCX_AUX_TABLE_21 */,
-       4       /* SCX_AUX_TABLE_22 */,
+       3       /* SCX_AUX_TABLE_21 */,
+       2       /* SCX_AUX_TABLE_22 */,
        2       /* SCX_AUX_TABLE_23 */,
-       2       /* SCX_AUX_TABLE_24 */,
+       4       /* SCX_AUX_TABLE_24 */,
        2       /* SCX_AUX_TABLE_25 */,
-       5       /* SCX_AUX_TABLE_26 */,
+       4       /* SCX_AUX_TABLE_26 */,
        2       /* SCX_AUX_TABLE_27 */,
-       3       /* SCX_AUX_TABLE_28 */,
-       4       /* SCX_AUX_TABLE_29 */,
-       9       /* SCX_AUX_TABLE_30 */,
-       8       /* SCX_AUX_TABLE_31 */,
-       5       /* SCX_AUX_TABLE_32 */,
-       3       /* SCX_AUX_TABLE_33 */,
-       6       /* SCX_AUX_TABLE_34 */,
-       2       /* SCX_AUX_TABLE_35 */,
-       2       /* SCX_AUX_TABLE_36 */,
-       10      /* SCX_AUX_TABLE_37 */,
-       9       /* SCX_AUX_TABLE_38 */,
+       2       /* SCX_AUX_TABLE_28 */,
+       2       /* SCX_AUX_TABLE_29 */,
+       6       /* SCX_AUX_TABLE_30 */,
+       3       /* SCX_AUX_TABLE_31 */,
+       3       /* SCX_AUX_TABLE_32 */,
+       4       /* SCX_AUX_TABLE_33 */,
+       9       /* SCX_AUX_TABLE_34 */,
+       8       /* SCX_AUX_TABLE_35 */,
+       5       /* SCX_AUX_TABLE_36 */,
+       3       /* SCX_AUX_TABLE_37 */,
+       6       /* SCX_AUX_TABLE_38 */,
        2       /* SCX_AUX_TABLE_39 */,
        2       /* SCX_AUX_TABLE_40 */,
-       3       /* SCX_AUX_TABLE_41 */,
-       2       /* SCX_AUX_TABLE_42 */,
-       2       /* SCX_AUX_TABLE_43 */,
-       3       /* SCX_AUX_TABLE_44 */,
-       2       /* SCX_AUX_TABLE_45 */
+       13      /* SCX_AUX_TABLE_41 */,
+       12      /* SCX_AUX_TABLE_42 */,
+       11      /* SCX_AUX_TABLE_43 */,
+       2       /* SCX_AUX_TABLE_44 */,
+       3       /* SCX_AUX_TABLE_45 */,
+       2       /* SCX_AUX_TABLE_46 */,
+       2       /* SCX_AUX_TABLE_47 */,
+       3       /* SCX_AUX_TABLE_48 */,
+       2       /* SCX_AUX_TABLE_49 */
 };
 
 /* This table, indexed by the script enum, gives the zero code point for that
  * script; 0 if the script has multiple digit sequences.  Scripts without a
  * digit sequence use ASCII [0-9], hence are marked '0' */
+
 static const UV script_zeros[] = {
        '0',    /* Unknown */
        0x1e950,        /* Adlam */
@@ -75535,6 +77146,7 @@ static const UV script_zeros[] = {
        '0',    /* Cyrillic */
        '0',    /* Deseret */
        0x966,  /* Devanagari */
+       0x966,  /* Dogra */
        '0',    /* Duployan */
        '0',    /* Egyptian_Hieroglyphs */
        '0',    /* Elbasan */
@@ -75545,10 +77157,12 @@ static const UV script_zeros[] = {
        0xbe6,  /* Grantha */
        '0',    /* Greek */
        0xae6,  /* Gujarati */
+       0x11da0,        /* Gunjala_Gondi */
        0xa66,  /* Gurmukhi */
        '0',    /* Han */
        '0',    /* Hanb */
        '0',    /* Hangul */
+       0x10d30,        /* Hanifi_Rohingya */
        '0',    /* Hanunoo */
        '0',    /* Hatran */
        '0',    /* Hebrew */
@@ -75578,11 +77192,13 @@ static const UV script_zeros[] = {
        '0',    /* Lycian */
        '0',    /* Lydian */
        0x966,  /* Mahajani */
+       '0',    /* Makasar */
        0xd66,  /* Malayalam */
        '0',    /* Mandaic */
        '0',    /* Manichaean */
        '0',    /* Marchen */
        0x11d50,        /* Masaram_Gondi */
+       '0',    /* Medefaidrin */
        0xabf0, /* Meetei_Mayek */
        '0',    /* Mende_Kikakui */
        '0',    /* Meroitic_Cursive */
@@ -75605,6 +77221,7 @@ static const UV script_zeros[] = {
        '0',    /* Old_North_Arabian */
        '0',    /* Old_Permic */
        '0',    /* Old_Persian */
+       '0',    /* Old_Sogdian */
        '0',    /* Old_South_Arabian */
        '0',    /* Old_Turkic */
        0xb66,  /* Oriya */
@@ -75625,6 +77242,7 @@ static const UV script_zeros[] = {
        '0',    /* Siddham */
        '0',    /* SignWriting */
        0xde6,  /* Sinhala */
+       '0',    /* Sogdian */
        0x110f0,        /* Sora_Sompeng */
        '0',    /* Soyombo */
        0x1bb0, /* Sundanese */
@@ -75649,7 +77267,7 @@ static const UV script_zeros[] = {
        0x118e0 /* Warang_Citi */
 };
 
-static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
+static const SCX_enum _Perl_SCX_invmap[] = {  /* for EBCDIC 1047 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
@@ -75732,9 +77350,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Armenian,
        SCX_Unknown,
        SCX_Armenian,
-       SCX_Unknown,
-       SCX_Armenian,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_5,
        SCX_Armenian,
        SCX_Unknown,
@@ -75752,17 +77367,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
+       SCX_use_AUX_TABLE_7,
        SCX_Unknown,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_7,
-       SCX_Arabic,
        SCX_use_AUX_TABLE_8,
        SCX_Arabic,
        SCX_use_AUX_TABLE_9,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_8,
+       SCX_use_AUX_TABLE_10,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_9,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_11,
        SCX_Arabic,
        SCX_Common,
        SCX_Arabic,
@@ -75776,6 +77394,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Nko,
        SCX_Unknown,
+       SCX_Nko,
        SCX_Samaritan,
        SCX_Unknown,
        SCX_Samaritan,
@@ -75794,12 +77413,12 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Common,
        SCX_Arabic,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_10,
-       SCX_use_AUX_TABLE_11,
-       SCX_Devanagari,
        SCX_use_AUX_TABLE_12,
        SCX_use_AUX_TABLE_13,
+       SCX_Devanagari,
        SCX_use_AUX_TABLE_14,
+       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_16,
        SCX_Devanagari,
        SCX_Bengali,
        SCX_Unknown,
@@ -75827,7 +77446,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Bengali,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_17,
        SCX_Bengali,
        SCX_Unknown,
        SCX_Gurmukhi,
@@ -75860,7 +77479,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Gurmukhi,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_16,
+       SCX_use_AUX_TABLE_18,
        SCX_Gurmukhi,
        SCX_Unknown,
        SCX_Gujarati,
@@ -75887,7 +77506,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Gujarati,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_17,
+       SCX_use_AUX_TABLE_19,
        SCX_Gujarati,
        SCX_Unknown,
        SCX_Gujarati,
@@ -75937,11 +77556,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
-       SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
@@ -75953,7 +77569,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Tamil,
        SCX_Unknown,
        SCX_Telugu,
@@ -75979,10 +77595,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Telugu,
        SCX_Unknown,
        SCX_Telugu,
-       SCX_Unknown,
-       SCX_Telugu,
-       SCX_Kannada,
-       SCX_Unknown,
        SCX_Kannada,
        SCX_Unknown,
        SCX_Kannada,
@@ -76105,7 +77717,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Tibetan,
        SCX_Unknown,
        SCX_Myanmar,
-       SCX_use_AUX_TABLE_19,
+       SCX_use_AUX_TABLE_21,
        SCX_Myanmar,
        SCX_Georgian,
        SCX_Unknown,
@@ -76114,9 +77726,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Georgian,
        SCX_Unknown,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_20,
+       SCX_use_AUX_TABLE_22,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Ethiopic,
        SCX_Unknown,
        SCX_Ethiopic,
@@ -76169,7 +77781,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Tagalog,
        SCX_Unknown,
        SCX_Hanunoo,
-       SCX_use_AUX_TABLE_22,
+       SCX_use_AUX_TABLE_24,
        SCX_Unknown,
        SCX_Buhid,
        SCX_Unknown,
@@ -76186,9 +77798,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Khmer,
        SCX_Unknown,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
        SCX_Unknown,
        SCX_Mongolian,
@@ -76251,26 +77863,36 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Ol_Chiki,
        SCX_Cyrillic,
        SCX_Unknown,
+       SCX_Georgian,
+       SCX_Unknown,
+       SCX_Georgian,
        SCX_Sundanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_27,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_30,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
-       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_29,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
-       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
+       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_28,
        SCX_Bengali,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_27,
        SCX_Unknown,
        SCX_Latin,
        SCX_Greek,
@@ -76335,7 +77957,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Common,
        SCX_Unknown,
        SCX_Inherited,
-       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_32,
        SCX_Unknown,
        SCX_Common,
        SCX_Greek,
@@ -76363,10 +77985,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
        SCX_Glagolitic,
        SCX_Unknown,
        SCX_Glagolitic,
@@ -76409,79 +78027,79 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_use_AUX_TABLE_3,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
-       SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_30,
-       SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_32,
-       SCX_use_AUX_TABLE_21,
-       SCX_use_AUX_TABLE_31,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_34,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_34,
-       SCX_use_AUX_TABLE_29,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_35,
-       SCX_Unknown,
+       SCX_Common,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_37,
+       SCX_Common,
        SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_30,
+       SCX_use_AUX_TABLE_38,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_39,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Yi,
        SCX_Unknown,
@@ -76501,12 +78119,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Latin,
        SCX_Unknown,
        SCX_Latin,
-       SCX_Unknown,
-       SCX_Latin,
        SCX_Syloti_Nagri,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_37,
-       SCX_use_AUX_TABLE_38,
+       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_43,
        SCX_Unknown,
        SCX_Phags_Pa,
        SCX_Unknown,
@@ -76515,22 +78132,21 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Saurashtra,
        SCX_Unknown,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_44,
        SCX_Devanagari,
-       SCX_Unknown,
        SCX_Kayah_Li,
-       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_45,
        SCX_Kayah_Li,
        SCX_Rejang,
        SCX_Unknown,
        SCX_Rejang,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Javanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_46,
        SCX_Javanese,
        SCX_Unknown,
        SCX_Javanese,
@@ -76569,15 +78185,15 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Meetei_Mayek,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Latin,
        SCX_Unknown,
@@ -76604,9 +78220,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Arabic,
        SCX_Unknown,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Unknown,
        SCX_Inherited,
        SCX_Common,
@@ -76614,7 +78230,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Inherited,
        SCX_Cyrillic,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
@@ -76632,20 +78248,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -76667,11 +78283,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Linear_B,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_44,
+       SCX_use_AUX_TABLE_48,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Greek,
        SCX_Unknown,
        SCX_Common,
@@ -76685,7 +78301,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Carian,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_45,
+       SCX_use_AUX_TABLE_49,
        SCX_Unknown,
        SCX_Old_Italic,
        SCX_Unknown,
@@ -76805,9 +78421,16 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Old_Hungarian,
        SCX_Unknown,
        SCX_Old_Hungarian,
+       SCX_Hanifi_Rohingya,
+       SCX_Unknown,
+       SCX_Hanifi_Rohingya,
        SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
+       SCX_Old_Sogdian,
+       SCX_Unknown,
+       SCX_Sogdian,
+       SCX_Unknown,
        SCX_Brahmi,
        SCX_Unknown,
        SCX_Brahmi,
@@ -76815,6 +78438,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Brahmi,
        SCX_Kaithi,
        SCX_Unknown,
+       SCX_Kaithi,
+       SCX_Unknown,
        SCX_Sora_Sompeng,
        SCX_Unknown,
        SCX_Sora_Sompeng,
@@ -76850,9 +78475,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Khudawadi,
        SCX_Unknown,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
@@ -76866,7 +78491,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
        SCX_Unknown,
        SCX_Grantha,
@@ -76913,6 +78538,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Ahom,
        SCX_Unknown,
+       SCX_Dogra,
+       SCX_Unknown,
        SCX_Warang_Citi,
        SCX_Unknown,
        SCX_Warang_Citi,
@@ -76923,8 +78550,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Soyombo,
        SCX_Unknown,
-       SCX_Soyombo,
-       SCX_Unknown,
        SCX_Pau_Cin_Hau,
        SCX_Unknown,
        SCX_Bhaiksuki,
@@ -76955,6 +78580,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Masaram_Gondi,
        SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Makasar,
+       SCX_Unknown,
        SCX_Cuneiform,
        SCX_Unknown,
        SCX_Cuneiform,
@@ -76989,6 +78628,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Pahawh_Hmong,
        SCX_Unknown,
+       SCX_Medefaidrin,
+       SCX_Unknown,
        SCX_Miao,
        SCX_Unknown,
        SCX_Miao,
@@ -77002,8 +78643,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Tangut,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_39,
        SCX_Unknown,
        SCX_Nushu,
        SCX_Unknown,
@@ -77035,7 +78676,10 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -77104,6 +78748,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Adlam,
        SCX_Unknown,
+       SCX_Common,
+       SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
        SCX_Arabic,
@@ -77191,16 +78837,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
+       SCX_use_AUX_TABLE_39,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_35,
+       SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -77238,17 +78888,17 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -77262,15 +78912,15 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 1047 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
-       1602,   /* Number of elements */
+static const UV _Perl_SCX_invlist[] = {  /* for EBCDIC 037 */
+       1634,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -77352,9 +79002,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
        0x589,
        0x58A,
        0x58B,
@@ -77364,7 +79011,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x605,
@@ -77372,6 +79019,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x60C,
        0x60D,
        0x61B,
+       0x61C,
        0x61D,
        0x61E,
        0x61F,
@@ -77384,6 +79032,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x66A,
        0x670,
        0x671,
+       0x6D4,
+       0x6D5,
        0x6DD,
        0x6DE,
        0x700,
@@ -77396,6 +79046,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x7B2,
        0x7C0,
        0x7FB,
+       0x7FD,
        0x800,
        0x82E,
        0x830,
@@ -77410,7 +79061,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -77449,7 +79100,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x9E4,
        0x9E6,
        0x9F0,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -77482,7 +79133,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xA5F,
        0xA66,
        0xA70,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -77557,11 +79208,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xBA3,
        0xBA5,
        0xBA8,
-       0xBAA,
        0xBAB,
        0xBAE,
-       0xBB5,
-       0xBB6,
        0xBBA,
        0xBBE,
        0xBC3,
@@ -77574,11 +79222,9 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xBD7,
        0xBD8,
        0xBE6,
-       0xBF3,
+       0xBF4,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -77602,8 +79248,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xC70,
        0xC78,
        0xC80,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -77814,7 +79458,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -77871,12 +79515,17 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1C50,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC0,
        0x1CC8,
        0x1CD0,
        0x1CD1,
        0x1CD2,
+       0x1CD3,
        0x1CD4,
+       0x1CD5,
        0x1CD7,
        0x1CD8,
        0x1CD9,
@@ -77886,9 +79535,14 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1CDE,
        0x1CE0,
        0x1CE1,
+       0x1CE2,
+       0x1CEA,
+       0x1CEB,
+       0x1CED,
+       0x1CEE,
        0x1CF2,
+       0x1CF4,
        0x1CF5,
-       0x1CF6,
        0x1CF7,
        0x1CF8,
        0x1CFA,
@@ -77980,13 +79634,9 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -78028,7 +79678,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -78070,7 +79720,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x30FD,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -78102,7 +79752,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x4DB6,
        0x4DC0,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -78119,13 +79769,12 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA82C,
        0xA830,
+       0xA833,
        0xA836,
        0xA83A,
        0xA840,
@@ -78139,7 +79788,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0xA8F2,
        0xA8F3,
        0xA8F4,
-       0xA8FE,
        0xA900,
        0xA92E,
        0xA92F,
@@ -78389,11 +80037,11 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -78426,8 +80074,15 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x10CFA,
        0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -78435,6 +80090,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1107F,
        0x11080,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -78442,7 +80099,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -78486,7 +80143,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11345,
        0x11347,
@@ -78508,7 +80165,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -78528,11 +80185,13 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -78542,8 +80201,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -78575,6 +80232,20 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -78609,6 +80280,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -78619,7 +80292,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x16FE1,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -78653,10 +80326,13 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
        0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -78724,6 +80400,8 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -78807,8 +80485,6 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -78829,11 +80505,11 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -78849,15 +80525,21 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -78880,7 +80562,7 @@ static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
@@ -78923,121 +80605,128 @@ typedef enum {
        SCX_Cyrillic = 28,
        SCX_Deseret = 29,
        SCX_Devanagari = 30,
-       SCX_Duployan = 31,
-       SCX_Egyptian_Hieroglyphs = 32,
-       SCX_Elbasan = 33,
-       SCX_Ethiopic = 34,
-       SCX_Georgian = 35,
-       SCX_Glagolitic = 36,
-       SCX_Gothic = 37,
-       SCX_Grantha = 38,
-       SCX_Greek = 39,
-       SCX_Gujarati = 40,
-       SCX_Gurmukhi = 41,
-       SCX_Han = 42,
-       SCX_Hanb = 43,
-       SCX_Hangul = 44,
-       SCX_Hanunoo = 45,
-       SCX_Hatran = 46,
-       SCX_Hebrew = 47,
-       SCX_Hiragana = 48,
-       SCX_Imperial_Aramaic = 49,
-       SCX_Inherited = 50,
-       SCX_Inscriptional_Pahlavi = 51,
-       SCX_Inscriptional_Parthian = 52,
-       SCX_Javanese = 53,
-       SCX_Jpan = 54,
-       SCX_Kaithi = 55,
-       SCX_Kannada = 56,
-       SCX_Katakana = 57,
-       SCX_Kayah_Li = 58,
-       SCX_Kharoshthi = 59,
-       SCX_Khmer = 60,
-       SCX_Khojki = 61,
-       SCX_Khudawadi = 62,
-       SCX_Kore = 63,
-       SCX_Lao = 64,
-       SCX_Latin = 65,
-       SCX_Lepcha = 66,
-       SCX_Limbu = 67,
-       SCX_Linear_A = 68,
-       SCX_Linear_B = 69,
-       SCX_Lisu = 70,
-       SCX_Lycian = 71,
-       SCX_Lydian = 72,
-       SCX_Mahajani = 73,
-       SCX_Malayalam = 74,
-       SCX_Mandaic = 75,
-       SCX_Manichaean = 76,
-       SCX_Marchen = 77,
-       SCX_Masaram_Gondi = 78,
-       SCX_Meetei_Mayek = 79,
-       SCX_Mende_Kikakui = 80,
-       SCX_Meroitic_Cursive = 81,
-       SCX_Meroitic_Hieroglyphs = 82,
-       SCX_Miao = 83,
-       SCX_Modi = 84,
-       SCX_Mongolian = 85,
-       SCX_Mro = 86,
-       SCX_Multani = 87,
-       SCX_Myanmar = 88,
-       SCX_Nabataean = 89,
-       SCX_New_Tai_Lue = 90,
-       SCX_Newa = 91,
-       SCX_Nko = 92,
-       SCX_Nushu = 93,
-       SCX_Ogham = 94,
-       SCX_Ol_Chiki = 95,
-       SCX_Old_Hungarian = 96,
-       SCX_Old_Italic = 97,
-       SCX_Old_North_Arabian = 98,
-       SCX_Old_Permic = 99,
-       SCX_Old_Persian = 100,
-       SCX_Old_South_Arabian = 101,
-       SCX_Old_Turkic = 102,
-       SCX_Oriya = 103,
-       SCX_Osage = 104,
-       SCX_Osmanya = 105,
-       SCX_Pahawh_Hmong = 106,
-       SCX_Palmyrene = 107,
-       SCX_Pau_Cin_Hau = 108,
-       SCX_Phags_Pa = 109,
-       SCX_Phoenician = 110,
-       SCX_Psalter_Pahlavi = 111,
-       SCX_Rejang = 112,
-       SCX_Runic = 113,
-       SCX_Samaritan = 114,
-       SCX_Saurashtra = 115,
-       SCX_Sharada = 116,
-       SCX_Shavian = 117,
-       SCX_Siddham = 118,
-       SCX_SignWriting = 119,
-       SCX_Sinhala = 120,
-       SCX_Sora_Sompeng = 121,
-       SCX_Soyombo = 122,
-       SCX_Sundanese = 123,
-       SCX_Syloti_Nagri = 124,
-       SCX_Syriac = 125,
-       SCX_Tagalog = 126,
-       SCX_Tagbanwa = 127,
-       SCX_Tai_Le = 128,
-       SCX_Tai_Tham = 129,
-       SCX_Tai_Viet = 130,
-       SCX_Takri = 131,
-       SCX_Tamil = 132,
-       SCX_Tangut = 133,
-       SCX_Telugu = 134,
-       SCX_Thaana = 135,
-       SCX_Thai = 136,
-       SCX_Tibetan = 137,
-       SCX_Tifinagh = 138,
-       SCX_Tirhuta = 139,
-       SCX_Ugaritic = 140,
-       SCX_Vai = 141,
-       SCX_Warang_Citi = 142,
-       SCX_Yi = 143,
-       SCX_Zanabazar_Square = 144,
-       SCX_INVALID = 145,
+       SCX_Dogra = 31,
+       SCX_Duployan = 32,
+       SCX_Egyptian_Hieroglyphs = 33,
+       SCX_Elbasan = 34,
+       SCX_Ethiopic = 35,
+       SCX_Georgian = 36,
+       SCX_Glagolitic = 37,
+       SCX_Gothic = 38,
+       SCX_Grantha = 39,
+       SCX_Greek = 40,
+       SCX_Gujarati = 41,
+       SCX_Gunjala_Gondi = 42,
+       SCX_Gurmukhi = 43,
+       SCX_Han = 44,
+       SCX_Hanb = 45,
+       SCX_Hangul = 46,
+       SCX_Hanifi_Rohingya = 47,
+       SCX_Hanunoo = 48,
+       SCX_Hatran = 49,
+       SCX_Hebrew = 50,
+       SCX_Hiragana = 51,
+       SCX_Imperial_Aramaic = 52,
+       SCX_Inherited = 53,
+       SCX_Inscriptional_Pahlavi = 54,
+       SCX_Inscriptional_Parthian = 55,
+       SCX_Javanese = 56,
+       SCX_Jpan = 57,
+       SCX_Kaithi = 58,
+       SCX_Kannada = 59,
+       SCX_Katakana = 60,
+       SCX_Kayah_Li = 61,
+       SCX_Kharoshthi = 62,
+       SCX_Khmer = 63,
+       SCX_Khojki = 64,
+       SCX_Khudawadi = 65,
+       SCX_Kore = 66,
+       SCX_Lao = 67,
+       SCX_Latin = 68,
+       SCX_Lepcha = 69,
+       SCX_Limbu = 70,
+       SCX_Linear_A = 71,
+       SCX_Linear_B = 72,
+       SCX_Lisu = 73,
+       SCX_Lycian = 74,
+       SCX_Lydian = 75,
+       SCX_Mahajani = 76,
+       SCX_Makasar = 77,
+       SCX_Malayalam = 78,
+       SCX_Mandaic = 79,
+       SCX_Manichaean = 80,
+       SCX_Marchen = 81,
+       SCX_Masaram_Gondi = 82,
+       SCX_Medefaidrin = 83,
+       SCX_Meetei_Mayek = 84,
+       SCX_Mende_Kikakui = 85,
+       SCX_Meroitic_Cursive = 86,
+       SCX_Meroitic_Hieroglyphs = 87,
+       SCX_Miao = 88,
+       SCX_Modi = 89,
+       SCX_Mongolian = 90,
+       SCX_Mro = 91,
+       SCX_Multani = 92,
+       SCX_Myanmar = 93,
+       SCX_Nabataean = 94,
+       SCX_New_Tai_Lue = 95,
+       SCX_Newa = 96,
+       SCX_Nko = 97,
+       SCX_Nushu = 98,
+       SCX_Ogham = 99,
+       SCX_Ol_Chiki = 100,
+       SCX_Old_Hungarian = 101,
+       SCX_Old_Italic = 102,
+       SCX_Old_North_Arabian = 103,
+       SCX_Old_Permic = 104,
+       SCX_Old_Persian = 105,
+       SCX_Old_Sogdian = 106,
+       SCX_Old_South_Arabian = 107,
+       SCX_Old_Turkic = 108,
+       SCX_Oriya = 109,
+       SCX_Osage = 110,
+       SCX_Osmanya = 111,
+       SCX_Pahawh_Hmong = 112,
+       SCX_Palmyrene = 113,
+       SCX_Pau_Cin_Hau = 114,
+       SCX_Phags_Pa = 115,
+       SCX_Phoenician = 116,
+       SCX_Psalter_Pahlavi = 117,
+       SCX_Rejang = 118,
+       SCX_Runic = 119,
+       SCX_Samaritan = 120,
+       SCX_Saurashtra = 121,
+       SCX_Sharada = 122,
+       SCX_Shavian = 123,
+       SCX_Siddham = 124,
+       SCX_SignWriting = 125,
+       SCX_Sinhala = 126,
+       SCX_Sogdian = 127,
+       SCX_Sora_Sompeng = 128,
+       SCX_Soyombo = 129,
+       SCX_Sundanese = 130,
+       SCX_Syloti_Nagri = 131,
+       SCX_Syriac = 132,
+       SCX_Tagalog = 133,
+       SCX_Tagbanwa = 134,
+       SCX_Tai_Le = 135,
+       SCX_Tai_Tham = 136,
+       SCX_Tai_Viet = 137,
+       SCX_Takri = 138,
+       SCX_Tamil = 139,
+       SCX_Tangut = 140,
+       SCX_Telugu = 141,
+       SCX_Thaana = 142,
+       SCX_Thai = 143,
+       SCX_Tibetan = 144,
+       SCX_Tifinagh = 145,
+       SCX_Tirhuta = 146,
+       SCX_Ugaritic = 147,
+       SCX_Vai = 148,
+       SCX_Warang_Citi = 149,
+       SCX_Yi = 150,
+       SCX_Zanabazar_Square = 151,
+       SCX_INVALID = 152,
        SCX_use_AUX_TABLE_1 = -1,
        SCX_use_AUX_TABLE_2 = -2,
        SCX_use_AUX_TABLE_3 = -3,
@@ -79082,7 +80771,11 @@ typedef enum {
        SCX_use_AUX_TABLE_42 = -42,
        SCX_use_AUX_TABLE_43 = -43,
        SCX_use_AUX_TABLE_44 = -44,
-       SCX_use_AUX_TABLE_45 = -45
+       SCX_use_AUX_TABLE_45 = -45,
+       SCX_use_AUX_TABLE_46 = -46,
+       SCX_use_AUX_TABLE_47 = -47,
+       SCX_use_AUX_TABLE_48 = -48,
+       SCX_use_AUX_TABLE_49 = -49
 } SCX_enum;
 
 #  endif       /* EBCDIC 037 */
@@ -79123,30 +80816,44 @@ static const SCX_enum SCX_AUX_TABLE_5[] = {
 
 static const SCX_enum SCX_AUX_TABLE_6[] = {
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Syriac,
        SCX_Thaana
 };
 
 static const SCX_enum SCX_AUX_TABLE_7[] = {
+       SCX_Arabic,
+       SCX_Syriac,
+       SCX_Thaana
+};
+
+static const SCX_enum SCX_AUX_TABLE_8[] = {
        SCX_Adlam,
        SCX_Arabic,
+       SCX_Hanifi_Rohingya,
        SCX_Mandaic,
        SCX_Manichaean,
        SCX_Psalter_Pahlavi,
+       SCX_Sogdian,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_8[] = {
+static const SCX_enum SCX_AUX_TABLE_9[] = {
        SCX_Arabic,
        SCX_Syriac
 };
 
-static const SCX_enum SCX_AUX_TABLE_9[] = {
+static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Arabic,
        SCX_Thaana
 };
 
-static const SCX_enum SCX_AUX_TABLE_10[] = {
+static const SCX_enum SCX_AUX_TABLE_11[] = {
+       SCX_Arabic,
+       SCX_Hanifi_Rohingya
+};
+
+static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -79158,10 +80865,11 @@ static const SCX_enum SCX_AUX_TABLE_10[] = {
        SCX_Oriya,
        SCX_Sharada,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_11[] = {
+static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Bengali,
        SCX_Devanagari,
        SCX_Grantha,
@@ -79172,14 +80880,17 @@ static const SCX_enum SCX_AUX_TABLE_11[] = {
        SCX_Malayalam,
        SCX_Oriya,
        SCX_Tamil,
-       SCX_Telugu
+       SCX_Telugu,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_12[] = {
+static const SCX_enum SCX_AUX_TABLE_14[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -79194,11 +80905,13 @@ static const SCX_enum SCX_AUX_TABLE_12[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_13[] = {
+static const SCX_enum SCX_AUX_TABLE_15[] = {
        SCX_Bengali,
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Grantha,
        SCX_Gujarati,
+       SCX_Gunjala_Gondi,
        SCX_Gurmukhi,
        SCX_Kannada,
        SCX_Khudawadi,
@@ -79214,98 +80927,113 @@ static const SCX_enum SCX_AUX_TABLE_13[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_14[] = {
+static const SCX_enum SCX_AUX_TABLE_16[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Kaithi,
        SCX_Mahajani
 };
 
-static const SCX_enum SCX_AUX_TABLE_15[] = {
+static const SCX_enum SCX_AUX_TABLE_17[] = {
        SCX_Bengali,
        SCX_Chakma,
        SCX_Syloti_Nagri
 };
 
-static const SCX_enum SCX_AUX_TABLE_16[] = {
+static const SCX_enum SCX_AUX_TABLE_18[] = {
        SCX_Gurmukhi,
        SCX_Multani
 };
 
-static const SCX_enum SCX_AUX_TABLE_17[] = {
+static const SCX_enum SCX_AUX_TABLE_19[] = {
        SCX_Gujarati,
        SCX_Khojki
 };
 
-static const SCX_enum SCX_AUX_TABLE_18[] = {
+static const SCX_enum SCX_AUX_TABLE_20[] = {
        SCX_Grantha,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_19[] = {
+static const SCX_enum SCX_AUX_TABLE_21[] = {
        SCX_Chakma,
        SCX_Myanmar,
        SCX_Tai_Le
 };
 
-static const SCX_enum SCX_AUX_TABLE_20[] = {
+static const SCX_enum SCX_AUX_TABLE_22[] = {
        SCX_Georgian,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_21[] = {
+static const SCX_enum SCX_AUX_TABLE_23[] = {
        SCX_Hangul,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_22[] = {
+static const SCX_enum SCX_AUX_TABLE_24[] = {
        SCX_Buhid,
        SCX_Hanunoo,
        SCX_Tagalog,
        SCX_Tagbanwa
 };
 
-static const SCX_enum SCX_AUX_TABLE_23[] = {
+static const SCX_enum SCX_AUX_TABLE_25[] = {
        SCX_Mongolian,
        SCX_Phags_Pa
 };
 
-static const SCX_enum SCX_AUX_TABLE_24[] = {
+static const SCX_enum SCX_AUX_TABLE_26[] = {
+       SCX_Bengali,
+       SCX_Devanagari,
+       SCX_Grantha,
+       SCX_Kannada
+};
+
+static const SCX_enum SCX_AUX_TABLE_27[] = {
        SCX_Devanagari,
        SCX_Grantha
 };
 
-static const SCX_enum SCX_AUX_TABLE_25[] = {
+static const SCX_enum SCX_AUX_TABLE_28[] = {
+       SCX_Bengali,
+       SCX_Devanagari
+};
+
+static const SCX_enum SCX_AUX_TABLE_29[] = {
        SCX_Devanagari,
        SCX_Sharada
 };
 
-static const SCX_enum SCX_AUX_TABLE_26[] = {
+static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Devanagari,
        SCX_Kannada,
        SCX_Malayalam,
+       SCX_Oriya,
        SCX_Tamil,
        SCX_Telugu
 };
 
-static const SCX_enum SCX_AUX_TABLE_27[] = {
+static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Devanagari,
+       SCX_Grantha,
        SCX_Kannada
 };
 
-static const SCX_enum SCX_AUX_TABLE_28[] = {
+static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Devanagari,
        SCX_Grantha,
        SCX_Latin
 };
 
-static const SCX_enum SCX_AUX_TABLE_29[] = {
+static const SCX_enum SCX_AUX_TABLE_33[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Jpan,
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_30[] = {
+static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -79317,7 +81045,7 @@ static const SCX_enum SCX_AUX_TABLE_30[] = {
        SCX_Yi
 };
 
-static const SCX_enum SCX_AUX_TABLE_31[] = {
+static const SCX_enum SCX_AUX_TABLE_35[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -79328,7 +81056,7 @@ static const SCX_enum SCX_AUX_TABLE_31[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_32[] = {
+static const SCX_enum SCX_AUX_TABLE_36[] = {
        SCX_Bopomofo,
        SCX_Han,
        SCX_Hanb,
@@ -79336,13 +81064,13 @@ static const SCX_enum SCX_AUX_TABLE_32[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_33[] = {
+static const SCX_enum SCX_AUX_TABLE_37[] = {
        SCX_Hiragana,
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_34[] = {
+static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Han,
        SCX_Hanb,
        SCX_Hiragana,
@@ -79351,34 +81079,40 @@ static const SCX_enum SCX_AUX_TABLE_34[] = {
        SCX_Kore
 };
 
-static const SCX_enum SCX_AUX_TABLE_35[] = {
+static const SCX_enum SCX_AUX_TABLE_39[] = {
        SCX_Hiragana,
        SCX_Jpan
 };
 
-static const SCX_enum SCX_AUX_TABLE_36[] = {
+static const SCX_enum SCX_AUX_TABLE_40[] = {
        SCX_Jpan,
        SCX_Katakana
 };
 
-static const SCX_enum SCX_AUX_TABLE_37[] = {
+static const SCX_enum SCX_AUX_TABLE_41[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
        SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
+       SCX_Malayalam,
        SCX_Modi,
        SCX_Takri,
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_38[] = {
+static const SCX_enum SCX_AUX_TABLE_42[] = {
        SCX_Devanagari,
+       SCX_Dogra,
        SCX_Gujarati,
        SCX_Gurmukhi,
        SCX_Kaithi,
+       SCX_Kannada,
+       SCX_Khojki,
        SCX_Khudawadi,
        SCX_Mahajani,
        SCX_Modi,
@@ -79386,39 +81120,48 @@ static const SCX_enum SCX_AUX_TABLE_38[] = {
        SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_39[] = {
-       SCX_Bengali,
-       SCX_Devanagari
+static const SCX_enum SCX_AUX_TABLE_43[] = {
+       SCX_Devanagari,
+       SCX_Dogra,
+       SCX_Gujarati,
+       SCX_Gurmukhi,
+       SCX_Kaithi,
+       SCX_Khojki,
+       SCX_Khudawadi,
+       SCX_Mahajani,
+       SCX_Modi,
+       SCX_Takri,
+       SCX_Tirhuta
 };
 
-static const SCX_enum SCX_AUX_TABLE_40[] = {
+static const SCX_enum SCX_AUX_TABLE_44[] = {
        SCX_Devanagari,
        SCX_Tamil
 };
 
-static const SCX_enum SCX_AUX_TABLE_41[] = {
+static const SCX_enum SCX_AUX_TABLE_45[] = {
        SCX_Kayah_Li,
        SCX_Latin,
        SCX_Myanmar
 };
 
-static const SCX_enum SCX_AUX_TABLE_42[] = {
+static const SCX_enum SCX_AUX_TABLE_46[] = {
        SCX_Buginese,
        SCX_Javanese
 };
 
-static const SCX_enum SCX_AUX_TABLE_43[] = {
+static const SCX_enum SCX_AUX_TABLE_47[] = {
        SCX_Cypriot,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_44[] = {
+static const SCX_enum SCX_AUX_TABLE_48[] = {
        SCX_Cypriot,
        SCX_Linear_A,
        SCX_Linear_B
 };
 
-static const SCX_enum SCX_AUX_TABLE_45[] = {
+static const SCX_enum SCX_AUX_TABLE_49[] = {
        SCX_Arabic,
        SCX_Coptic
 };
@@ -79469,11 +81212,16 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
        SCX_AUX_TABLE_42,
        SCX_AUX_TABLE_43,
        SCX_AUX_TABLE_44,
-       SCX_AUX_TABLE_45
+       SCX_AUX_TABLE_45,
+       SCX_AUX_TABLE_46,
+       SCX_AUX_TABLE_47,
+       SCX_AUX_TABLE_48,
+       SCX_AUX_TABLE_49
 };
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 SCX_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* SCX_AUX_TABLE_1 */,
@@ -79481,51 +81229,56 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
        2       /* SCX_AUX_TABLE_3 */,
        2       /* SCX_AUX_TABLE_4 */,
        2       /* SCX_AUX_TABLE_5 */,
-       3       /* SCX_AUX_TABLE_6 */,
-       6       /* SCX_AUX_TABLE_7 */,
-       2       /* SCX_AUX_TABLE_8 */,
+       4       /* SCX_AUX_TABLE_6 */,
+       3       /* SCX_AUX_TABLE_7 */,
+       8       /* SCX_AUX_TABLE_8 */,
        2       /* SCX_AUX_TABLE_9 */,
-       12      /* SCX_AUX_TABLE_10 */,
-       11      /* SCX_AUX_TABLE_11 */,
-       16      /* SCX_AUX_TABLE_12 */,
-       17      /* SCX_AUX_TABLE_13 */,
-       3       /* SCX_AUX_TABLE_14 */,
-       3       /* SCX_AUX_TABLE_15 */,
-       2       /* SCX_AUX_TABLE_16 */,
-       2       /* SCX_AUX_TABLE_17 */,
+       2       /* SCX_AUX_TABLE_10 */,
+       2       /* SCX_AUX_TABLE_11 */,
+       13      /* SCX_AUX_TABLE_12 */,
+       12      /* SCX_AUX_TABLE_13 */,
+       18      /* SCX_AUX_TABLE_14 */,
+       19      /* SCX_AUX_TABLE_15 */,
+       4       /* SCX_AUX_TABLE_16 */,
+       3       /* SCX_AUX_TABLE_17 */,
        2       /* SCX_AUX_TABLE_18 */,
-       3       /* SCX_AUX_TABLE_19 */,
+       2       /* SCX_AUX_TABLE_19 */,
        2       /* SCX_AUX_TABLE_20 */,
-       2       /* SCX_AUX_TABLE_21 */,
-       4       /* SCX_AUX_TABLE_22 */,
+       3       /* SCX_AUX_TABLE_21 */,
+       2       /* SCX_AUX_TABLE_22 */,
        2       /* SCX_AUX_TABLE_23 */,
-       2       /* SCX_AUX_TABLE_24 */,
+       4       /* SCX_AUX_TABLE_24 */,
        2       /* SCX_AUX_TABLE_25 */,
-       5       /* SCX_AUX_TABLE_26 */,
+       4       /* SCX_AUX_TABLE_26 */,
        2       /* SCX_AUX_TABLE_27 */,
-       3       /* SCX_AUX_TABLE_28 */,
-       4       /* SCX_AUX_TABLE_29 */,
-       9       /* SCX_AUX_TABLE_30 */,
-       8       /* SCX_AUX_TABLE_31 */,
-       5       /* SCX_AUX_TABLE_32 */,
-       3       /* SCX_AUX_TABLE_33 */,
-       6       /* SCX_AUX_TABLE_34 */,
-       2       /* SCX_AUX_TABLE_35 */,
-       2       /* SCX_AUX_TABLE_36 */,
-       10      /* SCX_AUX_TABLE_37 */,
-       9       /* SCX_AUX_TABLE_38 */,
+       2       /* SCX_AUX_TABLE_28 */,
+       2       /* SCX_AUX_TABLE_29 */,
+       6       /* SCX_AUX_TABLE_30 */,
+       3       /* SCX_AUX_TABLE_31 */,
+       3       /* SCX_AUX_TABLE_32 */,
+       4       /* SCX_AUX_TABLE_33 */,
+       9       /* SCX_AUX_TABLE_34 */,
+       8       /* SCX_AUX_TABLE_35 */,
+       5       /* SCX_AUX_TABLE_36 */,
+       3       /* SCX_AUX_TABLE_37 */,
+       6       /* SCX_AUX_TABLE_38 */,
        2       /* SCX_AUX_TABLE_39 */,
        2       /* SCX_AUX_TABLE_40 */,
-       3       /* SCX_AUX_TABLE_41 */,
-       2       /* SCX_AUX_TABLE_42 */,
-       2       /* SCX_AUX_TABLE_43 */,
-       3       /* SCX_AUX_TABLE_44 */,
-       2       /* SCX_AUX_TABLE_45 */
+       13      /* SCX_AUX_TABLE_41 */,
+       12      /* SCX_AUX_TABLE_42 */,
+       11      /* SCX_AUX_TABLE_43 */,
+       2       /* SCX_AUX_TABLE_44 */,
+       3       /* SCX_AUX_TABLE_45 */,
+       2       /* SCX_AUX_TABLE_46 */,
+       2       /* SCX_AUX_TABLE_47 */,
+       3       /* SCX_AUX_TABLE_48 */,
+       2       /* SCX_AUX_TABLE_49 */
 };
 
 /* This table, indexed by the script enum, gives the zero code point for that
  * script; 0 if the script has multiple digit sequences.  Scripts without a
  * digit sequence use ASCII [0-9], hence are marked '0' */
+
 static const UV script_zeros[] = {
        '0',    /* Unknown */
        0x1e950,        /* Adlam */
@@ -79558,6 +81311,7 @@ static const UV script_zeros[] = {
        '0',    /* Cyrillic */
        '0',    /* Deseret */
        0x966,  /* Devanagari */
+       0x966,  /* Dogra */
        '0',    /* Duployan */
        '0',    /* Egyptian_Hieroglyphs */
        '0',    /* Elbasan */
@@ -79568,10 +81322,12 @@ static const UV script_zeros[] = {
        0xbe6,  /* Grantha */
        '0',    /* Greek */
        0xae6,  /* Gujarati */
+       0x11da0,        /* Gunjala_Gondi */
        0xa66,  /* Gurmukhi */
        '0',    /* Han */
        '0',    /* Hanb */
        '0',    /* Hangul */
+       0x10d30,        /* Hanifi_Rohingya */
        '0',    /* Hanunoo */
        '0',    /* Hatran */
        '0',    /* Hebrew */
@@ -79601,11 +81357,13 @@ static const UV script_zeros[] = {
        '0',    /* Lycian */
        '0',    /* Lydian */
        0x966,  /* Mahajani */
+       '0',    /* Makasar */
        0xd66,  /* Malayalam */
        '0',    /* Mandaic */
        '0',    /* Manichaean */
        '0',    /* Marchen */
        0x11d50,        /* Masaram_Gondi */
+       '0',    /* Medefaidrin */
        0xabf0, /* Meetei_Mayek */
        '0',    /* Mende_Kikakui */
        '0',    /* Meroitic_Cursive */
@@ -79628,6 +81386,7 @@ static const UV script_zeros[] = {
        '0',    /* Old_North_Arabian */
        '0',    /* Old_Permic */
        '0',    /* Old_Persian */
+       '0',    /* Old_Sogdian */
        '0',    /* Old_South_Arabian */
        '0',    /* Old_Turkic */
        0xb66,  /* Oriya */
@@ -79648,6 +81407,7 @@ static const UV script_zeros[] = {
        '0',    /* Siddham */
        '0',    /* SignWriting */
        0xde6,  /* Sinhala */
+       '0',    /* Sogdian */
        0x110f0,        /* Sora_Sompeng */
        '0',    /* Soyombo */
        0x1bb0, /* Sundanese */
@@ -79672,7 +81432,7 @@ static const UV script_zeros[] = {
        0x118e0 /* Warang_Citi */
 };
 
-static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
+static const SCX_enum _Perl_SCX_invmap[] = {  /* for EBCDIC 037 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
@@ -79751,9 +81511,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Armenian,
        SCX_Unknown,
        SCX_Armenian,
-       SCX_Unknown,
-       SCX_Armenian,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_5,
        SCX_Armenian,
        SCX_Unknown,
@@ -79771,17 +81528,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
+       SCX_use_AUX_TABLE_7,
        SCX_Unknown,
        SCX_Arabic,
        SCX_use_AUX_TABLE_6,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_7,
-       SCX_Arabic,
        SCX_use_AUX_TABLE_8,
        SCX_Arabic,
        SCX_use_AUX_TABLE_9,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_8,
+       SCX_use_AUX_TABLE_10,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_9,
+       SCX_Arabic,
+       SCX_use_AUX_TABLE_11,
        SCX_Arabic,
        SCX_Common,
        SCX_Arabic,
@@ -79795,6 +81555,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Nko,
        SCX_Unknown,
+       SCX_Nko,
        SCX_Samaritan,
        SCX_Unknown,
        SCX_Samaritan,
@@ -79813,12 +81574,12 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Common,
        SCX_Arabic,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_10,
-       SCX_use_AUX_TABLE_11,
-       SCX_Devanagari,
        SCX_use_AUX_TABLE_12,
        SCX_use_AUX_TABLE_13,
+       SCX_Devanagari,
        SCX_use_AUX_TABLE_14,
+       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_16,
        SCX_Devanagari,
        SCX_Bengali,
        SCX_Unknown,
@@ -79846,7 +81607,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Bengali,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_15,
+       SCX_use_AUX_TABLE_17,
        SCX_Bengali,
        SCX_Unknown,
        SCX_Gurmukhi,
@@ -79879,7 +81640,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Gurmukhi,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_16,
+       SCX_use_AUX_TABLE_18,
        SCX_Gurmukhi,
        SCX_Unknown,
        SCX_Gujarati,
@@ -79906,7 +81667,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Gujarati,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_17,
+       SCX_use_AUX_TABLE_19,
        SCX_Gujarati,
        SCX_Unknown,
        SCX_Gujarati,
@@ -79956,11 +81717,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
        SCX_Unknown,
        SCX_Tamil,
-       SCX_use_AUX_TABLE_18,
-       SCX_Tamil,
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
@@ -79972,7 +81730,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Tamil,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Tamil,
        SCX_Unknown,
        SCX_Telugu,
@@ -79998,10 +81756,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Telugu,
        SCX_Unknown,
        SCX_Telugu,
-       SCX_Unknown,
-       SCX_Telugu,
-       SCX_Kannada,
-       SCX_Unknown,
        SCX_Kannada,
        SCX_Unknown,
        SCX_Kannada,
@@ -80124,7 +81878,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Tibetan,
        SCX_Unknown,
        SCX_Myanmar,
-       SCX_use_AUX_TABLE_19,
+       SCX_use_AUX_TABLE_21,
        SCX_Myanmar,
        SCX_Georgian,
        SCX_Unknown,
@@ -80133,9 +81887,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Georgian,
        SCX_Unknown,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_20,
+       SCX_use_AUX_TABLE_22,
        SCX_Georgian,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Ethiopic,
        SCX_Unknown,
        SCX_Ethiopic,
@@ -80188,7 +81942,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Tagalog,
        SCX_Unknown,
        SCX_Hanunoo,
-       SCX_use_AUX_TABLE_22,
+       SCX_use_AUX_TABLE_24,
        SCX_Unknown,
        SCX_Buhid,
        SCX_Unknown,
@@ -80205,9 +81959,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Khmer,
        SCX_Unknown,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
-       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_25,
        SCX_Mongolian,
        SCX_Unknown,
        SCX_Mongolian,
@@ -80270,26 +82024,36 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Ol_Chiki,
        SCX_Cyrillic,
        SCX_Unknown,
+       SCX_Georgian,
+       SCX_Unknown,
+       SCX_Georgian,
        SCX_Sundanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_27,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_30,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
-       SCX_use_AUX_TABLE_26,
+       SCX_use_AUX_TABLE_29,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_25,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_24,
-       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
+       SCX_use_AUX_TABLE_27,
+       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_28,
        SCX_Bengali,
-       SCX_use_AUX_TABLE_24,
+       SCX_use_AUX_TABLE_27,
        SCX_Unknown,
        SCX_Latin,
        SCX_Greek,
@@ -80354,7 +82118,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Common,
        SCX_Unknown,
        SCX_Inherited,
-       SCX_use_AUX_TABLE_28,
+       SCX_use_AUX_TABLE_32,
        SCX_Unknown,
        SCX_Common,
        SCX_Greek,
@@ -80382,10 +82146,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
-       SCX_Common,
-       SCX_Unknown,
        SCX_Glagolitic,
        SCX_Unknown,
        SCX_Glagolitic,
@@ -80428,79 +82188,79 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_use_AUX_TABLE_3,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
-       SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_30,
-       SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
-       SCX_use_AUX_TABLE_32,
-       SCX_use_AUX_TABLE_21,
-       SCX_use_AUX_TABLE_31,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_34,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_34,
-       SCX_use_AUX_TABLE_29,
-       SCX_Unknown,
        SCX_use_AUX_TABLE_35,
-       SCX_Unknown,
+       SCX_Common,
        SCX_use_AUX_TABLE_33,
+       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_23,
+       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_37,
+       SCX_Common,
        SCX_use_AUX_TABLE_35,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_30,
+       SCX_use_AUX_TABLE_38,
        SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_39,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_use_AUX_TABLE_1,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_36,
+       SCX_use_AUX_TABLE_40,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Yi,
        SCX_Unknown,
@@ -80520,12 +82280,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Latin,
        SCX_Unknown,
        SCX_Latin,
-       SCX_Unknown,
-       SCX_Latin,
        SCX_Syloti_Nagri,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_37,
-       SCX_use_AUX_TABLE_38,
+       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_43,
        SCX_Unknown,
        SCX_Phags_Pa,
        SCX_Unknown,
@@ -80534,22 +82293,21 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Saurashtra,
        SCX_Unknown,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_39,
+       SCX_use_AUX_TABLE_28,
        SCX_Devanagari,
-       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_44,
        SCX_Devanagari,
-       SCX_Unknown,
        SCX_Kayah_Li,
-       SCX_use_AUX_TABLE_41,
+       SCX_use_AUX_TABLE_45,
        SCX_Kayah_Li,
        SCX_Rejang,
        SCX_Unknown,
        SCX_Rejang,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Javanese,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_42,
+       SCX_use_AUX_TABLE_46,
        SCX_Javanese,
        SCX_Unknown,
        SCX_Javanese,
@@ -80588,15 +82346,15 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Meetei_Mayek,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Latin,
        SCX_Unknown,
@@ -80623,9 +82381,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Arabic,
        SCX_Unknown,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Arabic,
-       SCX_use_AUX_TABLE_9,
+       SCX_use_AUX_TABLE_10,
        SCX_Unknown,
        SCX_Inherited,
        SCX_Common,
@@ -80633,7 +82391,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Inherited,
        SCX_Cyrillic,
        SCX_Common,
-       SCX_use_AUX_TABLE_31,
+       SCX_use_AUX_TABLE_35,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
@@ -80651,20 +82409,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Common,
        SCX_Latin,
        SCX_Common,
-       SCX_use_AUX_TABLE_30,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_33,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_34,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_37,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_21,
+       SCX_use_AUX_TABLE_23,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -80686,11 +82444,11 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Linear_B,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_44,
+       SCX_use_AUX_TABLE_48,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_43,
+       SCX_use_AUX_TABLE_47,
        SCX_Greek,
        SCX_Unknown,
        SCX_Common,
@@ -80704,7 +82462,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Carian,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_45,
+       SCX_use_AUX_TABLE_49,
        SCX_Unknown,
        SCX_Old_Italic,
        SCX_Unknown,
@@ -80824,9 +82582,16 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Old_Hungarian,
        SCX_Unknown,
        SCX_Old_Hungarian,
+       SCX_Hanifi_Rohingya,
+       SCX_Unknown,
+       SCX_Hanifi_Rohingya,
        SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
+       SCX_Old_Sogdian,
+       SCX_Unknown,
+       SCX_Sogdian,
+       SCX_Unknown,
        SCX_Brahmi,
        SCX_Unknown,
        SCX_Brahmi,
@@ -80834,6 +82599,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Brahmi,
        SCX_Kaithi,
        SCX_Unknown,
+       SCX_Kaithi,
+       SCX_Unknown,
        SCX_Sora_Sompeng,
        SCX_Unknown,
        SCX_Sora_Sompeng,
@@ -80869,9 +82636,9 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Khudawadi,
        SCX_Unknown,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
@@ -80885,7 +82652,7 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Grantha,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_18,
+       SCX_use_AUX_TABLE_20,
        SCX_Grantha,
        SCX_Unknown,
        SCX_Grantha,
@@ -80932,6 +82699,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Ahom,
        SCX_Unknown,
+       SCX_Dogra,
+       SCX_Unknown,
        SCX_Warang_Citi,
        SCX_Unknown,
        SCX_Warang_Citi,
@@ -80942,8 +82711,6 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Soyombo,
        SCX_Unknown,
-       SCX_Soyombo,
-       SCX_Unknown,
        SCX_Pau_Cin_Hau,
        SCX_Unknown,
        SCX_Bhaiksuki,
@@ -80974,6 +82741,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Masaram_Gondi,
        SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Gunjala_Gondi,
+       SCX_Unknown,
+       SCX_Makasar,
+       SCX_Unknown,
        SCX_Cuneiform,
        SCX_Unknown,
        SCX_Cuneiform,
@@ -81008,6 +82789,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Pahawh_Hmong,
        SCX_Unknown,
+       SCX_Medefaidrin,
+       SCX_Unknown,
        SCX_Miao,
        SCX_Unknown,
        SCX_Miao,
@@ -81021,8 +82804,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Tangut,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_36,
-       SCX_use_AUX_TABLE_35,
+       SCX_use_AUX_TABLE_40,
+       SCX_use_AUX_TABLE_39,
        SCX_Unknown,
        SCX_Nushu,
        SCX_Unknown,
@@ -81054,7 +82837,10 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
+       SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -81123,6 +82909,8 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Adlam,
        SCX_Unknown,
+       SCX_Common,
+       SCX_Unknown,
        SCX_Arabic,
        SCX_Unknown,
        SCX_Arabic,
@@ -81210,16 +82998,20 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
+       SCX_use_AUX_TABLE_39,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
-       SCX_use_AUX_TABLE_35,
+       SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
+       SCX_use_AUX_TABLE_33,
+       SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_Common,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -81257,17 +83049,17 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
-       SCX_use_AUX_TABLE_29,
+       SCX_use_AUX_TABLE_33,
        SCX_Unknown,
        SCX_Common,
        SCX_Unknown,
@@ -81281,12 +83073,12 @@ static const SCX_enum _Perl_SCX_invmap[] = { /* for EBCDIC 037 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
-       1721,   /* Number of elements */
+static const UV _Perl_WB_invlist[] = {  /* for ASCII/Latin1 */
+       1812,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -81320,10 +83112,12 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x86,
        0xA0,
        0xA1,
+       0xA9,
        0xAA,
        0xAB,
        0xAD,
        0xAE,
+       0xAF,
        0xB5,
        0xB6,
        0xB7,
@@ -81367,8 +83161,11 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -81383,7 +83180,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x5F4,
        0x5F5,
@@ -81440,6 +83237,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -81458,7 +83257,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -81508,6 +83307,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -81642,7 +83443,6 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -81901,7 +83701,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -81962,6 +83762,10 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -82029,10 +83833,14 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x202A,
        0x202F,
        0x2030,
+       0x203C,
+       0x203D,
        0x203F,
        0x2041,
        0x2044,
        0x2045,
+       0x2049,
+       0x204A,
        0x2054,
        0x2055,
        0x205F,
@@ -82058,6 +83866,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x2116,
        0x2119,
        0x211E,
+       0x2122,
+       0x2123,
        0x2124,
        0x2125,
        0x2126,
@@ -82067,6 +83877,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x212A,
        0x212E,
        0x212F,
+       0x2139,
        0x213A,
        0x213C,
        0x2140,
@@ -82076,24 +83887,88 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x214F,
        0x2160,
        0x2189,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
        0x24B6,
+       0x24C2,
+       0x24C3,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -82147,6 +84022,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x3036,
        0x303B,
        0x303D,
+       0x303E,
        0x3099,
        0x309B,
        0x309D,
@@ -82155,13 +84031,17 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
        0x31BB,
        0x31F0,
        0x3200,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0x32D0,
        0x32FF,
        0x3300,
@@ -82187,9 +84067,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0xA6F0,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -82213,7 +84091,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -82465,7 +84343,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -82493,6 +84371,18 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -82505,6 +84395,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -82515,6 +84407,9 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -82525,7 +84420,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x111B3,
        0x111C1,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -82568,7 +84463,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -82593,6 +84488,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -82625,6 +84522,9 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -82646,6 +84546,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x11A86,
        0x11A8A,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -82681,6 +84583,23 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -82712,6 +84631,8 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -82907,104 +84828,66 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
        0x1EEAA,
        0x1EEAB,
        0x1EEBC,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
        0x1F130,
        0x1F14A,
        0x1F150,
        0x1F16A,
+       0x1F16C,
        0x1F170,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
        0x1F18A,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -83015,7 +84898,7 @@ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
 
 #  endif       /* ASCII/Latin1 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -83026,30 +84909,32 @@ typedef enum {
        WB_ALetter = 1,
        WB_CR = 2,
        WB_Double_Quote = 3,
-       WB_E_Base = 4,
-       WB_E_Base_GAZ = 5,
-       WB_E_Modifier = 6,
-       WB_Extend = 7,
-       WB_ExtendNumLet = 8,
-       WB_Format = 9,
-       WB_Glue_After_Zwj = 10,
-       WB_Hebrew_Letter = 11,
-       WB_Katakana = 12,
-       WB_LF = 13,
-       WB_MidLetter = 14,
-       WB_MidNum = 15,
-       WB_MidNumLet = 16,
-       WB_Newline = 17,
-       WB_Numeric = 18,
-       WB_Perl_Tailored_HSpace = 19,
-       WB_Regional_Indicator = 20,
-       WB_Single_Quote = 21,
-       WB_ZWJ = 22,
-       WB_EDGE = 23,
-       WB_UNKNOWN = 24
+       WB_Extend = 4,
+       WB_ExtendNumLet = 5,
+       WB_Format = 6,
+       WB_Hebrew_Letter = 7,
+       WB_Katakana = 8,
+       WB_LF = 9,
+       WB_MidLetter = 10,
+       WB_MidNum = 11,
+       WB_MidNumLet = 12,
+       WB_Newline = 13,
+       WB_Numeric = 14,
+       WB_Perl_Tailored_HSpace = 15,
+       WB_Regional_Indicator = 16,
+       WB_Single_Quote = 17,
+       WB_XPG_LE = 18,
+       WB_XPG_XX = 19,
+       WB_ZWJ = 20,
+       WB_EDGE = 21,
+       WB_E_Base = 22,
+       WB_E_Base_GAZ = 22,
+       WB_E_Modifier = 22,
+       WB_Glue_After_Zwj = 22,
+       WB_UNKNOWN = 22
 } WB_enum;
 
-static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
+static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_Perl_Tailored_HSpace,
        WB_LF,
@@ -83080,9 +84965,11 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_Perl_Tailored_HSpace,
        WB_Other,
+       WB_XPG_XX,
        WB_ALetter,
        WB_Other,
        WB_Format,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -83129,6 +85016,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_MidNum,
        WB_Other,
        WB_Extend,
@@ -83200,6 +85090,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -83270,6 +85162,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_Extend,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -83402,7 +85296,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Numeric,
        WB_Other,
        WB_Extend,
-       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -83722,6 +85615,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -83789,10 +85686,14 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_Perl_Tailored_HSpace,
@@ -83818,6 +85719,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -83827,6 +85730,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -83836,23 +85740,87 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -83902,10 +85870,11 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_Other,
+       WB_XPG_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -83922,6 +85891,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_Katakana,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_Katakana,
        WB_Other,
        WB_Katakana,
@@ -83949,8 +85922,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
-       WB_ALetter,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -83973,7 +85944,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
+       WB_Extend,
        WB_Numeric,
        WB_ALetter,
        WB_Extend,
@@ -84253,6 +86224,18 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -84265,6 +86248,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_Format,
        WB_Other,
+       WB_Format,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_Numeric,
@@ -84279,6 +86264,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Extend,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_Extend,
        WB_ALetter,
@@ -84353,6 +86341,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_Numeric,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -84386,6 +86376,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Numeric,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Numeric,
        WB_Other,
        WB_ALetter,
@@ -84411,6 +86404,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -84446,6 +86441,23 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_ALetter,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -84475,6 +86487,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -84667,103 +86681,65 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
+       WB_XPG_XX,
        WB_ALetter,
        WB_Other,
-       WB_Regional_Indicator,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Modifier,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base_GAZ,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Regional_Indicator,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Extend,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -84777,15 +86753,15 @@ static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
-       1744,   /* Number of elements */
+static const UV _Perl_WB_invlist[] = {  /* for EBCDIC 1047 */
+       1835,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -84837,8 +86813,10 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0xAD,
        0xAE,
        0xAF,
+       0xB0,
        0xB3,
        0xB4,
+       0xB5,
        0xBA,
        0xBB,
        0xC1,
@@ -84889,8 +86867,11 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -84905,7 +86886,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x5F4,
        0x5F5,
@@ -84962,6 +86943,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -84980,7 +86963,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -85030,6 +87013,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -85164,7 +87149,6 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -85423,7 +87407,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -85484,6 +87468,10 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -85551,10 +87539,14 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x202A,
        0x202F,
        0x2030,
+       0x203C,
+       0x203D,
        0x203F,
        0x2041,
        0x2044,
        0x2045,
+       0x2049,
+       0x204A,
        0x2054,
        0x2055,
        0x205F,
@@ -85580,6 +87572,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x2116,
        0x2119,
        0x211E,
+       0x2122,
+       0x2123,
        0x2124,
        0x2125,
        0x2126,
@@ -85589,6 +87583,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x212A,
        0x212E,
        0x212F,
+       0x2139,
        0x213A,
        0x213C,
        0x2140,
@@ -85598,24 +87593,88 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x214F,
        0x2160,
        0x2189,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
        0x24B6,
+       0x24C2,
+       0x24C3,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -85669,6 +87728,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x3036,
        0x303B,
        0x303D,
+       0x303E,
        0x3099,
        0x309B,
        0x309D,
@@ -85677,13 +87737,17 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
        0x31BB,
        0x31F0,
        0x3200,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0x32D0,
        0x32FF,
        0x3300,
@@ -85709,9 +87773,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0xA6F0,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -85735,7 +87797,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -85987,7 +88049,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -86015,6 +88077,18 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -86027,6 +88101,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -86037,6 +88113,9 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -86047,7 +88126,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x111B3,
        0x111C1,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -86090,7 +88169,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -86115,6 +88194,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -86147,6 +88228,9 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -86168,6 +88252,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x11A86,
        0x11A8A,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -86203,6 +88289,23 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -86234,6 +88337,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -86429,104 +88534,66 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
        0x1EEAA,
        0x1EEAB,
        0x1EEBC,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
        0x1F130,
        0x1F14A,
        0x1F150,
        0x1F16A,
+       0x1F16C,
        0x1F170,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
        0x1F18A,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -86537,7 +88604,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
 
 #  endif       /* EBCDIC 1047 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -86551,30 +88618,32 @@ typedef enum {
        WB_ALetter = 1,
        WB_CR = 2,
        WB_Double_Quote = 3,
-       WB_E_Base = 4,
-       WB_E_Base_GAZ = 5,
-       WB_E_Modifier = 6,
-       WB_Extend = 7,
-       WB_ExtendNumLet = 8,
-       WB_Format = 9,
-       WB_Glue_After_Zwj = 10,
-       WB_Hebrew_Letter = 11,
-       WB_Katakana = 12,
-       WB_LF = 13,
-       WB_MidLetter = 14,
-       WB_MidNum = 15,
-       WB_MidNumLet = 16,
-       WB_Newline = 17,
-       WB_Numeric = 18,
-       WB_Perl_Tailored_HSpace = 19,
-       WB_Regional_Indicator = 20,
-       WB_Single_Quote = 21,
-       WB_ZWJ = 22,
-       WB_EDGE = 23,
-       WB_UNKNOWN = 24
+       WB_Extend = 4,
+       WB_ExtendNumLet = 5,
+       WB_Format = 6,
+       WB_Hebrew_Letter = 7,
+       WB_Katakana = 8,
+       WB_LF = 9,
+       WB_MidLetter = 10,
+       WB_MidNum = 11,
+       WB_MidNumLet = 12,
+       WB_Newline = 13,
+       WB_Numeric = 14,
+       WB_Perl_Tailored_HSpace = 15,
+       WB_Regional_Indicator = 16,
+       WB_Single_Quote = 17,
+       WB_XPG_LE = 18,
+       WB_XPG_XX = 19,
+       WB_ZWJ = 20,
+       WB_EDGE = 21,
+       WB_E_Base = 22,
+       WB_E_Base_GAZ = 22,
+       WB_E_Modifier = 22,
+       WB_Glue_After_Zwj = 22,
+       WB_UNKNOWN = 22
 } WB_enum;
 
-static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
+static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Other,
        WB_Perl_Tailored_HSpace,
        WB_Other,
@@ -86622,8 +88691,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
        WB_MidLetter,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -86677,6 +88748,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_MidNum,
        WB_Other,
        WB_Extend,
@@ -86748,6 +88822,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -86818,6 +88894,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_Extend,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -86950,7 +89028,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Numeric,
        WB_Other,
        WB_Extend,
-       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -87270,6 +89347,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -87337,10 +89418,14 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_Perl_Tailored_HSpace,
@@ -87366,6 +89451,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -87375,6 +89462,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -87384,23 +89472,87 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -87450,10 +89602,11 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_Other,
+       WB_XPG_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -87470,6 +89623,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_Katakana,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_Katakana,
        WB_Other,
        WB_Katakana,
@@ -87497,8 +89654,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
-       WB_ALetter,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -87521,7 +89676,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
+       WB_Extend,
        WB_Numeric,
        WB_ALetter,
        WB_Extend,
@@ -87801,6 +89956,18 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -87813,6 +89980,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_Format,
        WB_Other,
+       WB_Format,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_Numeric,
@@ -87827,6 +89996,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Extend,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_Extend,
        WB_ALetter,
@@ -87901,6 +90073,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_Numeric,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -87934,6 +90108,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Numeric,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Numeric,
        WB_Other,
        WB_ALetter,
@@ -87959,6 +90136,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -87994,6 +90173,23 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_ALetter,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -88023,6 +90219,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -88215,103 +90413,65 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
+       WB_XPG_XX,
        WB_ALetter,
        WB_Other,
-       WB_Regional_Indicator,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Modifier,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base_GAZ,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Regional_Indicator,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Extend,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -88325,15 +90485,15 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
-       1740,   /* Number of elements */
+static const UV _Perl_WB_invlist[] = {  /* for EBCDIC 037 */
+       1831,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -88383,8 +90543,10 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0xAA,
        0xAC,
        0xAF,
+       0xB0,
        0xB3,
        0xB4,
+       0xB5,
        0xC1,
        0xCA,
        0xCB,
@@ -88433,8 +90595,11 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x589,
        0x58A,
        0x591,
@@ -88449,7 +90614,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x5F4,
        0x5F5,
@@ -88506,6 +90671,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x816,
        0x81A,
@@ -88524,7 +90691,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -88574,6 +90741,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -88708,7 +90877,6 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
        0xC05,
        0xC0D,
        0xC0E,
@@ -88967,7 +91135,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -89028,6 +91196,10 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -89095,10 +91267,14 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x202A,
        0x202F,
        0x2030,
+       0x203C,
+       0x203D,
        0x203F,
        0x2041,
        0x2044,
        0x2045,
+       0x2049,
+       0x204A,
        0x2054,
        0x2055,
        0x205F,
@@ -89124,6 +91300,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x2116,
        0x2119,
        0x211E,
+       0x2122,
+       0x2123,
        0x2124,
        0x2125,
        0x2126,
@@ -89133,6 +91311,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x212A,
        0x212E,
        0x212F,
+       0x2139,
        0x213A,
        0x213C,
        0x2140,
@@ -89142,24 +91321,88 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x214F,
        0x2160,
        0x2189,
+       0x2194,
+       0x219A,
+       0x21A9,
+       0x21AB,
+       0x231A,
+       0x231C,
+       0x2328,
+       0x2329,
+       0x2388,
+       0x2389,
+       0x23CF,
+       0x23D0,
+       0x23E9,
+       0x23F4,
+       0x23F8,
+       0x23FB,
        0x24B6,
+       0x24C2,
+       0x24C3,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
+       0x25AA,
+       0x25AC,
+       0x25B6,
+       0x25B7,
+       0x25C0,
+       0x25C1,
+       0x25FB,
+       0x25FF,
+       0x2600,
+       0x2606,
+       0x2607,
+       0x2613,
+       0x2614,
+       0x2686,
+       0x2690,
+       0x2706,
        0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
+       0x2713,
+       0x2714,
+       0x2715,
+       0x2716,
+       0x2717,
+       0x271D,
+       0x271E,
+       0x2721,
+       0x2722,
+       0x2728,
+       0x2729,
+       0x2733,
+       0x2735,
+       0x2744,
+       0x2745,
+       0x2747,
+       0x2748,
+       0x274C,
+       0x274D,
+       0x274E,
+       0x274F,
+       0x2753,
+       0x2756,
+       0x2757,
+       0x2758,
+       0x2763,
+       0x2768,
+       0x2795,
+       0x2798,
+       0x27A1,
+       0x27A2,
+       0x27B0,
+       0x27B1,
+       0x27BF,
+       0x27C0,
+       0x2934,
+       0x2936,
+       0x2B05,
+       0x2B08,
+       0x2B1B,
+       0x2B1D,
+       0x2B50,
+       0x2B51,
+       0x2B55,
+       0x2B56,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -89213,6 +91456,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x3036,
        0x303B,
        0x303D,
+       0x303E,
        0x3099,
        0x309B,
        0x309D,
@@ -89221,13 +91465,17 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
        0x31BB,
        0x31F0,
        0x3200,
+       0x3297,
+       0x3298,
+       0x3299,
+       0x329A,
        0x32D0,
        0x32FF,
        0x3300,
@@ -89253,9 +91501,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0xA6F0,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -89279,7 +91525,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA90A,
        0xA926,
@@ -89531,7 +91777,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -89559,6 +91805,18 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -89571,6 +91829,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -89581,6 +91841,9 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11145,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -89591,7 +91854,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x111B3,
        0x111C1,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -89634,7 +91897,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -89659,6 +91922,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114B0,
        0x114C4,
@@ -89691,6 +91956,9 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1182C,
+       0x1183B,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -89712,6 +91980,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x11A86,
        0x11A8A,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -89747,6 +92017,23 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -89778,6 +92065,8 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -89973,104 +92262,66 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
        0x1EEAA,
        0x1EEAB,
        0x1EEBC,
+       0x1F000,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
        0x1F130,
        0x1F14A,
        0x1F150,
        0x1F16A,
+       0x1F16C,
        0x1F170,
+       0x1F172,
+       0x1F17E,
+       0x1F180,
        0x1F18A,
+       0x1F18E,
+       0x1F18F,
+       0x1F191,
+       0x1F19B,
+       0x1F1AD,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
+       0x1F201,
+       0x1F210,
+       0x1F21A,
+       0x1F21B,
+       0x1F22F,
+       0x1F230,
+       0x1F232,
+       0x1F23B,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
+       0x1F53E,
+       0x1F546,
        0x1F650,
        0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F93B,
+       0x1F93C,
+       0x1F946,
+       0x1F947,
+       0x1FFFE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -90081,7 +92332,7 @@ static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-#endif /* defined(PERL_IN_UTF8_C) */
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
 #if defined(PERL_IN_REGEXEC_C)
 
@@ -90095,30 +92346,32 @@ typedef enum {
        WB_ALetter = 1,
        WB_CR = 2,
        WB_Double_Quote = 3,
-       WB_E_Base = 4,
-       WB_E_Base_GAZ = 5,
-       WB_E_Modifier = 6,
-       WB_Extend = 7,
-       WB_ExtendNumLet = 8,
-       WB_Format = 9,
-       WB_Glue_After_Zwj = 10,
-       WB_Hebrew_Letter = 11,
-       WB_Katakana = 12,
-       WB_LF = 13,
-       WB_MidLetter = 14,
-       WB_MidNum = 15,
-       WB_MidNumLet = 16,
-       WB_Newline = 17,
-       WB_Numeric = 18,
-       WB_Perl_Tailored_HSpace = 19,
-       WB_Regional_Indicator = 20,
-       WB_Single_Quote = 21,
-       WB_ZWJ = 22,
-       WB_EDGE = 23,
-       WB_UNKNOWN = 24
+       WB_Extend = 4,
+       WB_ExtendNumLet = 5,
+       WB_Format = 6,
+       WB_Hebrew_Letter = 7,
+       WB_Katakana = 8,
+       WB_LF = 9,
+       WB_MidLetter = 10,
+       WB_MidNum = 11,
+       WB_MidNumLet = 12,
+       WB_Newline = 13,
+       WB_Numeric = 14,
+       WB_Perl_Tailored_HSpace = 15,
+       WB_Regional_Indicator = 16,
+       WB_Single_Quote = 17,
+       WB_XPG_LE = 18,
+       WB_XPG_XX = 19,
+       WB_ZWJ = 20,
+       WB_EDGE = 21,
+       WB_E_Base = 22,
+       WB_E_Base_GAZ = 22,
+       WB_E_Modifier = 22,
+       WB_Glue_After_Zwj = 22,
+       WB_UNKNOWN = 22
 } WB_enum;
 
-static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
+static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Other,
        WB_Perl_Tailored_HSpace,
        WB_Other,
@@ -90164,8 +92417,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
        WB_MidLetter,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Format,
@@ -90217,6 +92472,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_MidNum,
        WB_Other,
        WB_Extend,
@@ -90288,6 +92546,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -90358,6 +92618,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_Extend,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -90490,7 +92752,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Numeric,
        WB_Other,
        WB_Extend,
-       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -90810,6 +93071,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -90877,10 +93142,14 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_Perl_Tailored_HSpace,
@@ -90906,6 +93175,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
@@ -90915,6 +93186,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90924,23 +93196,87 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90990,10 +93326,11 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_Other,
+       WB_XPG_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -91010,6 +93347,10 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_Katakana,
        WB_Other,
+       WB_XPG_XX,
+       WB_Other,
+       WB_XPG_XX,
+       WB_Other,
        WB_Katakana,
        WB_Other,
        WB_Katakana,
@@ -91037,8 +93378,6 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
-       WB_ALetter,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -91061,7 +93400,7 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_Other,
+       WB_Extend,
        WB_Numeric,
        WB_ALetter,
        WB_Extend,
@@ -91341,6 +93680,18 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
        WB_Extend,
        WB_ALetter,
        WB_Extend,
@@ -91353,6 +93704,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_Format,
        WB_Other,
+       WB_Format,
+       WB_Other,
        WB_ALetter,
        WB_Other,
        WB_Numeric,
@@ -91367,6 +93720,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Extend,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_Extend,
        WB_ALetter,
@@ -91441,6 +93797,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_Numeric,
        WB_Other,
+       WB_Extend,
+       WB_Other,
        WB_ALetter,
        WB_Extend,
        WB_ALetter,
@@ -91474,6 +93832,9 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Numeric,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
        WB_Numeric,
        WB_Other,
        WB_ALetter,
@@ -91499,6 +93860,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -91534,6 +93897,23 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_Other,
+       WB_Extend,
+       WB_ALetter,
+       WB_Other,
+       WB_Numeric,
+       WB_Other,
+       WB_ALetter,
+       WB_Extend,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -91563,6 +93943,8 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
+       WB_Other,
+       WB_ALetter,
        WB_Extend,
        WB_Other,
        WB_Extend,
@@ -91755,103 +94137,65 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
-       WB_ALetter,
+       WB_XPG_XX,
        WB_Other,
+       WB_XPG_XX,
        WB_ALetter,
        WB_Other,
-       WB_Regional_Indicator,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Modifier,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base_GAZ,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_E_Base,
-       WB_Other,
-       WB_Glue_After_Zwj,
-       WB_Other,
-       WB_E_Base,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
+       WB_XPG_LE,
+       WB_ALetter,
+       WB_XPG_LE,
+       WB_ALetter,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Regional_Indicator,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
+       WB_Extend,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_Glue_After_Zwj,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
-       WB_E_Base,
+       WB_XPG_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -91865,12 +94209,12 @@ static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_UTF8_C)
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */
-       1266,   /* Number of elements */
+static const UV Simple_Case_Folding_invlist[] = {  /* for ASCII/Latin1 */
+       1274,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -92480,6 +94824,10 @@ static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -93126,6 +95474,8 @@ static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFF21,
@@ -93138,11 +95488,21 @@ static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
-static const int Simple_Case_Folding_invmap[] = { /* for ASCII/Latin1 */
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
+static const int Simple_Case_Folding_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x61,
        0,
@@ -93749,6 +96109,10 @@ static const int Simple_Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -94395,6 +96759,8 @@ static const int Simple_Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        0xFF41,
@@ -94407,19 +96773,25 @@ static const int Simple_Case_Folding_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */
-       1284,   /* Number of elements */
+static const UV Simple_Case_Folding_invlist[] = {  /* for EBCDIC 1047 */
+       1292,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -95047,6 +97419,10 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -95693,6 +98069,8 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFF21,
@@ -95705,11 +98083,24 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
-static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 1047 */
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
+static const int Simple_Case_Folding_invmap[] = {  /* for EBCDIC 1047 */
        0,
        0x42,
        0,
@@ -96334,6 +98725,10 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -96980,6 +99375,8 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        0xFF41,
@@ -96992,19 +99389,25 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */
-       1280,   /* Number of elements */
+static const UV Simple_Case_Folding_invlist[] = {  /* for EBCDIC 037 */
+       1288,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -97628,6 +100031,10 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0x1C87,
        0x1C88,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -98274,6 +100681,8 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFF21,
@@ -98286,11 +100695,24 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
 
-static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 037 */
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
+static const int Simple_Case_Folding_invmap[] = {  /* for EBCDIC 037 */
        0,
        0x42,
        0,
@@ -98911,6 +101333,10 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0x463,
        0xA64B,
        0,
+       0x10D0,
+       0,
+       0x10FD,
+       0,
        0x1E01,
        0,
        0x1E03,
@@ -99557,6 +101983,8 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B7,
        0,
+       0xA7B9,
+       0,
        0x13A0,
        0,
        0xFF41,
@@ -99569,16 +101997,22 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118C0,
        0,
+       0x16E60,
+       0,
        0x1E922,
        0
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV Titlecase_Mapping_invlist[] = { /* for ASCII/Latin1 */
-       1318,   /* Number of elements */
+static const UV Titlecase_Mapping_invlist[] = {  /* for ASCII/Latin1 */
+       1322,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -100871,6 +103305,8 @@ static const UV Titlecase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -100898,10 +103334,20 @@ static const UV Titlecase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -101247,6 +103693,7 @@ static const unsigned int * const TC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 TC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* TC_AUX_TABLE_1 */,
@@ -101296,7 +103743,7 @@ static const U8 TC_AUX_TABLE_lengths[] = {
        2       /* TC_AUX_TABLE_45 */
 };
 
-static const int Titlecase_Mapping_invmap[] = { /* for ASCII/Latin1 */
+static const int Titlecase_Mapping_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x41,
        0,
@@ -102586,6 +105033,8 @@ static const int Titlecase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -102613,19 +105062,25 @@ static const int Titlecase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 1047 */
-       1334,   /* Number of elements */
+static const UV Titlecase_Mapping_invlist[] = {  /* for EBCDIC 1047 */
+       1338,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -103934,6 +106389,8 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -103961,10 +106418,23 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -104310,6 +106780,7 @@ static const unsigned int * const TC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 TC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* TC_AUX_TABLE_1 */,
@@ -104359,7 +106830,7 @@ static const U8 TC_AUX_TABLE_lengths[] = {
        2       /* TC_AUX_TABLE_45 */
 };
 
-static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 1047 */
+static const int Titlecase_Mapping_invmap[] = {  /* for EBCDIC 1047 */
        0,
        0x62,
        0,
@@ -105665,6 +108136,8 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -105692,19 +108165,25 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 037 */
-       1332,   /* Number of elements */
+static const UV Titlecase_Mapping_invlist[] = {  /* for EBCDIC 037 */
+       1336,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -107011,6 +109490,8 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -107038,10 +109519,23 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -107387,6 +109881,7 @@ static const unsigned int * const TC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 TC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* TC_AUX_TABLE_1 */,
@@ -107436,7 +109931,7 @@ static const U8 TC_AUX_TABLE_lengths[] = {
        2       /* TC_AUX_TABLE_45 */
 };
 
-static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 037 */
+static const int Titlecase_Mapping_invmap[] = {  /* for EBCDIC 037 */
        0,
        0x62,
        0,
@@ -108740,6 +111235,8 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -108767,16 +111264,22 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
-       1365,   /* Number of elements */
+static const UV Uppercase_Mapping_invlist[] = {  /* for ASCII/Latin1 */
+       1373,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -109398,6 +111901,10 @@ static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0x561,
        0x587,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -110116,6 +112623,8 @@ static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -110143,10 +112652,20 @@ static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* ASCII/Latin1 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -110681,6 +113200,7 @@ static const unsigned int * const UC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 UC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* UC_AUX_TABLE_1 */,
@@ -110757,7 +113277,7 @@ static const U8 UC_AUX_TABLE_lengths[] = {
        2       /* UC_AUX_TABLE_72 */
 };
 
-static const int Uppercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
+static const int Uppercase_Mapping_invmap[] = {  /* for ASCII/Latin1 */
        0,
        0x41,
        0,
@@ -111376,6 +113896,10 @@ static const int Uppercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0x531,
        UC_use_AUX_TABLE_6,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0x13F0,
        0,
        0x412,
@@ -112094,6 +114618,8 @@ static const int Uppercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -112121,19 +114647,25 @@ static const int Uppercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* ASCII/Latin1 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 1047 */ \
      && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
-       1381,   /* Number of elements */
+static const UV Uppercase_Mapping_invlist[] = {  /* for EBCDIC 1047 */
+       1389,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -112771,6 +115303,10 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0x561,
        0x587,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -113489,6 +116025,8 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -113516,10 +116054,23 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* EBCDIC 1047 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -114054,6 +116605,7 @@ static const unsigned int * const UC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 UC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* UC_AUX_TABLE_1 */,
@@ -114130,7 +116682,7 @@ static const U8 UC_AUX_TABLE_lengths[] = {
        2       /* UC_AUX_TABLE_72 */
 };
 
-static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
+static const int Uppercase_Mapping_invmap[] = {  /* for EBCDIC 1047 */
        0,
        0x62,
        0,
@@ -114765,6 +117317,10 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0x531,
        UC_use_AUX_TABLE_6,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0x13F0,
        0,
        0x412,
@@ -115483,6 +118039,8 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -115510,19 +118068,25 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* EBCDIC 1047 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 193 /* EBCDIC 037 */ \
      && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */
-       1379,   /* Number of elements */
+static const UV Uppercase_Mapping_invlist[] = {  /* for EBCDIC 037 */
+       1387,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -116158,6 +118722,10 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0x561,
        0x587,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -116876,6 +119444,8 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -116903,10 +119473,23 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
+#  endif       /* EBCDIC 037 */
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
+
+#if defined(PERL_IN_UTF8_C)
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
 /* Negative enum values indicate the need to use an auxiliary table
  * consisting of the list of enums this one expands to.  The absolute
  * values of the negative enums are indices into a table of the auxiliary
@@ -117441,6 +120024,7 @@ static const unsigned int * const UC_AUX_TABLE_ptrs[] = {
 
 /* Parallel table to the above, giving the number of elements in each table
  * pointed to */
+
 static const U8 UC_AUX_TABLE_lengths[] = {
        0,      /* Placeholder */
        2       /* UC_AUX_TABLE_1 */,
@@ -117517,7 +120101,7 @@ static const U8 UC_AUX_TABLE_lengths[] = {
        2       /* UC_AUX_TABLE_72 */
 };
 
-static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 037 */
+static const int Uppercase_Mapping_invmap[] = {  /* for EBCDIC 037 */
        0,
        0x62,
        0,
@@ -118150,6 +120734,10 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0x531,
        UC_use_AUX_TABLE_6,
        0,
+       0x1C90,
+       0,
+       0x1CBD,
+       0,
        0x13F0,
        0,
        0x412,
@@ -118868,6 +121456,8 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0xA7B6,
        0,
+       0xA7B8,
+       0,
        0xA7B3,
        0,
        0x13A0,
@@ -118895,15 +121485,21 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 037 */
        0,
        0x118A0,
        0,
+       0x16E40,
+       0,
        0x1E900,
        0
 };
 
 #  endif       /* EBCDIC 037 */
 
+#endif /* defined(PERL_IN_UTF8_C) */
+
+#if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE))
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV UpperLatin1_invlist[] = { /* for ASCII/Latin1 */
+static const UV UpperLatin1_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -118920,7 +121516,7 @@ static const UV UpperLatin1_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV UpperLatin1_invlist[] = { /* for EBCDIC 1047 */
+static const UV UpperLatin1_invlist[] = {  /* for EBCDIC 1047 */
        55,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -118989,7 +121585,7 @@ static const UV UpperLatin1_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV UpperLatin1_invlist[] = { /* for EBCDIC 037 */
+static const UV UpperLatin1_invlist[] = {  /* for EBCDIC 037 */
        57,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -119057,7 +121653,7 @@ static const UV UpperLatin1_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_ASCII_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_ASCII_invlist[] = {  /* for ASCII/Latin1 */
        2,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -119073,7 +121669,7 @@ static const UV PL_ASCII_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ASCII_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_ASCII_invlist[] = {  /* for EBCDIC 1047 */
        54,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -119141,7 +121737,7 @@ static const UV PL_ASCII_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ASCII_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_ASCII_invlist[] = {  /* for EBCDIC 037 */
        56,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -119206,8 +121802,8 @@ static const UV PL_ASCII_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
-       1298,   /* Number of elements */
+static const UV UNI_ASSIGNED_invlist[] = {  /* for all charsets */
+       1316,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -119226,10 +121822,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -119237,7 +121829,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -119249,7 +121841,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -119263,7 +121855,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -119290,7 +121882,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -119322,7 +121914,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -119412,8 +122004,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -119436,8 +122026,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -119630,7 +122218,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -119679,7 +122267,9 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -119740,13 +122330,9 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -119782,7 +122368,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -119798,7 +122384,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -119812,7 +122398,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -119822,9 +122408,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -119836,8 +122420,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -120040,11 +122622,11 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -120072,15 +122654,23 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -120088,7 +122678,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -120129,7 +122719,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -120150,7 +122740,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -120170,11 +122760,13 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -120184,8 +122776,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -120217,6 +122807,20 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -120251,6 +122855,8 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -120260,7 +122866,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -120285,10 +122891,12 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -120355,6 +122963,8 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -120438,8 +123048,6 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -120458,11 +123066,11 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -120478,15 +123086,21 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -120513,8 +123127,8 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
-       271,    /* Number of elements */
+static const UV UNI_CASED_invlist[] = {  /* for ASCII/Latin1 */
+       279,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -120571,20 +123185,28 @@ static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1DC0,
        0x1E00,
@@ -120690,9 +123312,7 @@ static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -120721,6 +123341,8 @@ static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -120798,8 +123420,8 @@ static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CASED_invlist[] = { /* for EBCDIC 1047 */
-       297,    /* Number of elements */
+static const UV UNI_CASED_invlist[] = {  /* for EBCDIC 1047 */
+       305,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -120882,20 +123504,28 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 1047 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1DC0,
        0x1E00,
@@ -121001,9 +123631,7 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 1047 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -121032,6 +123660,8 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -121109,8 +123739,8 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
-       293,    /* Number of elements */
+static const UV UNI_CASED_invlist[] = {  /* for EBCDIC 037 */
+       301,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -121189,20 +123819,28 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1DC0,
        0x1E00,
@@ -121308,9 +123946,7 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -121339,6 +123975,8 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -121413,8 +124051,8 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
-       253,    /* Number of elements */
+static const UV UNI_CASEDLETTER_invlist[] = {  /* for ASCII/Latin1 */
+       261,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -121461,20 +124099,28 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1D2C,
        0x1D6B,
@@ -121578,9 +124224,7 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -121609,6 +124253,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -121680,8 +124326,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */
-       285,    /* Number of elements */
+static const UV UNI_CASEDLETTER_invlist[] = {  /* for EBCDIC 1047 */
+       293,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -121760,20 +124406,28 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1D2C,
        0x1D6B,
@@ -121877,9 +124531,7 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -121908,6 +124560,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -121979,8 +124633,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
-       281,    /* Number of elements */
+static const UV UNI_CASEDLETTER_invlist[] = {  /* for EBCDIC 037 */
+       289,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -122055,20 +124709,28 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
        0x530,
        0x531,
        0x557,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x10A0,
        0x10C6,
        0x10C7,
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D00,
        0x1D2C,
        0x1D6B,
@@ -122172,9 +124834,7 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
        0xA78B,
        0xA78F,
        0xA790,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -122203,6 +124863,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -122271,8 +124933,8 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
-       1267,   /* Number of elements */
+static const UV UNI_LOWERCASELETTER_invlist[] = {  /* for ASCII/Latin1 */
+       1277,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -122815,8 +125477,12 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -123459,10 +126125,14 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -123485,6 +126155,8 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -123552,8 +126224,8 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
-       1281,   /* Number of elements */
+static const UV UNI_LOWERCASELETTER_invlist[] = {  /* for EBCDIC 1047 */
+       1291,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -124110,8 +126782,12 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -124754,10 +127430,14 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -124780,6 +127460,8 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -124847,8 +127529,8 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */
-       1281,   /* Number of elements */
+static const UV UNI_LOWERCASELETTER_invlist[] = {  /* for EBCDIC 037 */
+       1291,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -125405,8 +128087,12 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -126049,10 +128735,14 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7FA,
        0xA7FB,
        0xAB30,
@@ -126075,6 +128765,8 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -126139,7 +128831,7 @@ static const UV PL_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXALNUM_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126160,7 +128852,7 @@ static const UV PL_POSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXALNUM_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126189,7 +128881,7 @@ static const UV PL_POSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXALNUM_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXALNUM_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126215,7 +128907,7 @@ static const UV PL_POSIXALNUM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXALPHA_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126234,7 +128926,7 @@ static const UV PL_POSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXALPHA_invlist[] = {  /* for EBCDIC 1047 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126261,7 +128953,7 @@ static const UV PL_POSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXALPHA_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXALPHA_invlist[] = {  /* for EBCDIC 037 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126285,7 +128977,7 @@ static const UV PL_POSIXALPHA_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXBLANK_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXBLANK_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126304,7 +128996,7 @@ static const UV PL_POSIXBLANK_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXBLANK_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXBLANK_invlist[] = {  /* for EBCDIC 1047 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126323,7 +129015,7 @@ static const UV PL_POSIXBLANK_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXBLANK_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXBLANK_invlist[] = {  /* for EBCDIC 037 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126339,7 +129031,7 @@ static const UV PL_POSIXBLANK_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXCNTRL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXCNTRL_invlist[] = {  /* for ASCII/Latin1 */
        4,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -126357,7 +129049,7 @@ static const UV PL_POSIXCNTRL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXCNTRL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXCNTRL_invlist[] = {  /* for EBCDIC 1047 */
        26,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -126397,7 +129089,7 @@ static const UV PL_POSIXCNTRL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXCNTRL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXCNTRL_invlist[] = {  /* for EBCDIC 037 */
        26,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -126434,7 +129126,7 @@ static const UV PL_POSIXCNTRL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXDIGIT_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126451,7 +129143,7 @@ static const UV PL_POSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXDIGIT_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126468,7 +129160,7 @@ static const UV PL_POSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXDIGIT_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126482,7 +129174,7 @@ static const UV PL_POSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXGRAPH_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126499,7 +129191,7 @@ static const UV PL_POSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXGRAPH_invlist[] = {  /* for EBCDIC 1047 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126542,7 +129234,7 @@ static const UV PL_POSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXGRAPH_invlist[] = {  /* for EBCDIC 037 */
        31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126584,7 +129276,7 @@ static const UV PL_POSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXLOWER_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126601,7 +129293,7 @@ static const UV PL_POSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXLOWER_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126622,7 +129314,7 @@ static const UV PL_POSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXLOWER_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXLOWER_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126640,7 +129332,7 @@ static const UV PL_POSIXLOWER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXPRINT_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126657,7 +129349,7 @@ static const UV PL_POSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXPRINT_invlist[] = {  /* for EBCDIC 1047 */
        31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126702,7 +129394,7 @@ static const UV PL_POSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXPRINT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXPRINT_invlist[] = {  /* for EBCDIC 037 */
        33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126746,7 +129438,7 @@ static const UV PL_POSIXPRINT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXPUNCT_invlist[] = {  /* for ASCII/Latin1 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126769,7 +129461,7 @@ static const UV PL_POSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXPUNCT_invlist[] = {  /* for EBCDIC 1047 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126804,7 +129496,7 @@ static const UV PL_POSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXPUNCT_invlist[] = {  /* for EBCDIC 037 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126838,7 +129530,7 @@ static const UV PL_POSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXSPACE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXSPACE_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126857,7 +129549,7 @@ static const UV PL_POSIXSPACE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXSPACE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXSPACE_invlist[] = {  /* for EBCDIC 1047 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126880,7 +129572,7 @@ static const UV PL_POSIXSPACE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXSPACE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXSPACE_invlist[] = {  /* for EBCDIC 037 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126900,7 +129592,7 @@ static const UV PL_POSIXSPACE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXUPPER_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126917,7 +129609,7 @@ static const UV PL_POSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXUPPER_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126938,7 +129630,7 @@ static const UV PL_POSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXUPPER_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXUPPER_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126956,7 +129648,7 @@ static const UV PL_POSIXUPPER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXWORD_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXWORD_invlist[] = {  /* for ASCII/Latin1 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -126979,7 +129671,7 @@ static const UV PL_POSIXWORD_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXWORD_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXWORD_invlist[] = {  /* for EBCDIC 1047 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127010,7 +129702,7 @@ static const UV PL_POSIXWORD_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXWORD_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXWORD_invlist[] = {  /* for EBCDIC 037 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127038,7 +129730,7 @@ static const UV PL_POSIXWORD_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_POSIXXDIGIT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_POSIXXDIGIT_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127059,7 +129751,7 @@ static const UV PL_POSIXXDIGIT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXXDIGIT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_POSIXXDIGIT_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127080,7 +129772,7 @@ static const UV PL_POSIXXDIGIT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_POSIXXDIGIT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_POSIXXDIGIT_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127096,7 +129788,7 @@ static const UV PL_POSIXXDIGIT_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_TITLE_invlist[] = { /* for all charsets */
+static const UV UNI_TITLE_invlist[] = {  /* for all charsets */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -127126,8 +129818,8 @@ static const UV PL_TITLE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
-       1255,   /* Number of elements */
+static const UV UNI_UPPERCASELETTER_invlist[] = {  /* for ASCII/Latin1 */
+       1263,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -127684,6 +130376,10 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -128312,6 +131008,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -128322,6 +131020,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -128395,8 +131095,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
-       1273,   /* Number of elements */
+static const UV UNI_UPPERCASELETTER_invlist[] = {  /* for EBCDIC 1047 */
+       1281,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -128971,6 +131671,10 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -129599,6 +132303,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -129609,6 +132315,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -129682,8 +132390,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */
-       1269,   /* Number of elements */
+static const UV UNI_UPPERCASELETTER_invlist[] = {  /* for EBCDIC 037 */
+       1277,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -130254,6 +132962,10 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -130882,6 +133594,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -130892,6 +133606,8 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -130962,7 +133678,7 @@ static const UV PL_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_VERTSPACE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_VERTSPACE_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -130983,7 +133699,7 @@ static const UV PL_VERTSPACE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VERTSPACE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_VERTSPACE_invlist[] = {  /* for EBCDIC 1047 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -131006,7 +133722,7 @@ static const UV PL_VERTSPACE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VERTSPACE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_VERTSPACE_invlist[] = {  /* for EBCDIC 037 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -131026,8 +133742,8 @@ static const UV PL_VERTSPACE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
-       1391,   /* Number of elements */
+static const UV UNI_XPOSIXALNUM_invlist[] = {  /* for ASCII/Latin1 */
+       1427,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -131086,8 +133802,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -131100,7 +133816,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -131565,7 +134281,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -131620,6 +134336,10 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -131763,7 +134483,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -131773,7 +134493,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -131793,9 +134513,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -131817,7 +134535,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA92B,
        0xA930,
@@ -132019,7 +134737,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -132042,6 +134760,16 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11066,
@@ -132056,6 +134784,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x11133,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -132151,11 +134881,13 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
        0x11730,
        0x1173A,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -132168,6 +134900,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -132204,6 +134938,22 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -132232,6 +134982,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -132241,7 +134993,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -132431,8 +135183,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
-       1415,   /* Number of elements */
+static const UV UNI_XPOSIXALNUM_invlist[] = {  /* for EBCDIC 1047 */
+       1451,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -132515,8 +135267,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -132529,7 +135281,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -132994,7 +135746,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -133049,6 +135801,10 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -133192,7 +135948,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -133202,7 +135958,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -133222,9 +135978,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -133246,7 +136000,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA92B,
        0xA930,
@@ -133448,7 +136202,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -133471,6 +136225,16 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11066,
@@ -133485,6 +136249,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x11133,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -133580,11 +136346,13 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
        0x11730,
        0x1173A,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -133597,6 +136365,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -133633,6 +136403,22 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -133661,6 +136447,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -133670,7 +136458,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -133860,8 +136648,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
-       1411,   /* Number of elements */
+static const UV UNI_XPOSIXALNUM_invlist[] = {  /* for EBCDIC 037 */
+       1447,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -133940,8 +136728,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -133954,7 +136742,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -134419,7 +137207,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -134474,6 +137262,10 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -134617,7 +137409,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -134627,7 +137419,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -134647,9 +137439,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -134671,7 +137461,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA92B,
        0xA930,
@@ -134873,7 +137663,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -134896,6 +137686,16 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11066,
@@ -134910,6 +137710,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x11133,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -135005,11 +137807,13 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
        0x11730,
        0x1173A,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -135022,6 +137826,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -135058,6 +137864,22 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -135086,6 +137908,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -135095,7 +137919,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -135282,8 +138106,8 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
-       1321,   /* Number of elements */
+static const UV UNI_XPOSIXALPHA_invlist[] = {  /* for ASCII/Latin1 */
+       1353,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -135340,8 +138164,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -135354,7 +138178,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -135793,7 +138617,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -135842,6 +138666,10 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -135985,7 +138813,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -135995,7 +138823,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -136017,9 +138845,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -136039,7 +138865,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA92B,
        0xA930,
@@ -136235,7 +139061,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -136258,6 +139084,14 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11082,
@@ -136266,6 +139100,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11100,
        0x11133,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -136351,9 +139187,11 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116B6,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -136366,6 +139204,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -136398,6 +139238,20 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x11D44,
        0x11D46,
        0x11D48,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -136422,6 +139276,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -136431,7 +139287,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -136617,8 +139473,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
-       1347,   /* Number of elements */
+static const UV UNI_XPOSIXALPHA_invlist[] = {  /* for EBCDIC 1047 */
+       1379,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -136701,8 +139557,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -136715,7 +139571,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -137154,7 +140010,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -137203,6 +140059,10 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -137346,7 +140206,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -137356,7 +140216,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -137378,9 +140238,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -137400,7 +140258,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA92B,
        0xA930,
@@ -137596,7 +140454,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -137619,6 +140477,14 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11082,
@@ -137627,6 +140493,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11100,
        0x11133,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -137712,9 +140580,11 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116B6,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -137727,6 +140597,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -137759,6 +140631,20 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x11D44,
        0x11D46,
        0x11D48,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -137783,6 +140669,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -137792,7 +140680,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -137978,8 +140866,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
-       1343,   /* Number of elements */
+static const UV UNI_XPOSIXALPHA_invlist[] = {  /* for EBCDIC 037 */
+       1375,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -138058,8 +140946,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5B0,
        0x5BE,
        0x5BF,
@@ -138072,7 +140960,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -138511,7 +141399,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -138560,6 +141448,10 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -138703,7 +141595,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -138713,7 +141605,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -138735,9 +141627,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -138757,7 +141647,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA92B,
        0xA930,
@@ -138953,7 +141843,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -138976,6 +141866,14 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11000,
        0x11046,
        0x11082,
@@ -138984,6 +141882,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11100,
        0x11133,
+       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11176,
@@ -139069,9 +141969,11 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116B6,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172B,
+       0x11800,
+       0x11839,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -139084,6 +141986,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A98,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -139116,6 +142020,20 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x11D44,
        0x11D46,
        0x11D48,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -139140,6 +142058,8 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -139149,7 +142069,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -139332,7 +142252,7 @@ static const UV PL_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXBLANK_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_XPOSIXBLANK_invlist[] = {  /* for ASCII/Latin1 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -139363,7 +142283,7 @@ static const UV PL_XPOSIXBLANK_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXBLANK_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_XPOSIXBLANK_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -139392,7 +142312,7 @@ static const UV PL_XPOSIXBLANK_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXBLANK_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_XPOSIXBLANK_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -139418,7 +142338,7 @@ static const UV PL_XPOSIXBLANK_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXCNTRL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_XPOSIXCNTRL_invlist[] = {  /* for ASCII/Latin1 */
        4,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -139436,7 +142356,7 @@ static const UV PL_XPOSIXCNTRL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXCNTRL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_XPOSIXCNTRL_invlist[] = {  /* for EBCDIC 1047 */
        4,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -139454,7 +142374,7 @@ static const UV PL_XPOSIXCNTRL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXCNTRL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_XPOSIXCNTRL_invlist[] = {  /* for EBCDIC 037 */
        4,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -139469,8 +142389,8 @@ static const UV PL_XPOSIXCNTRL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
-       111,    /* Number of elements */
+static const UV UNI_XPOSIXDIGIT_invlist[] = {  /* for ASCII/Latin1 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -139551,6 +142471,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
        0xFF1A,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -139577,6 +142499,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -139594,8 +142518,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
-       111,    /* Number of elements */
+static const UV UNI_XPOSIXDIGIT_invlist[] = {  /* for EBCDIC 1047 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -139676,6 +142600,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
        0xFF1A,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -139702,6 +142628,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -139719,8 +142647,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
-       111,    /* Number of elements */
+static const UV UNI_XPOSIXDIGIT_invlist[] = {  /* for EBCDIC 037 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -139801,6 +142729,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
        0xFF1A,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -139827,6 +142757,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -139841,8 +142773,8 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
-       1309,   /* Number of elements */
+static const UV UNI_XPOSIXGRAPH_invlist[] = {  /* for ASCII/Latin1 */
+       1327,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -139864,10 +142796,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -139875,7 +142803,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -139887,7 +142815,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -139901,7 +142829,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -139928,7 +142856,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -139960,7 +142888,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -140050,8 +142978,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -140074,8 +143000,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -140270,7 +143194,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -140319,7 +143243,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -140386,13 +143312,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -140428,7 +143350,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -140444,7 +143366,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -140458,7 +143380,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -140468,9 +143390,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -140482,8 +143402,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -140686,11 +143604,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -140718,15 +143636,23 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -140734,7 +143660,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -140775,7 +143701,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -140796,7 +143722,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -140816,11 +143742,13 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -140830,8 +143758,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -140863,6 +143789,20 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -140897,6 +143837,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -140906,7 +143848,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -140931,10 +143873,12 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -141001,6 +143945,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -141084,8 +144030,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -141104,11 +144048,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -141124,15 +144068,21 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -141164,8 +144114,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
-       1309,   /* Number of elements */
+static const UV UNI_XPOSIXGRAPH_invlist[] = {  /* for EBCDIC 1047 */
+       1327,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -141187,10 +144137,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -141198,7 +144144,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -141210,7 +144156,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -141224,7 +144170,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -141251,7 +144197,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -141283,7 +144229,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -141373,8 +144319,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -141397,8 +144341,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -141593,7 +144535,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -141642,7 +144584,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -141709,13 +144653,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -141751,7 +144691,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -141767,7 +144707,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -141781,7 +144721,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -141791,9 +144731,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -141805,8 +144743,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -142009,11 +144945,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -142041,15 +144977,23 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -142057,7 +145001,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -142098,7 +145042,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -142119,7 +145063,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -142139,11 +145083,13 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -142153,8 +145099,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -142186,6 +145130,20 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -142220,6 +145178,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -142229,7 +145189,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -142254,10 +145214,12 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -142324,6 +145286,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -142407,8 +145371,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -142427,11 +145389,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -142447,15 +145409,21 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -142487,8 +145455,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
-       1309,   /* Number of elements */
+static const UV UNI_XPOSIXGRAPH_invlist[] = {  /* for EBCDIC 037 */
+       1327,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -142510,10 +145478,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -142521,7 +145485,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -142533,7 +145497,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -142547,7 +145511,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -142574,7 +145538,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -142606,7 +145570,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -142696,8 +145660,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -142720,8 +145682,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -142916,7 +145876,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -142965,7 +145925,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -143032,13 +145994,9 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -143074,7 +146032,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -143090,7 +146048,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -143104,7 +146062,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -143114,9 +146072,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -143128,8 +146084,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -143332,11 +146286,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -143364,15 +146318,23 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -143380,7 +146342,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -143421,7 +146383,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -143442,7 +146404,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -143462,11 +146424,13 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -143476,8 +146440,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -143509,6 +146471,20 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -143543,6 +146519,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -143552,7 +146530,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -143577,10 +146555,12 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -143647,6 +146627,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -143730,8 +146712,6 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -143750,11 +146730,11 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -143770,15 +146750,21 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -143807,8 +146793,8 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
-       1281,   /* Number of elements */
+static const UV UNI_XPOSIXLOWER_invlist[] = {  /* for ASCII/Latin1 */
+       1291,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -144361,8 +147347,12 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -145009,10 +147999,14 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -145035,6 +148029,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -145102,8 +148098,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
-       1289,   /* Number of elements */
+static const UV UNI_XPOSIXLOWER_invlist[] = {  /* for EBCDIC 1047 */
+       1299,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -145664,8 +148660,12 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -146312,10 +149312,14 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -146338,6 +149342,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -146405,8 +149411,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
-       1289,   /* Number of elements */
+static const UV UNI_XPOSIXLOWER_invlist[] = {  /* for EBCDIC 037 */
+       1299,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -146967,8 +149973,12 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -147615,10 +150625,14 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -147641,6 +150655,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -147705,8 +150721,8 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
-       1303,   /* Number of elements */
+static const UV UNI_XPOSIXPRINT_invlist[] = {  /* for ASCII/Latin1 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -147728,10 +150744,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -147739,7 +150751,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -147751,7 +150763,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -147765,7 +150777,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -147792,7 +150804,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -147824,7 +150836,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -147914,8 +150926,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -147938,8 +150948,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -148132,7 +151140,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -148181,7 +151189,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -148244,13 +151254,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -148286,7 +151292,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -148302,7 +151308,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -148316,7 +151322,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -148326,9 +151332,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -148340,8 +151344,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -148544,11 +151546,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -148576,15 +151578,23 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -148592,7 +151602,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -148633,7 +151643,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -148654,7 +151664,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -148674,11 +151684,13 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -148688,8 +151700,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -148721,6 +151731,20 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -148755,6 +151779,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -148764,7 +151790,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -148789,10 +151815,12 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -148859,6 +151887,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -148942,8 +151972,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -148962,11 +151990,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -148982,15 +152010,21 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -149022,8 +152056,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
-       1303,   /* Number of elements */
+static const UV UNI_XPOSIXPRINT_invlist[] = {  /* for EBCDIC 1047 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -149045,10 +152079,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -149056,7 +152086,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -149068,7 +152098,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -149082,7 +152112,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -149109,7 +152139,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -149141,7 +152171,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -149231,8 +152261,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -149255,8 +152283,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -149449,7 +152475,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -149498,7 +152524,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -149561,13 +152589,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -149603,7 +152627,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -149619,7 +152643,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -149633,7 +152657,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -149643,9 +152667,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -149657,8 +152679,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -149861,11 +152881,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -149893,15 +152913,23 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -149909,7 +152937,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -149950,7 +152978,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -149971,7 +152999,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -149991,11 +153019,13 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -150005,8 +153035,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -150038,6 +153066,20 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -150072,6 +153114,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -150081,7 +153125,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -150106,10 +153150,12 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -150176,6 +153222,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -150259,8 +153307,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -150279,11 +153325,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -150299,15 +153345,21 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -150339,8 +153391,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
-       1303,   /* Number of elements */
+static const UV UNI_XPOSIXPRINT_invlist[] = {  /* for EBCDIC 037 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -150362,10 +153414,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -150373,7 +153421,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -150385,7 +153433,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -150399,7 +153447,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -150426,7 +153474,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -150458,7 +153506,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -150548,8 +153596,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -150572,8 +153618,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -150766,7 +153810,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -150815,7 +153859,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -150878,13 +153924,9 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -150920,7 +153962,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -150936,7 +153978,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -150950,7 +153992,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -150960,9 +154002,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -150974,8 +154014,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -151178,11 +154216,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -151210,15 +154248,23 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -151226,7 +154272,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -151267,7 +154313,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -151288,7 +154334,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -151308,11 +154354,13 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -151322,8 +154370,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -151355,6 +154401,20 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -151389,6 +154449,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -151398,7 +154460,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -151423,10 +154485,12 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -151493,6 +154557,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -151576,8 +154642,6 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -151596,11 +154660,11 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -151616,15 +154680,21 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -151653,8 +154723,8 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
-       335,    /* Number of elements */
+static const UV UNI_XPOSIXPUNCT_invlist[] = {  /* for ASCII/Latin1 */
+       347,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -151723,8 +154793,12 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -151822,7 +154896,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -151929,6 +155003,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -151940,7 +155016,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -151967,6 +155043,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -151977,6 +155055,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -151987,6 +155067,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -152002,8 +155084,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
-       343,    /* Number of elements */
+static const UV UNI_XPOSIXPUNCT_invlist[] = {  /* for EBCDIC 1047 */
+       355,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -152080,8 +155162,12 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -152179,7 +155265,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -152286,6 +155372,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -152297,7 +155385,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -152324,6 +155412,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -152334,6 +155424,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -152344,6 +155436,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -152359,8 +155453,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
-       345,    /* Number of elements */
+static const UV UNI_XPOSIXPUNCT_invlist[] = {  /* for EBCDIC 037 */
+       357,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -152439,8 +155533,12 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -152538,7 +155636,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -152645,6 +155743,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -152656,7 +155756,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -152683,6 +155783,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -152693,6 +155795,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -152703,6 +155807,8 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -152715,7 +155821,7 @@ static const UV PL_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXSPACE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_XPOSIXSPACE_invlist[] = {  /* for ASCII/Latin1 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -152750,7 +155856,7 @@ static const UV PL_XPOSIXSPACE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXSPACE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_XPOSIXSPACE_invlist[] = {  /* for EBCDIC 1047 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -152787,7 +155893,7 @@ static const UV PL_XPOSIXSPACE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXSPACE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_XPOSIXSPACE_invlist[] = {  /* for EBCDIC 037 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -152821,8 +155927,8 @@ static const UV PL_XPOSIXSPACE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
-       1265,   /* Number of elements */
+static const UV UNI_XPOSIXUPPER_invlist[] = {  /* for ASCII/Latin1 */
+       1273,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -153379,6 +156485,10 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -154011,6 +157121,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -154021,6 +157133,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -154100,8 +157214,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
-       1283,   /* Number of elements */
+static const UV UNI_XPOSIXUPPER_invlist[] = {  /* for EBCDIC 1047 */
+       1291,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -154676,6 +157790,10 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -155308,6 +158426,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -155318,6 +158438,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -155397,8 +158519,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
-       1279,   /* Number of elements */
+static const UV UNI_XPOSIXUPPER_invlist[] = {  /* for EBCDIC 037 */
+       1287,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -155969,6 +159091,10 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -156601,6 +159727,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -156611,6 +159739,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -156687,8 +159817,8 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
-       1387,   /* Number of elements */
+static const UV UNI_XPOSIXWORD_invlist[] = {  /* for ASCII/Latin1 */
+       1423,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -156747,8 +159877,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -156761,7 +159891,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -156785,6 +159915,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -156795,7 +159927,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -156831,6 +159963,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -156954,8 +160088,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -157204,7 +160336,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -157255,6 +160387,10 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -157402,7 +160538,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -157412,7 +160548,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -157432,9 +160568,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -157448,8 +160582,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -157656,7 +160788,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -157683,6 +160815,16 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -157697,13 +160839,15 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -157743,7 +160887,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -157763,6 +160907,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -157786,11 +160932,13 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -157803,6 +160951,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -157833,6 +160983,20 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -157863,6 +161027,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -157872,7 +161038,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -158088,8 +161254,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
-       1411,   /* Number of elements */
+static const UV UNI_XPOSIXWORD_invlist[] = {  /* for EBCDIC 1047 */
+       1447,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -158172,8 +161338,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -158186,7 +161352,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -158210,6 +161376,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -158220,7 +161388,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -158256,6 +161424,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -158379,8 +161549,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -158629,7 +161797,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -158680,6 +161848,10 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -158827,7 +161999,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -158837,7 +162009,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -158857,9 +162029,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -158873,8 +162043,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -159081,7 +162249,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -159108,6 +162276,16 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -159122,13 +162300,15 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -159168,7 +162348,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -159188,6 +162368,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -159211,11 +162393,13 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -159228,6 +162412,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -159258,6 +162444,20 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -159288,6 +162488,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -159297,7 +162499,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -159513,8 +162715,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
-       1407,   /* Number of elements */
+static const UV UNI_XPOSIXWORD_invlist[] = {  /* for EBCDIC 037 */
+       1443,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -159593,8 +162795,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -159607,7 +162809,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -159631,6 +162833,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -159641,7 +162845,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -159677,6 +162881,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -159800,8 +163006,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -160050,7 +163254,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -160101,6 +163305,10 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -160248,7 +163456,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -160258,7 +163466,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -160278,9 +163486,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -160294,8 +163500,6 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -160502,7 +163706,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -160529,6 +163733,16 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -160543,13 +163757,15 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -160589,7 +163805,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -160609,6 +163825,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -160632,11 +163850,13 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -160649,6 +163869,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -160679,6 +163901,20 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -160709,6 +163945,8 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -160718,7 +163956,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -160931,7 +164169,7 @@ static const UV PL_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_XPOSIXXDIGIT_invlist[] = {  /* for ASCII/Latin1 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -160958,7 +164196,7 @@ static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_XPOSIXXDIGIT_invlist[] = {  /* for EBCDIC 1047 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -160985,7 +164223,7 @@ static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_XPOSIXXDIGIT_invlist[] = {  /* for EBCDIC 037 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -161009,8 +164247,8 @@ static const UV PL_XPOSIXXDIGIT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for ASCII/Latin1 */
-       253,    /* Number of elements */
+static const UV UNI__PERL_ANY_FOLDS_invlist[] = {  /* for ASCII/Latin1 */
+       263,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -161135,12 +164373,20 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for ASCII/Latin1 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -161240,7 +164486,7 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for ASCII/Latin1 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -161265,6 +164511,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -161276,8 +164524,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 1047 */
-       285,    /* Number of elements */
+static const UV UNI__PERL_ANY_FOLDS_invlist[] = {  /* for EBCDIC 1047 */
+       295,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -161434,12 +164682,20 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 1047 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -161539,7 +164795,7 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 1047 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -161564,6 +164820,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -161575,8 +164833,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 037 */
-       281,    /* Number of elements */
+static const UV UNI__PERL_ANY_FOLDS_invlist[] = {  /* for EBCDIC 037 */
+       291,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -161729,12 +164987,20 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 037 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -161834,7 +165100,7 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 037 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -161859,6 +165125,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -161867,8 +165135,8 @@ static const UV PL__PERL_ANY_FOLDS_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
-       1183,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = {  /* for ASCII/Latin1 */
+       1211,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -161923,11 +165191,11 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -162292,7 +165560,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -162335,6 +165603,10 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -162468,7 +165740,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -162478,7 +165750,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -162500,9 +165772,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -162520,7 +165790,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -162734,7 +166004,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -162757,6 +166027,14 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -162765,6 +166043,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -162832,7 +166112,9 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -162849,6 +166131,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -162867,6 +166151,16 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -162889,6 +166183,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -162898,7 +166194,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -163064,8 +166360,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
-       1209,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = {  /* for EBCDIC 1047 */
+       1237,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -163146,11 +166442,11 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -163515,7 +166811,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -163558,6 +166854,10 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -163691,7 +166991,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -163701,7 +167001,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -163723,9 +167023,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -163743,7 +167041,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -163957,7 +167255,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -163980,6 +167278,14 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -163988,6 +167294,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -164055,7 +167363,9 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -164072,6 +167382,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -164090,6 +167402,16 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -164112,6 +167434,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -164121,7 +167445,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -164287,8 +167611,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
-       1205,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = {  /* for EBCDIC 037 */
+       1233,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -164365,11 +167689,11 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -164734,7 +168058,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -164777,6 +168101,10 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -164910,7 +168238,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -164920,7 +168248,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -164942,9 +168270,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -164962,7 +168288,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -165176,7 +168502,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -165199,6 +168525,14 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -165207,6 +168541,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -165274,7 +168610,9 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -165291,6 +168629,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -165309,6 +168649,16 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -165331,6 +168681,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -165340,7 +168692,7 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -165503,8 +168855,8 @@ static const UV PL__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
-       1399,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = {  /* for ASCII/Latin1 */
+       1435,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -165571,8 +168923,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -165585,7 +168937,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -165609,6 +168961,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -165619,7 +168973,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -165655,6 +169009,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -165778,8 +169134,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -166028,7 +169382,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -166079,6 +169433,10 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -166224,7 +169582,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -166234,7 +169592,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -166254,9 +169612,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -166270,8 +169626,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -166490,7 +169844,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -166517,6 +169871,16 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -166531,13 +169895,15 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -166577,7 +169943,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -166597,6 +169963,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -166620,11 +169988,13 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -166637,6 +170007,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -166667,6 +170039,20 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -166697,6 +170083,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -166706,7 +170094,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -166916,8 +170304,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
-       1425,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = {  /* for EBCDIC 1047 */
+       1461,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -167010,8 +170398,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -167024,7 +170412,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -167048,6 +170436,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -167058,7 +170448,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -167094,6 +170484,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -167217,8 +170609,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -167467,7 +170857,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -167518,6 +170908,10 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -167663,7 +171057,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -167673,7 +171067,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -167693,9 +171087,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -167709,8 +171101,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -167929,7 +171319,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -167956,6 +171346,16 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -167970,13 +171370,15 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -168016,7 +171418,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -168036,6 +171438,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -168059,11 +171463,13 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -168076,6 +171482,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -168106,6 +171514,20 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -168136,6 +171558,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -168145,7 +171569,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -168355,8 +171779,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
-       1421,   /* Number of elements */
+static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = {  /* for EBCDIC 037 */
+       1457,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -168445,8 +171869,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -168459,7 +171883,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -168483,6 +171907,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -168493,7 +171919,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -168529,6 +171955,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -168652,8 +172080,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -168902,7 +172328,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -168953,6 +172379,10 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -169098,7 +172528,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -169108,7 +172538,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -169128,9 +172558,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -169144,8 +172572,6 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -169364,7 +172790,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -169391,6 +172817,16 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -169405,13 +172841,15 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -169451,7 +172889,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -169471,6 +172909,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -169494,11 +172934,13 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -169511,6 +172953,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -169541,6 +172985,20 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -169571,6 +173029,8 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -169580,7 +173040,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -169787,7 +173247,7 @@ static const UV PL__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = {  /* for ASCII/Latin1 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -169860,7 +173320,7 @@ static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for ASCII/Latin1 *
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = {  /* for EBCDIC 1047 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -169933,7 +173393,7 @@ static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = {  /* for EBCDIC 037 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -170003,8 +173463,8 @@ static const UV PL__PERL_FOLDS_TO_MULTI_CHAR_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
-       1393,   /* Number of elements */
+static const UV UNI__PERL_IDCONT_invlist[] = {  /* for ASCII/Latin1 */
+       1429,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -170065,8 +173525,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -170079,7 +173539,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -170103,6 +173563,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -170113,7 +173575,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -170149,6 +173611,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -170272,8 +173736,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -170522,7 +173984,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -170573,6 +174035,10 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -170718,7 +174184,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -170728,7 +174194,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -170748,9 +174214,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -170764,8 +174228,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -170984,7 +174446,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -171011,6 +174473,16 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -171025,13 +174497,15 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -171071,7 +174545,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -171091,6 +174565,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -171114,11 +174590,13 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -171131,6 +174609,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -171161,6 +174641,20 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -171191,6 +174685,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -171200,7 +174696,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -171410,8 +174906,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
-       1417,   /* Number of elements */
+static const UV UNI__PERL_IDCONT_invlist[] = {  /* for EBCDIC 1047 */
+       1453,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -171496,8 +174992,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -171510,7 +175006,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -171534,6 +175030,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -171544,7 +175042,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -171580,6 +175078,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -171703,8 +175203,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -171953,7 +175451,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -172004,6 +175502,10 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -172149,7 +175651,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -172159,7 +175661,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -172179,9 +175681,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -172195,8 +175695,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -172415,7 +175913,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -172442,6 +175940,16 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -172456,13 +175964,15 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -172502,7 +176012,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -172522,6 +176032,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -172545,11 +176057,13 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -172562,6 +176076,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -172592,6 +176108,20 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -172622,6 +176152,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -172631,7 +176163,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -172841,8 +176373,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
-       1413,   /* Number of elements */
+static const UV UNI__PERL_IDCONT_invlist[] = {  /* for EBCDIC 037 */
+       1449,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -172923,8 +176455,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -172937,7 +176469,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -172961,6 +176493,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -172971,7 +176505,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -173007,6 +176541,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -173130,8 +176666,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -173380,7 +176914,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -173431,6 +176965,10 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -173576,7 +177114,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -173586,7 +177124,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -173606,9 +177144,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -173622,8 +177158,6 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -173842,7 +177376,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -173869,6 +177403,16 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -173883,13 +177427,15 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -173929,7 +177475,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -173949,6 +177495,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -173972,11 +177520,13 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -173989,6 +177539,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -174019,6 +177571,20 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -174049,6 +177615,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -174058,7 +177626,7 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -174265,8 +177833,8 @@ static const UV PL__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
-       1189,   /* Number of elements */
+static const UV UNI__PERL_IDSTART_invlist[] = {  /* for ASCII/Latin1 */
+       1217,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -174323,11 +177891,11 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -174692,7 +178260,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -174733,6 +178301,10 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -174868,7 +178440,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -174878,7 +178450,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -174900,9 +178472,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -174920,7 +178490,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -175136,7 +178706,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -175159,6 +178729,14 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -175167,6 +178745,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -175234,7 +178814,9 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -175251,6 +178833,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -175269,6 +178853,16 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -175293,6 +178887,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -175302,7 +178898,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -175468,8 +179064,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
-       1215,   /* Number of elements */
+static const UV UNI__PERL_IDSTART_invlist[] = {  /* for EBCDIC 1047 */
+       1243,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -175552,11 +179148,11 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -175921,7 +179517,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -175962,6 +179558,10 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -176097,7 +179697,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -176107,7 +179707,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -176129,9 +179729,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -176149,7 +179747,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -176365,7 +179963,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -176388,6 +179986,14 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -176396,6 +180002,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -176463,7 +180071,9 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -176480,6 +180090,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -176498,6 +180110,16 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -176522,6 +180144,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -176531,7 +180155,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -176697,8 +180321,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
-       1211,   /* Number of elements */
+static const UV UNI__PERL_IDSTART_invlist[] = {  /* for EBCDIC 037 */
+       1239,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -176777,11 +180401,11 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -177146,7 +180770,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -177187,6 +180811,10 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -177322,7 +180950,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -177332,7 +180960,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -177354,9 +180982,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -177374,7 +181000,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -177590,7 +181216,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -177613,6 +181239,14 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -177621,6 +181255,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -177688,7 +181324,9 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -177705,6 +181343,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -177723,6 +181363,16 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -177747,6 +181397,8 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -177756,7 +181408,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -177917,7 +181569,7 @@ static const UV PL__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist[] = { /* for all charsets */
+static const UV UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist[] = {  /* for all charsets */
        26,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -177950,7 +181602,7 @@ static const UV PL__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist[] = { /* for a
        0xFB07
 };
 
-static const UV PL__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist[] = { /* for all charsets */
+static const UV UNI__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist[] = {  /* for all charsets */
        24,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -177983,7 +181635,7 @@ static const UV PL__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist[] = { /* for all chars
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI__PERL_QUOTEMETA_invlist[] = {  /* for ASCII/Latin1 */
        78,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -178075,7 +181727,7 @@ static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI__PERL_QUOTEMETA_invlist[] = {  /* for EBCDIC 1047 */
        92,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -178181,7 +181833,7 @@ static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI__PERL_QUOTEMETA_invlist[] = {  /* for EBCDIC 037 */
        90,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -178280,7 +181932,7 @@ static const UV PL__PERL_QUOTEMETA_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_ADLM_invlist[] = { /* for all charsets */
+static const UV UNI_ADLM_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178296,7 +181948,7 @@ static const UV PL_ADLM_invlist[] = { /* for all charsets */
        0x1E960
 };
 
-static const UV PL_AEGEANNUMBERS_invlist[] = { /* for all charsets */
+static const UV UNI_AEGEANNUMBERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178306,7 +181958,7 @@ static const UV PL_AEGEANNUMBERS_invlist[] = { /* for all charsets */
        0x10140
 };
 
-static const UV PL_AGE__10_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__10_invlist[] = {  /* for all charsets */
        81,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178394,7 +182046,133 @@ static const UV PL_AGE__10_invlist[] = { /* for all charsets */
        0x2EBE1
 };
 
-static const UV PL_AGE__2_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__11_invlist[] = {  /* for all charsets */
+       119,    /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x560,
+       0x561,
+       0x588,
+       0x589,
+       0x5EF,
+       0x5F0,
+       0x7FD,
+       0x800,
+       0x8D3,
+       0x8D4,
+       0x9FE,
+       0x9FF,
+       0xA76,
+       0xA77,
+       0xC04,
+       0xC05,
+       0xC84,
+       0xC85,
+       0x1878,
+       0x1879,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
+       0x2BBA,
+       0x2BBD,
+       0x2BD3,
+       0x2BEC,
+       0x2BF0,
+       0x2BFF,
+       0x2E4A,
+       0x2E4F,
+       0x312F,
+       0x3130,
+       0x9FEB,
+       0x9FF0,
+       0xA7AF,
+       0xA7B0,
+       0xA7B8,
+       0xA7BA,
+       0xA8FE,
+       0xA900,
+       0x10A34,
+       0x10A36,
+       0x10A48,
+       0x10A49,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
+       0x110CD,
+       0x110CE,
+       0x11144,
+       0x11147,
+       0x1133B,
+       0x1133C,
+       0x1145E,
+       0x1145F,
+       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1183C,
+       0x11A9D,
+       0x11A9E,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
+       0x16E40,
+       0x16E9B,
+       0x187ED,
+       0x187F2,
+       0x1D2E0,
+       0x1D2F4,
+       0x1D372,
+       0x1D379,
+       0x1EC71,
+       0x1ECB5,
+       0x1F12F,
+       0x1F130,
+       0x1F6F9,
+       0x1F6FA,
+       0x1F7D5,
+       0x1F7D9,
+       0x1F94D,
+       0x1F950,
+       0x1F96C,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F980,
+       0x1F998,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
+       0x1F9C1,
+       0x1F9C3,
+       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
+};
+
+static const UV UNI_AGE__2_invlist[] = {  /* for all charsets */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178460,7 +182238,7 @@ static const UV PL_AGE__2_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_AGE__2_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__2_DOT_1_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178472,7 +182250,7 @@ static const UV PL_AGE__2_DOT_1_invlist[] = { /* for all charsets */
        0xFFFD
 };
 
-static const UV PL_AGE__3_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__3_invlist[] = {  /* for all charsets */
        243,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178722,7 +182500,7 @@ static const UV PL_AGE__3_invlist[] = { /* for all charsets */
        0xFFFC
 };
 
-static const UV PL_AGE__3_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__3_DOT_1_invlist[] = {  /* for all charsets */
        73,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178802,7 +182580,7 @@ static const UV PL_AGE__3_DOT_1_invlist[] = { /* for all charsets */
        0xE0080
 };
 
-static const UV PL_AGE__3_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__3_DOT_2_invlist[] = {  /* for all charsets */
        119,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -178928,7 +182706,7 @@ static const UV PL_AGE__3_DOT_2_invlist[] = { /* for all charsets */
        0xFF61
 };
 
-static const UV PL_AGE__4_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__4_invlist[] = {  /* for all charsets */
        155,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179090,7 +182868,7 @@ static const UV PL_AGE__4_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_AGE__4_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__4_DOT_1_invlist[] = {  /* for all charsets */
        173,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179270,7 +183048,7 @@ static const UV PL_AGE__4_DOT_1_invlist[] = { /* for all charsets */
        0x1D6A6
 };
 
-static const UV PL_AGE__5_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__5_invlist[] = {  /* for all charsets */
        71,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179348,7 +183126,7 @@ static const UV PL_AGE__5_invlist[] = { /* for all charsets */
        0x1D7CC
 };
 
-static const UV PL_AGE__5_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__5_DOT_1_invlist[] = {  /* for all charsets */
        179,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179534,7 +183312,7 @@ static const UV PL_AGE__5_DOT_1_invlist[] = { /* for all charsets */
        0x1F094
 };
 
-static const UV PL_AGE__5_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__5_DOT_2_invlist[] = {  /* for all charsets */
        181,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179722,7 +183500,7 @@ static const UV PL_AGE__5_DOT_2_invlist[] = { /* for all charsets */
        0x2B735
 };
 
-static const UV PL_AGE__6_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__6_invlist[] = {  /* for all charsets */
        213,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -179942,7 +183720,7 @@ static const UV PL_AGE__6_invlist[] = { /* for all charsets */
        0x2B81E
 };
 
-static const UV PL_AGE__6_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__6_DOT_1_invlist[] = {  /* for all charsets */
        179,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180128,7 +183906,7 @@ static const UV PL_AGE__6_DOT_1_invlist[] = { /* for all charsets */
        0x1F635
 };
 
-static const UV PL_AGE__6_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__6_DOT_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180138,7 +183916,7 @@ static const UV PL_AGE__6_DOT_2_invlist[] = { /* for all charsets */
        0x20BB
 };
 
-static const UV PL_AGE__6_DOT_3_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__6_DOT_3_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180150,7 +183928,7 @@ static const UV PL_AGE__6_DOT_3_invlist[] = { /* for all charsets */
        0x206A
 };
 
-static const UV PL_AGE__7_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__7_invlist[] = {  /* for all charsets */
        283,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180440,7 +184218,7 @@ static const UV PL_AGE__7_invlist[] = { /* for all charsets */
        0x1F8AE
 };
 
-static const UV PL_AGE__8_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__8_invlist[] = {  /* for all charsets */
        119,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180566,7 +184344,7 @@ static const UV PL_AGE__8_invlist[] = { /* for all charsets */
        0x2CEA2
 };
 
-static const UV PL_AGE__9_invlist[] = { /* for all charsets */
+static const UV UNI_AGE__9_invlist[] = {  /* for all charsets */
        105,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -180678,8 +184456,8 @@ static const UV PL_AGE__9_invlist[] = { /* for all charsets */
        0x1F992
 };
 
-static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
-       1318,   /* Number of elements */
+static const UV UNI_AGE__NA_invlist[] = {  /* for all charsets */
+       1336,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -180698,10 +184476,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -180709,7 +184483,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -180721,7 +184495,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -180735,7 +184509,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -180762,7 +184536,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -180794,7 +184568,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -180884,8 +184658,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -180908,8 +184680,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -181102,7 +184872,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -181151,7 +184921,9 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -181212,13 +184984,9 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -181254,7 +185022,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -181270,7 +185038,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -181284,7 +185052,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -181294,9 +185062,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -181308,8 +185074,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -181510,11 +185274,11 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -181542,15 +185306,23 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -181558,7 +185330,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -181599,7 +185371,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -181620,7 +185392,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -181640,11 +185412,13 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -181654,8 +185428,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -181687,6 +185459,20 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -181721,6 +185507,8 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -181730,7 +185518,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -181755,10 +185543,12 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -181825,6 +185615,8 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -181908,8 +185700,6 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -181928,11 +185718,11 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -181948,15 +185738,21 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x1FFFE,
        0x2A6D7,
        0x2A700,
@@ -182003,7 +185799,7 @@ static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_AGHB_invlist[] = { /* for all charsets */
+static const UV UNI_AGHB_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182015,21 +185811,21 @@ static const UV PL_AGHB_invlist[] = { /* for all charsets */
        0x10570
 };
 
-static const UV PL_AHOM_invlist[] = { /* for all charsets */
+static const UV UNI_AHOM_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740
 };
 
-static const UV PL_ALCHEMICAL_invlist[] = { /* for all charsets */
+static const UV UNI_ALCHEMICAL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182039,7 +185835,7 @@ static const UV PL_ALCHEMICAL_invlist[] = { /* for all charsets */
        0x1F780
 };
 
-static const UV PL_ALL_invlist[] = { /* for all charsets */
+static const UV UNI_ALL_invlist[] = {  /* for all charsets */
        1,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -182047,7 +185843,7 @@ static const UV PL_ALL_invlist[] = { /* for all charsets */
        0x0
 };
 
-static const UV PL_ALPHABETICPF_invlist[] = { /* for all charsets */
+static const UV UNI_ALPHABETICPF_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182057,7 +185853,7 @@ static const UV PL_ALPHABETICPF_invlist[] = { /* for all charsets */
        0xFB50
 };
 
-static const UV PL_ANCIENTGREEKMUSIC_invlist[] = { /* for all charsets */
+static const UV UNI_ANCIENTGREEKMUSIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182067,7 +185863,7 @@ static const UV PL_ANCIENTGREEKMUSIC_invlist[] = { /* for all charsets */
        0x1D250
 };
 
-static const UV PL_ANCIENTGREEKNUMBERS_invlist[] = { /* for all charsets */
+static const UV UNI_ANCIENTGREEKNUMBERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182077,7 +185873,7 @@ static const UV PL_ANCIENTGREEKNUMBERS_invlist[] = { /* for all charsets */
        0x10190
 };
 
-static const UV PL_ANCIENTSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_ANCIENTSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182087,7 +185883,7 @@ static const UV PL_ANCIENTSYMBOLS_invlist[] = { /* for all charsets */
        0x101D0
 };
 
-static const UV PL_ANY_invlist[] = { /* for all charsets */
+static const UV UNI_ANY_invlist[] = {  /* for all charsets */
        2,      /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -182096,7 +185892,7 @@ static const UV PL_ANY_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_ARAB_invlist[] = { /* for all charsets */
+static const UV UNI_ARAB_invlist[] = {  /* for all charsets */
        105,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182116,7 +185912,7 @@ static const UV PL_ARAB_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -182208,7 +186004,7 @@ static const UV PL_ARAB_invlist[] = { /* for all charsets */
        0x1EEF2
 };
 
-static const UV PL_ARABICEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_ARABICEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182218,7 +186014,7 @@ static const UV PL_ARABICEXTA_invlist[] = { /* for all charsets */
        0x900
 };
 
-static const UV PL_ARABICMATH_invlist[] = { /* for all charsets */
+static const UV UNI_ARABICMATH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182228,7 +186024,7 @@ static const UV PL_ARABICMATH_invlist[] = { /* for all charsets */
        0x1EF00
 };
 
-static const UV PL_ARABICPFA_invlist[] = { /* for all charsets */
+static const UV UNI_ARABICPFA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182238,7 +186034,7 @@ static const UV PL_ARABICPFA_invlist[] = { /* for all charsets */
        0xFE00
 };
 
-static const UV PL_ARABICPFB_invlist[] = { /* for all charsets */
+static const UV UNI_ARABICPFB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182248,7 +186044,7 @@ static const UV PL_ARABICPFB_invlist[] = { /* for all charsets */
        0xFF00
 };
 
-static const UV PL_ARABICSUP_invlist[] = { /* for all charsets */
+static const UV UNI_ARABICSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182258,7 +186054,7 @@ static const UV PL_ARABICSUP_invlist[] = { /* for all charsets */
        0x780
 };
 
-static const UV PL_ARMI_invlist[] = { /* for all charsets */
+static const UV UNI_ARMI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182270,8 +186066,8 @@ static const UV PL_ARMI_invlist[] = { /* for all charsets */
        0x10860
 };
 
-static const UV PL_ARMN_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_ARMN_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -182279,10 +186075,6 @@ static const UV PL_ARMN_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -182290,7 +186082,7 @@ static const UV PL_ARMN_invlist[] = { /* for all charsets */
        0xFB18
 };
 
-static const UV PL_ARROWS_invlist[] = { /* for all charsets */
+static const UV UNI_ARROWS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182300,7 +186092,7 @@ static const UV PL_ARROWS_invlist[] = { /* for all charsets */
        0x2200
 };
 
-static const UV PL_AVST_invlist[] = { /* for all charsets */
+static const UV UNI_AVST_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182312,7 +186104,7 @@ static const UV PL_AVST_invlist[] = { /* for all charsets */
        0x10B40
 };
 
-static const UV PL_BALI_invlist[] = { /* for all charsets */
+static const UV UNI_BALI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182324,7 +186116,7 @@ static const UV PL_BALI_invlist[] = { /* for all charsets */
        0x1B7D
 };
 
-static const UV PL_BAMU_invlist[] = { /* for all charsets */
+static const UV UNI_BAMU_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182336,7 +186128,7 @@ static const UV PL_BAMU_invlist[] = { /* for all charsets */
        0x16A39
 };
 
-static const UV PL_BAMUMSUP_invlist[] = { /* for all charsets */
+static const UV UNI_BAMUMSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182346,7 +186138,7 @@ static const UV PL_BAMUMSUP_invlist[] = { /* for all charsets */
        0x16A40
 };
 
-static const UV PL_BASS_invlist[] = { /* for all charsets */
+static const UV UNI_BASS_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182358,7 +186150,7 @@ static const UV PL_BASS_invlist[] = { /* for all charsets */
        0x16AF6
 };
 
-static const UV PL_BATK_invlist[] = { /* for all charsets */
+static const UV UNI_BATK_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182370,8 +186162,8 @@ static const UV PL_BATK_invlist[] = { /* for all charsets */
        0x1C00
 };
 
-static const UV PL_BC__AL_invlist[] = { /* for all charsets */
-       43,     /* Number of elements */
+static const UV UNI_BC__AL_invlist[] = {  /* for all charsets */
+       55,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -182403,7 +186195,7 @@ static const UV PL_BC__AL_invlist[] = { /* for all charsets */
        0x860,
        0x870,
        0x8A0,
-       0x8D4,
+       0x8D3,
        0xFB50,
        0xFD3E,
        0xFD40,
@@ -182414,14 +186206,26 @@ static const UV PL_BC__AL_invlist[] = { /* for all charsets */
        0xFE00,
        0xFE70,
        0xFEFF,
+       0x10D00,
+       0x10D24,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10D40,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F70,
+       0x1EC70,
+       0x1ECC0,
        0x1EE00,
        0x1EEF0,
        0x1EEF2,
        0x1EF00
 };
 
-static const UV PL_BC__AN_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_BC__AN_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -182436,13 +186240,15 @@ static const UV PL_BC__AN_invlist[] = { /* for all charsets */
        0x6DE,
        0x8E2,
        0x8E3,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__B_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__B_invlist[] = {  /* for ASCII/Latin1 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182467,7 +186273,7 @@ static const UV PL_BC__B_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__B_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__B_invlist[] = {  /* for EBCDIC 1047 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182492,7 +186298,7 @@ static const UV PL_BC__B_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__B_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__B_invlist[] = {  /* for EBCDIC 037 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182514,7 +186320,7 @@ static const UV PL_BC__B_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__BN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__BN_invlist[] = {  /* for ASCII/Latin1 */
        64,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -182592,7 +186398,7 @@ static const UV PL_BC__BN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__BN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__BN_invlist[] = {  /* for EBCDIC 1047 */
        70,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -182676,7 +186482,7 @@ static const UV PL_BC__BN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__BN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__BN_invlist[] = {  /* for EBCDIC 037 */
        70,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -182757,7 +186563,7 @@ static const UV PL_BC__BN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__CS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__CS_invlist[] = {  /* for ASCII/Latin1 */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182798,7 +186604,7 @@ static const UV PL_BC__CS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__CS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__CS_invlist[] = {  /* for EBCDIC 1047 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182841,7 +186647,7 @@ static const UV PL_BC__CS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__CS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__CS_invlist[] = {  /* for EBCDIC 037 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182881,7 +186687,7 @@ static const UV PL_BC__CS_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__EN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__EN_invlist[] = {  /* for ASCII/Latin1 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182920,7 +186726,7 @@ static const UV PL_BC__EN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__EN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__EN_invlist[] = {  /* for EBCDIC 1047 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182959,7 +186765,7 @@ static const UV PL_BC__EN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__EN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__EN_invlist[] = {  /* for EBCDIC 037 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -182995,7 +186801,7 @@ static const UV PL_BC__EN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__ES_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__ES_invlist[] = {  /* for ASCII/Latin1 */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183028,7 +186834,7 @@ static const UV PL_BC__ES_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ES_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__ES_invlist[] = {  /* for EBCDIC 1047 */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183061,7 +186867,7 @@ static const UV PL_BC__ES_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ES_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__ES_invlist[] = {  /* for EBCDIC 037 */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183091,7 +186897,7 @@ static const UV PL_BC__ES_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__ET_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__ET_invlist[] = {  /* for ASCII/Latin1 */
        45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183150,7 +186956,7 @@ static const UV PL_BC__ET_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ET_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__ET_invlist[] = {  /* for EBCDIC 1047 */
        53,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183217,7 +187023,7 @@ static const UV PL_BC__ET_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ET_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__ET_invlist[] = {  /* for EBCDIC 037 */
        53,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183279,7 +187085,7 @@ static const UV PL_BC__ET_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BC__FSI_invlist[] = { /* for all charsets */
+static const UV UNI_BC__FSI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -183291,8 +187097,8 @@ static const UV PL_BC__FSI_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
-       860,    /* Number of elements */
+static const UV UNI_BC__L_invlist[] = {  /* for ASCII/Latin1 */
+       884,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -183364,6 +187170,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x9F4,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -183420,6 +187228,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0xBFB,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -183705,13 +187515,9 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CEF,
@@ -183721,7 +187527,7 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x2D7F,
        0x2D80,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -183800,6 +187606,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -183908,7 +187716,7 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -183924,7 +187732,7 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -183938,6 +187746,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -183976,6 +187786,10 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
        0x11A07,
        0x11A09,
@@ -184016,6 +187830,14 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -184086,6 +187908,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x1F0F6,
        0x1F100,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -184095,11 +187919,11 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -184115,15 +187939,21 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x1FFFE,
        0x20000,
        0x2FFFE,
@@ -184165,8 +187995,8 @@ static const UV PL_BC__L_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
-       886,    /* Number of elements */
+static const UV UNI_BC__L_invlist[] = {  /* for EBCDIC 1047 */
+       910,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -184264,6 +188094,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x9F4,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -184320,6 +188152,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0xBFB,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -184605,13 +188439,9 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CEF,
@@ -184621,7 +188451,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x2D7F,
        0x2D80,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -184700,6 +188530,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -184808,7 +188640,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -184824,7 +188656,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -184838,6 +188670,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -184876,6 +188710,10 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
        0x11A07,
        0x11A09,
@@ -184916,6 +188754,14 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -184986,6 +188832,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x1F0F6,
        0x1F100,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -184995,11 +188843,11 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -185015,15 +188863,21 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x1FFFE,
        0x20000,
        0x2FFFE,
@@ -185065,8 +188919,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
-       882,    /* Number of elements */
+static const UV UNI_BC__L_invlist[] = {  /* for EBCDIC 037 */
+       906,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -185160,6 +189014,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x9F4,
        0x9FB,
        0x9FC,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -185216,6 +189072,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0xBFB,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -185501,13 +189359,9 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CEF,
@@ -185517,7 +189371,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x2D7F,
        0x2D80,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -185596,6 +189450,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -185704,7 +189560,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -185720,7 +189576,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -185734,6 +189590,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -185772,6 +189630,10 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
        0x11A07,
        0x11A09,
@@ -185812,6 +189674,14 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -185882,6 +189752,8 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x1F0F6,
        0x1F100,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -185891,11 +189763,11 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -185911,15 +189783,21 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x1FFFE,
        0x20000,
        0x2FFFE,
@@ -185956,7 +189834,7 @@ static const UV PL_BC__L_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BC__LRE_invlist[] = { /* for all charsets */
+static const UV UNI_BC__LRE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -185966,7 +189844,7 @@ static const UV PL_BC__LRE_invlist[] = { /* for all charsets */
        0x202B
 };
 
-static const UV PL_BC__LRI_invlist[] = { /* for all charsets */
+static const UV UNI_BC__LRI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -185976,7 +189854,7 @@ static const UV PL_BC__LRI_invlist[] = { /* for all charsets */
        0x2067
 };
 
-static const UV PL_BC__LRO_invlist[] = { /* for all charsets */
+static const UV UNI_BC__LRO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -185986,8 +189864,8 @@ static const UV PL_BC__LRO_invlist[] = { /* for all charsets */
        0x202E
 };
 
-static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
-       593,    /* Number of elements */
+static const UV UNI_BC__NSM_invlist[] = {  /* for all charsets */
+       619,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -186028,6 +189906,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -186038,7 +189918,7 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -186064,6 +189944,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -186116,6 +189998,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -186340,6 +190224,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -186410,6 +190296,10 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -186432,7 +190322,7 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -186448,7 +190338,7 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -186462,6 +190352,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -186498,6 +190390,10 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
        0x11A07,
        0x11A09,
@@ -186538,6 +190434,14 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -186588,8 +190492,8 @@ static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
-       355,    /* Number of elements */
+static const UV UNI_BC__ON_invlist[] = {  /* for ASCII/Latin1 */
+       359,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -186751,19 +190655,15 @@ static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CF9,
        0x2D00,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -186910,6 +190810,8 @@ static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
        0x1F0F6,
        0x1F10B,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -186919,11 +190821,11 @@ static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -186939,15 +190841,21 @@ static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -186957,8 +190865,8 @@ static const UV PL_BC__ON_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
-       363,    /* Number of elements */
+static const UV UNI_BC__ON_invlist[] = {  /* for EBCDIC 1047 */
+       367,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -187128,19 +191036,15 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CF9,
        0x2D00,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -187287,6 +191191,8 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
        0x1F0F6,
        0x1F10B,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -187296,11 +191202,11 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -187316,15 +191222,21 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -187334,8 +191246,8 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
-       359,    /* Number of elements */
+static const UV UNI_BC__ON_invlist[] = {  /* for EBCDIC 037 */
+       363,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -187501,19 +191413,15 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2CF9,
        0x2D00,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -187660,6 +191568,8 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
        0x1F0F6,
        0x1F10B,
        0x1F10D,
+       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F260,
@@ -187669,11 +191579,11 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -187689,20 +191599,26 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BC__PDF_invlist[] = { /* for all charsets */
+static const UV UNI_BC__PDF_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187712,7 +191628,7 @@ static const UV PL_BC__PDF_invlist[] = { /* for all charsets */
        0x202D
 };
 
-static const UV PL_BC__PDI_invlist[] = { /* for all charsets */
+static const UV UNI_BC__PDI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187722,8 +191638,8 @@ static const UV PL_BC__PDI_invlist[] = { /* for all charsets */
        0x206A
 };
 
-static const UV PL_BC__R_invlist[] = { /* for all charsets */
-       67,     /* Number of elements */
+static const UV UNI_BC__R_invlist[] = {  /* for all charsets */
+       75,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -187745,6 +191661,8 @@ static const UV PL_BC__R_invlist[] = { /* for all charsets */
        0x7F4,
        0x7F6,
        0x7FA,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -187783,20 +191701,26 @@ static const UV PL_BC__R_invlist[] = { /* for all charsets */
        0x10AE7,
        0x10B39,
        0x10B40,
+       0x10D00,
+       0x10D40,
        0x10E60,
        0x10E7F,
+       0x10F30,
+       0x10F70,
        0x11000,
        0x1E800,
        0x1E8D0,
        0x1E8D7,
        0x1E944,
        0x1E94B,
+       0x1EC70,
+       0x1ECC0,
        0x1EE00,
        0x1EF00,
        0x1F000
 };
 
-static const UV PL_BC__RLE_invlist[] = { /* for all charsets */
+static const UV UNI_BC__RLE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187806,7 +191730,7 @@ static const UV PL_BC__RLE_invlist[] = { /* for all charsets */
        0x202C
 };
 
-static const UV PL_BC__RLI_invlist[] = { /* for all charsets */
+static const UV UNI_BC__RLI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187816,7 +191740,7 @@ static const UV PL_BC__RLI_invlist[] = { /* for all charsets */
        0x2068
 };
 
-static const UV PL_BC__RLO_invlist[] = { /* for all charsets */
+static const UV UNI_BC__RLO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187828,7 +191752,7 @@ static const UV PL_BC__RLO_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__S_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__S_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187849,7 +191773,7 @@ static const UV PL_BC__S_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__S_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__S_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187870,7 +191794,7 @@ static const UV PL_BC__S_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__S_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__S_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187888,7 +191812,7 @@ static const UV PL_BC__S_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BC__WS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BC__WS_invlist[] = {  /* for ASCII/Latin1 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187917,7 +191841,7 @@ static const UV PL_BC__WS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__WS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BC__WS_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187946,7 +191870,7 @@ static const UV PL_BC__WS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BC__WS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BC__WS_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -187970,8 +191894,8 @@ static const UV PL_BC__WS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BENG_invlist[] = { /* for all charsets */
-       37,     /* Number of elements */
+static const UV UNI_BENG_invlist[] = {  /* for all charsets */
+       51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -188007,14 +191931,28 @@ static const UV PL_BENG_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
-       0x1CF7,
+       0x9FF,
+       0x1CD0,
+       0x1CD1,
+       0x1CD2,
+       0x1CD3,
+       0x1CD5,
+       0x1CD7,
+       0x1CD8,
+       0x1CD9,
+       0x1CE1,
+       0x1CE2,
+       0x1CEA,
+       0x1CEB,
+       0x1CED,
+       0x1CEE,
+       0x1CF5,
        0x1CF8,
        0xA8F1,
        0xA8F2
 };
 
-static const UV PL_BHKS_invlist[] = { /* for all charsets */
+static const UV UNI_BHKS_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188030,7 +191968,7 @@ static const UV PL_BHKS_invlist[] = { /* for all charsets */
        0x11C6D
 };
 
-static const UV PL_BIDIC_invlist[] = { /* for all charsets */
+static const UV UNI_BIDIC_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188048,8 +191986,8 @@ static const UV PL_BIDIC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BIDIM_invlist[] = { /* for ASCII/Latin1 */
-       223,    /* Number of elements */
+static const UV UNI_BIDIM_invlist[] = {  /* for ASCII/Latin1 */
+       227,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -188161,6 +192099,8 @@ static const UV PL_BIDIM_invlist[] = { /* for ASCII/Latin1 */
        0x2983,
        0x2999,
        0x299B,
+       0x29A1,
+       0x29A2,
        0x29B0,
        0x29B8,
        0x29B9,
@@ -188230,6 +192170,8 @@ static const UV PL_BIDIM_invlist[] = { /* for ASCII/Latin1 */
        0x2AFC,
        0x2AFD,
        0x2AFE,
+       0x2BFE,
+       0x2BFF,
        0x2E02,
        0x2E06,
        0x2E09,
@@ -188285,8 +192227,8 @@ static const UV PL_BIDIM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 1047 */
-       221,    /* Number of elements */
+static const UV UNI_BIDIM_invlist[] = {  /* for EBCDIC 1047 */
+       225,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -188396,6 +192338,8 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 1047 */
        0x2983,
        0x2999,
        0x299B,
+       0x29A1,
+       0x29A2,
        0x29B0,
        0x29B8,
        0x29B9,
@@ -188465,6 +192409,8 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 1047 */
        0x2AFC,
        0x2AFD,
        0x2AFE,
+       0x2BFE,
+       0x2BFF,
        0x2E02,
        0x2E06,
        0x2E09,
@@ -188520,8 +192466,8 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 037 */
-       219,    /* Number of elements */
+static const UV UNI_BIDIM_invlist[] = {  /* for EBCDIC 037 */
+       223,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -188629,6 +192575,8 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 037 */
        0x2983,
        0x2999,
        0x299B,
+       0x29A1,
+       0x29A2,
        0x29B0,
        0x29B8,
        0x29B9,
@@ -188698,6 +192646,8 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 037 */
        0x2AFC,
        0x2AFD,
        0x2AFE,
+       0x2BFE,
+       0x2BFF,
        0x2E02,
        0x2E06,
        0x2E09,
@@ -188748,7 +192698,7 @@ static const UV PL_BIDIM_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BLOCKELEMENTS_invlist[] = { /* for all charsets */
+static const UV UNI_BLOCKELEMENTS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188758,7 +192708,7 @@ static const UV PL_BLOCKELEMENTS_invlist[] = { /* for all charsets */
        0x25A0
 };
 
-static const UV PL_BOPO_invlist[] = { /* for all charsets */
+static const UV UNI_BOPO_invlist[] = {  /* for all charsets */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188781,7 +192731,7 @@ static const UV PL_BOPO_invlist[] = { /* for all charsets */
        0x30FB,
        0x30FC,
        0x3105,
-       0x312F,
+       0x3130,
        0x31A0,
        0x31BB,
        0xFE45,
@@ -188790,7 +192740,7 @@ static const UV PL_BOPO_invlist[] = { /* for all charsets */
        0xFF66
 };
 
-static const UV PL_BOPOMOFOEXT_invlist[] = { /* for all charsets */
+static const UV UNI_BOPOMOFOEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188800,7 +192750,7 @@ static const UV PL_BOPOMOFOEXT_invlist[] = { /* for all charsets */
        0x31C0
 };
 
-static const UV PL_BOXDRAWING_invlist[] = { /* for all charsets */
+static const UV UNI_BOXDRAWING_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188812,7 +192762,7 @@ static const UV PL_BOXDRAWING_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BPT__C_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BPT__C_invlist[] = {  /* for ASCII/Latin1 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -188947,7 +192897,7 @@ static const UV PL_BPT__C_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__C_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BPT__C_invlist[] = {  /* for EBCDIC 1047 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189082,7 +193032,7 @@ static const UV PL_BPT__C_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__C_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BPT__C_invlist[] = {  /* for EBCDIC 037 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189214,7 +193164,7 @@ static const UV PL_BPT__C_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BPT__N_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BPT__N_invlist[] = {  /* for ASCII/Latin1 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -189287,7 +193237,7 @@ static const UV PL_BPT__N_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__N_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BPT__N_invlist[] = {  /* for EBCDIC 1047 */
        61,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -189362,7 +193312,7 @@ static const UV PL_BPT__N_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__N_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BPT__N_invlist[] = {  /* for EBCDIC 037 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -189432,7 +193382,7 @@ static const UV PL_BPT__N_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BPT__O_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_BPT__O_invlist[] = {  /* for ASCII/Latin1 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189567,7 +193517,7 @@ static const UV PL_BPT__O_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__O_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_BPT__O_invlist[] = {  /* for EBCDIC 1047 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189702,7 +193652,7 @@ static const UV PL_BPT__O_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_BPT__O_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_BPT__O_invlist[] = {  /* for EBCDIC 037 */
        121,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189832,7 +193782,7 @@ static const UV PL_BPT__O_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BRAH_invlist[] = { /* for all charsets */
+static const UV UNI_BRAH_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189846,7 +193796,7 @@ static const UV PL_BRAH_invlist[] = { /* for all charsets */
        0x11080
 };
 
-static const UV PL_BRAI_invlist[] = { /* for all charsets */
+static const UV UNI_BRAI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189856,7 +193806,7 @@ static const UV PL_BRAI_invlist[] = { /* for all charsets */
        0x2900
 };
 
-static const UV PL_BUGI_invlist[] = { /* for all charsets */
+static const UV UNI_BUGI_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189870,7 +193820,7 @@ static const UV PL_BUGI_invlist[] = { /* for all charsets */
        0xA9D0
 };
 
-static const UV PL_BUHD_invlist[] = { /* for all charsets */
+static const UV UNI_BUHD_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189882,7 +193832,7 @@ static const UV PL_BUHD_invlist[] = { /* for all charsets */
        0x1754
 };
 
-static const UV PL_BYZANTINEMUSIC_invlist[] = { /* for all charsets */
+static const UV UNI_BYZANTINEMUSIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -189894,8 +193844,8 @@ static const UV PL_BYZANTINEMUSIC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
-       1305,   /* Number of elements */
+static const UV UNI_C_invlist[] = {  /* for ASCII/Latin1 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -189919,10 +193869,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -189930,7 +193876,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x61C,
@@ -189944,7 +193890,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -189958,7 +193904,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x984,
@@ -189987,7 +193933,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -190019,7 +193965,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -190109,8 +194055,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -190133,8 +194077,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -190327,7 +194269,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -190376,7 +194318,9 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -190441,13 +194385,9 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -190483,7 +194423,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -190499,7 +194439,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -190513,7 +194453,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -190523,9 +194463,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -190537,8 +194475,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -190739,11 +194675,11 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -190771,9 +194707,15 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -190789,7 +194731,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -190830,7 +194772,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -190851,7 +194793,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -190871,11 +194813,13 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -190885,8 +194829,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -190918,6 +194860,20 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -190952,6 +194908,8 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -190961,7 +194919,7 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -190988,10 +194946,12 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -191058,6 +195018,8 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -191141,8 +195103,6 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -191161,11 +195121,11 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -191181,15 +195141,21 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -191213,8 +195179,8 @@ static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
-       1305,   /* Number of elements */
+static const UV UNI_C_invlist[] = {  /* for EBCDIC 1047 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -191238,10 +195204,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -191249,7 +195211,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x61C,
@@ -191263,7 +195225,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -191277,7 +195239,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x984,
@@ -191306,7 +195268,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -191338,7 +195300,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -191428,8 +195390,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -191452,8 +195412,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -191646,7 +195604,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -191695,7 +195653,9 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -191760,13 +195720,9 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -191802,7 +195758,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -191818,7 +195774,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -191832,7 +195788,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -191842,9 +195798,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -191856,8 +195810,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -192058,11 +196010,11 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -192090,9 +196042,15 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -192108,7 +196066,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -192149,7 +196107,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -192170,7 +196128,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -192190,11 +196148,13 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -192204,8 +196164,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -192237,6 +196195,20 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -192271,6 +196243,8 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -192280,7 +196254,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -192307,10 +196281,12 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -192377,6 +196353,8 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -192460,8 +196438,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -192480,11 +196456,11 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -192500,15 +196476,21 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -192532,8 +196514,8 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
-       1305,   /* Number of elements */
+static const UV UNI_C_invlist[] = {  /* for EBCDIC 037 */
+       1321,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -192557,10 +196539,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -192568,7 +196546,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x61C,
@@ -192582,7 +196560,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -192596,7 +196574,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x984,
@@ -192625,7 +196603,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -192657,7 +196635,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -192747,8 +196725,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -192771,8 +196747,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -192965,7 +196939,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -193014,7 +196988,9 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -193079,13 +197055,9 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -193121,7 +197093,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -193137,7 +197109,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -193151,7 +197123,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -193161,9 +197133,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -193175,8 +197145,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -193377,11 +197345,11 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -193409,9 +197377,15 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
@@ -193427,7 +197401,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -193468,7 +197442,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -193489,7 +197463,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -193509,11 +197483,13 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -193523,8 +197499,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -193556,6 +197530,20 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -193590,6 +197578,8 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -193599,7 +197589,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -193626,10 +197616,12 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -193696,6 +197688,8 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -193779,8 +197773,6 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -193799,11 +197791,11 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -193819,15 +197811,21 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -193846,7 +197844,7 @@ static const UV PL_C_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_CAKM_invlist[] = { /* for all charsets */
+static const UV UNI_CAKM_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -193859,10 +197857,10 @@ static const UV PL_CAKM_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144
+       0x11147
 };
 
-static const UV PL_CANS_invlist[] = { /* for all charsets */
+static const UV UNI_CANS_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -193874,7 +197872,7 @@ static const UV PL_CANS_invlist[] = { /* for all charsets */
        0x18F6
 };
 
-static const UV PL_CARI_invlist[] = { /* for all charsets */
+static const UV UNI_CARI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -193884,8 +197882,8 @@ static const UV PL_CARI_invlist[] = { /* for all charsets */
        0x102D1
 };
 
-static const UV PL_CCC__0_invlist[] = { /* for all charsets */
-       337,    /* Number of elements */
+static const UV UNI_CCC__0_invlist[] = {  /* for all charsets */
+       351,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -193926,6 +197924,8 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x74B,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -193936,7 +197936,7 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -193950,6 +197950,8 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x9BD,
        0x9CD,
        0x9CE,
+       0x9FE,
+       0x9FF,
        0xA3C,
        0xA3D,
        0xA4D,
@@ -194140,6 +198142,10 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11046,
        0x11047,
        0x1107F,
@@ -194160,7 +198166,7 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x11237,
        0x112E9,
        0x112EB,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1134D,
        0x1134E,
@@ -194172,6 +198178,8 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x11443,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114C2,
        0x114C4,
        0x115BF,
@@ -194182,6 +198190,8 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x116B8,
        0x1172B,
        0x1172C,
+       0x11839,
+       0x1183B,
        0x11A34,
        0x11A35,
        0x11A47,
@@ -194194,6 +198204,8 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x11D43,
        0x11D44,
        0x11D46,
+       0x11D97,
+       0x11D98,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -194228,7 +198240,7 @@ static const UV PL_CCC__0_invlist[] = { /* for all charsets */
        0x1E94B
 };
 
-static const UV PL_CCC__1_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__1_invlist[] = {  /* for all charsets */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194258,7 +198270,7 @@ static const UV PL_CCC__1_invlist[] = { /* for all charsets */
        0x1D16A
 };
 
-static const UV PL_CCC__10_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__10_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194268,7 +198280,7 @@ static const UV PL_CCC__10_invlist[] = { /* for all charsets */
        0x5B1
 };
 
-static const UV PL_CCC__103_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__103_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194278,7 +198290,7 @@ static const UV PL_CCC__103_invlist[] = { /* for all charsets */
        0xE3A
 };
 
-static const UV PL_CCC__107_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__107_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194288,7 +198300,7 @@ static const UV PL_CCC__107_invlist[] = { /* for all charsets */
        0xE4C
 };
 
-static const UV PL_CCC__11_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__11_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194298,7 +198310,7 @@ static const UV PL_CCC__11_invlist[] = { /* for all charsets */
        0x5B2
 };
 
-static const UV PL_CCC__118_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__118_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194308,7 +198320,7 @@ static const UV PL_CCC__118_invlist[] = { /* for all charsets */
        0xEBA
 };
 
-static const UV PL_CCC__12_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__12_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194318,7 +198330,7 @@ static const UV PL_CCC__12_invlist[] = { /* for all charsets */
        0x5B3
 };
 
-static const UV PL_CCC__122_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__122_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194328,7 +198340,7 @@ static const UV PL_CCC__122_invlist[] = { /* for all charsets */
        0xECC
 };
 
-static const UV PL_CCC__129_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__129_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194338,7 +198350,7 @@ static const UV PL_CCC__129_invlist[] = { /* for all charsets */
        0xF72
 };
 
-static const UV PL_CCC__13_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__13_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194348,7 +198360,7 @@ static const UV PL_CCC__13_invlist[] = { /* for all charsets */
        0x5B4
 };
 
-static const UV PL_CCC__130_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__130_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194362,7 +198374,7 @@ static const UV PL_CCC__130_invlist[] = { /* for all charsets */
        0xF81
 };
 
-static const UV PL_CCC__132_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__132_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194372,14 +198384,7 @@ static const UV PL_CCC__132_invlist[] = { /* for all charsets */
        0xF75
 };
 
-static const UV PL_CCC__133_invlist[] = { /* for ASCII/Latin1 */
-       0,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       0,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-};
-
-static const UV PL_CCC__14_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__14_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194389,7 +198394,7 @@ static const UV PL_CCC__14_invlist[] = { /* for all charsets */
        0x5B5
 };
 
-static const UV PL_CCC__15_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__15_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194399,7 +198404,7 @@ static const UV PL_CCC__15_invlist[] = { /* for all charsets */
        0x5B6
 };
 
-static const UV PL_CCC__16_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__16_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194409,7 +198414,7 @@ static const UV PL_CCC__16_invlist[] = { /* for all charsets */
        0x5B7
 };
 
-static const UV PL_CCC__17_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__17_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194419,7 +198424,7 @@ static const UV PL_CCC__17_invlist[] = { /* for all charsets */
        0x5B8
 };
 
-static const UV PL_CCC__18_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__18_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194431,7 +198436,7 @@ static const UV PL_CCC__18_invlist[] = { /* for all charsets */
        0x5C8
 };
 
-static const UV PL_CCC__19_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__19_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194441,7 +198446,7 @@ static const UV PL_CCC__19_invlist[] = { /* for all charsets */
        0x5BB
 };
 
-static const UV PL_CCC__20_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__20_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194451,7 +198456,7 @@ static const UV PL_CCC__20_invlist[] = { /* for all charsets */
        0x5BC
 };
 
-static const UV PL_CCC__202_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__202_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194465,7 +198470,7 @@ static const UV PL_CCC__202_invlist[] = { /* for all charsets */
        0x1DD1
 };
 
-static const UV PL_CCC__21_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__21_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194475,7 +198480,7 @@ static const UV PL_CCC__21_invlist[] = { /* for all charsets */
        0x5BD
 };
 
-static const UV PL_CCC__214_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__214_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194485,7 +198490,7 @@ static const UV PL_CCC__214_invlist[] = { /* for all charsets */
        0x1DCF
 };
 
-static const UV PL_CCC__216_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__216_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194501,7 +198506,7 @@ static const UV PL_CCC__216_invlist[] = { /* for all charsets */
        0x1D173
 };
 
-static const UV PL_CCC__22_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__22_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194511,7 +198516,7 @@ static const UV PL_CCC__22_invlist[] = { /* for all charsets */
        0x5BE
 };
 
-static const UV PL_CCC__23_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__23_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194521,7 +198526,7 @@ static const UV PL_CCC__23_invlist[] = { /* for all charsets */
        0x5C0
 };
 
-static const UV PL_CCC__24_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__24_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194531,7 +198536,7 @@ static const UV PL_CCC__24_invlist[] = { /* for all charsets */
        0x5C2
 };
 
-static const UV PL_CCC__25_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__25_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194541,7 +198546,7 @@ static const UV PL_CCC__25_invlist[] = { /* for all charsets */
        0x5C3
 };
 
-static const UV PL_CCC__26_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__26_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194551,7 +198556,7 @@ static const UV PL_CCC__26_invlist[] = { /* for all charsets */
        0xFB1F
 };
 
-static const UV PL_CCC__27_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__27_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194563,7 +198568,7 @@ static const UV PL_CCC__27_invlist[] = { /* for all charsets */
        0x8F1
 };
 
-static const UV PL_CCC__28_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__28_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194575,7 +198580,7 @@ static const UV PL_CCC__28_invlist[] = { /* for all charsets */
        0x8F2
 };
 
-static const UV PL_CCC__29_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__29_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194587,7 +198592,7 @@ static const UV PL_CCC__29_invlist[] = { /* for all charsets */
        0x8F3
 };
 
-static const UV PL_CCC__30_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__30_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194599,7 +198604,7 @@ static const UV PL_CCC__30_invlist[] = { /* for all charsets */
        0x64F
 };
 
-static const UV PL_CCC__31_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__31_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194611,7 +198616,7 @@ static const UV PL_CCC__31_invlist[] = { /* for all charsets */
        0x650
 };
 
-static const UV PL_CCC__32_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__32_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194623,7 +198628,7 @@ static const UV PL_CCC__32_invlist[] = { /* for all charsets */
        0x651
 };
 
-static const UV PL_CCC__33_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__33_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194633,7 +198638,7 @@ static const UV PL_CCC__33_invlist[] = { /* for all charsets */
        0x652
 };
 
-static const UV PL_CCC__34_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__34_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194643,7 +198648,7 @@ static const UV PL_CCC__34_invlist[] = { /* for all charsets */
        0x653
 };
 
-static const UV PL_CCC__35_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__35_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194653,7 +198658,7 @@ static const UV PL_CCC__35_invlist[] = { /* for all charsets */
        0x671
 };
 
-static const UV PL_CCC__36_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__36_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194663,8 +198668,8 @@ static const UV PL_CCC__36_invlist[] = { /* for all charsets */
        0x712
 };
 
-static const UV PL_CCC__7_invlist[] = { /* for all charsets */
-       47,     /* Number of elements */
+static const UV UNI_CCC__7_invlist[] = {  /* for all charsets */
+       49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -194701,7 +198706,7 @@ static const UV PL_CCC__7_invlist[] = { /* for all charsets */
        0x11237,
        0x112E9,
        0x112EA,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11446,
        0x11447,
@@ -194711,13 +198716,15 @@ static const UV PL_CCC__7_invlist[] = { /* for all charsets */
        0x115C1,
        0x116B7,
        0x116B8,
+       0x1183A,
+       0x1183B,
        0x11D42,
        0x11D43,
        0x1E94A,
        0x1E94B
 };
 
-static const UV PL_CCC__8_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__8_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194727,7 +198734,7 @@ static const UV PL_CCC__8_invlist[] = { /* for all charsets */
        0x309B
 };
 
-static const UV PL_CCC__84_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__84_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194737,8 +198744,8 @@ static const UV PL_CCC__84_invlist[] = { /* for all charsets */
        0xC56
 };
 
-static const UV PL_CCC__9_invlist[] = { /* for all charsets */
-       97,     /* Number of elements */
+static const UV UNI_CCC__9_invlist[] = {  /* for all charsets */
+       101,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -194829,6 +198836,8 @@ static const UV PL_CCC__9_invlist[] = { /* for all charsets */
        0x116B7,
        0x1172B,
        0x1172C,
+       0x11839,
+       0x1183A,
        0x11A34,
        0x11A35,
        0x11A47,
@@ -194838,10 +198847,12 @@ static const UV PL_CCC__9_invlist[] = { /* for all charsets */
        0x11C3F,
        0x11C40,
        0x11D44,
-       0x11D46
+       0x11D46,
+       0x11D97,
+       0x11D98
 };
 
-static const UV PL_CCC__91_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__91_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -194851,8 +198862,8 @@ static const UV PL_CCC__91_invlist[] = { /* for all charsets */
        0xC57
 };
 
-static const UV PL_CCC__A_invlist[] = { /* for all charsets */
-       221,    /* Number of elements */
+static const UV UNI_CCC__A_invlist[] = {  /* for all charsets */
+       231,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -194957,6 +198968,8 @@ static const UV PL_CCC__A_invlist[] = { /* for all charsets */
        0x952,
        0x953,
        0x955,
+       0x9FE,
+       0x9FF,
        0xF82,
        0xF84,
        0xF86,
@@ -195051,12 +199064,20 @@ static const UV PL_CCC__A_invlist[] = { /* for all charsets */
        0x10A39,
        0x10AE5,
        0x10AE6,
+       0x10D24,
+       0x10D28,
+       0x10F48,
+       0x10F4B,
+       0x10F4C,
+       0x10F4D,
        0x11100,
        0x11103,
        0x11366,
        0x1136D,
        0x11370,
        0x11375,
+       0x1145E,
+       0x1145F,
        0x16B30,
        0x16B37,
        0x1D185,
@@ -195079,7 +199100,7 @@ static const UV PL_CCC__A_invlist[] = { /* for all charsets */
        0x1E94A
 };
 
-static const UV PL_CCC__AL_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__AL_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195095,7 +199116,7 @@ static const UV PL_CCC__AL_invlist[] = { /* for all charsets */
        0x302C
 };
 
-static const UV PL_CCC__AR_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__AR_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195113,8 +199134,8 @@ static const UV PL_CCC__AR_invlist[] = { /* for all charsets */
        0x302D
 };
 
-static const UV PL_CCC__B_invlist[] = { /* for all charsets */
-       145,    /* Number of elements */
+static const UV UNI_CCC__B_invlist[] = {  /* for all charsets */
+       155,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -195181,8 +199202,12 @@ static const UV PL_CCC__B_invlist[] = { /* for all charsets */
        0x749,
        0x7F2,
        0x7F3,
+       0x7FD,
+       0x7FE,
        0x859,
        0x85C,
+       0x8D3,
+       0x8D4,
        0x8E3,
        0x8E4,
        0x8E6,
@@ -195257,6 +199282,12 @@ static const UV PL_CCC__B_invlist[] = { /* for all charsets */
        0x10A3B,
        0x10AE6,
        0x10AE7,
+       0x10F46,
+       0x10F48,
+       0x10F4B,
+       0x10F4C,
+       0x10F4D,
+       0x10F51,
        0x1D17B,
        0x1D183,
        0x1D18A,
@@ -195265,7 +199296,7 @@ static const UV PL_CCC__B_invlist[] = { /* for all charsets */
        0x1E8D7
 };
 
-static const UV PL_CCC__BL_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__BL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195275,7 +199306,7 @@ static const UV PL_CCC__BL_invlist[] = { /* for all charsets */
        0x302B
 };
 
-static const UV PL_CCC__BR_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__BR_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195291,7 +199322,7 @@ static const UV PL_CCC__BR_invlist[] = { /* for all charsets */
        0x302E
 };
 
-static const UV PL_CCC__DA_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__DA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195305,7 +199336,7 @@ static const UV PL_CCC__DA_invlist[] = { /* for all charsets */
        0x1DCE
 };
 
-static const UV PL_CCC__DB_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__DB_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195321,7 +199352,7 @@ static const UV PL_CCC__DB_invlist[] = { /* for all charsets */
        0x1DFD
 };
 
-static const UV PL_CCC__IS_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__IS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195331,7 +199362,7 @@ static const UV PL_CCC__IS_invlist[] = { /* for all charsets */
        0x346
 };
 
-static const UV PL_CCC__L_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__L_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195341,7 +199372,7 @@ static const UV PL_CCC__L_invlist[] = { /* for all charsets */
        0x3030
 };
 
-static const UV PL_CCC__R_invlist[] = { /* for all charsets */
+static const UV UNI_CCC__R_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195351,7 +199382,7 @@ static const UV PL_CCC__R_invlist[] = { /* for all charsets */
        0x1D16E
 };
 
-static const UV PL_CE_invlist[] = { /* for all charsets */
+static const UV UNI_CE_invlist[] = {  /* for all charsets */
        67,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195427,8 +199458,8 @@ static const UV PL_CE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CF_invlist[] = { /* for ASCII/Latin1 */
-       37,     /* Number of elements */
+static const UV UNI_CF_invlist[] = {  /* for ASCII/Latin1 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -195461,6 +199492,8 @@ static const UV PL_CF_invlist[] = { /* for ASCII/Latin1 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -195478,8 +199511,8 @@ static const UV PL_CF_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CF_invlist[] = { /* for EBCDIC 1047 */
-       37,     /* Number of elements */
+static const UV UNI_CF_invlist[] = {  /* for EBCDIC 1047 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -195512,6 +199545,8 @@ static const UV PL_CF_invlist[] = { /* for EBCDIC 1047 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -195529,8 +199564,8 @@ static const UV PL_CF_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CF_invlist[] = { /* for EBCDIC 037 */
-       37,     /* Number of elements */
+static const UV UNI_CF_invlist[] = {  /* for EBCDIC 037 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -195563,6 +199598,8 @@ static const UV PL_CF_invlist[] = { /* for EBCDIC 037 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -195575,7 +199612,7 @@ static const UV PL_CF_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_CHAM_invlist[] = { /* for all charsets */
+static const UV UNI_CHAM_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195591,7 +199628,7 @@ static const UV PL_CHAM_invlist[] = { /* for all charsets */
        0xAA60
 };
 
-static const UV PL_CHER_invlist[] = { /* for all charsets */
+static const UV UNI_CHER_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195605,7 +199642,7 @@ static const UV PL_CHER_invlist[] = { /* for all charsets */
        0xABC0
 };
 
-static const UV PL_CHEROKEESUP_invlist[] = { /* for all charsets */
+static const UV UNI_CHEROKEESUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -195615,10 +199652,20 @@ static const UV PL_CHEROKEESUP_invlist[] = { /* for all charsets */
        0xABC0
 };
 
+static const UV UNI_CHESSSYMBOLS_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1FA00,
+       0x1FA70
+};
+
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
-       763,    /* Number of elements */
+static const UV UNI_CI_invlist[] = {  /* for ASCII/Latin1 */
+       789,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -195699,11 +199746,13 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x903,
        0x93A,
        0x93B,
@@ -195729,6 +199778,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -195781,6 +199832,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -196087,6 +200140,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -196195,6 +200250,10 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -196207,6 +200266,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
@@ -196219,7 +200280,7 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -196235,7 +200296,7 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -196249,6 +200310,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -196285,9 +200348,11 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -196327,6 +200392,14 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -196394,8 +200467,8 @@ static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
-       761,    /* Number of elements */
+static const UV UNI_CI_invlist[] = {  /* for EBCDIC 1047 */
+       787,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -196474,11 +200547,13 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x903,
        0x93A,
        0x93B,
@@ -196504,6 +200579,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -196556,6 +200633,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -196862,6 +200941,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -196970,6 +201051,10 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -196982,6 +201067,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
@@ -196994,7 +201081,7 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -197010,7 +201097,7 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -197024,6 +201111,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -197060,9 +201149,11 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -197102,6 +201193,14 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -197169,8 +201268,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
-       759,    /* Number of elements */
+static const UV UNI_CI_invlist[] = {  /* for EBCDIC 037 */
+       785,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -197247,11 +201346,13 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x903,
        0x93A,
        0x93B,
@@ -197277,6 +201378,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -197329,6 +201432,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -197635,6 +201740,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -197743,6 +201850,10 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -197755,6 +201866,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
@@ -197767,7 +201880,7 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -197783,7 +201896,7 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -197797,6 +201910,8 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -197833,9 +201948,11 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -197875,6 +201992,14 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -197937,7 +202062,7 @@ static const UV PL_CI_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_CJK_invlist[] = { /* for all charsets */
+static const UV UNI_CJK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197947,7 +202072,7 @@ static const UV PL_CJK_invlist[] = { /* for all charsets */
        0xA000
 };
 
-static const UV PL_CJKCOMPAT_invlist[] = { /* for all charsets */
+static const UV UNI_CJKCOMPAT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197957,7 +202082,7 @@ static const UV PL_CJKCOMPAT_invlist[] = { /* for all charsets */
        0x3400
 };
 
-static const UV PL_CJKCOMPATFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_CJKCOMPATFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197967,7 +202092,7 @@ static const UV PL_CJKCOMPATFORMS_invlist[] = { /* for all charsets */
        0xFE50
 };
 
-static const UV PL_CJKCOMPATIDEOGRAPHS_invlist[] = { /* for all charsets */
+static const UV UNI_CJKCOMPATIDEOGRAPHS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197977,7 +202102,7 @@ static const UV PL_CJKCOMPATIDEOGRAPHS_invlist[] = { /* for all charsets */
        0xFB00
 };
 
-static const UV PL_CJKCOMPATIDEOGRAPHSSUP_invlist[] = { /* for all charsets */
+static const UV UNI_CJKCOMPATIDEOGRAPHSSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197987,7 +202112,7 @@ static const UV PL_CJKCOMPATIDEOGRAPHSSUP_invlist[] = { /* for all charsets */
        0x2FA20
 };
 
-static const UV PL_CJKEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -197997,7 +202122,7 @@ static const UV PL_CJKEXTA_invlist[] = { /* for all charsets */
        0x4DC0
 };
 
-static const UV PL_CJKEXTB_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198007,7 +202132,7 @@ static const UV PL_CJKEXTB_invlist[] = { /* for all charsets */
        0x2A6E0
 };
 
-static const UV PL_CJKEXTC_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198017,7 +202142,7 @@ static const UV PL_CJKEXTC_invlist[] = { /* for all charsets */
        0x2B740
 };
 
-static const UV PL_CJKEXTD_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTD_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198027,7 +202152,7 @@ static const UV PL_CJKEXTD_invlist[] = { /* for all charsets */
        0x2B820
 };
 
-static const UV PL_CJKEXTE_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198037,7 +202162,7 @@ static const UV PL_CJKEXTE_invlist[] = { /* for all charsets */
        0x2CEB0
 };
 
-static const UV PL_CJKEXTF_invlist[] = { /* for all charsets */
+static const UV UNI_CJKEXTF_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198047,7 +202172,7 @@ static const UV PL_CJKEXTF_invlist[] = { /* for all charsets */
        0x2EBF0
 };
 
-static const UV PL_CJKRADICALSSUP_invlist[] = { /* for all charsets */
+static const UV UNI_CJKRADICALSSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198057,7 +202182,7 @@ static const UV PL_CJKRADICALSSUP_invlist[] = { /* for all charsets */
        0x2F00
 };
 
-static const UV PL_CJKSTROKES_invlist[] = { /* for all charsets */
+static const UV UNI_CJKSTROKES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198067,7 +202192,7 @@ static const UV PL_CJKSTROKES_invlist[] = { /* for all charsets */
        0x31F0
 };
 
-static const UV PL_CJKSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_CJKSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -198077,8 +202202,8 @@ static const UV PL_CJKSYMBOLS_invlist[] = { /* for all charsets */
        0x3040
 };
 
-static const UV PL_CN_invlist[] = { /* for all charsets */
-       1298,   /* Number of elements */
+static const UV UNI_CN_invlist[] = {  /* for all charsets */
+       1316,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -198097,10 +202222,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -198108,7 +202229,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -198120,7 +202241,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -198134,7 +202255,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -198161,7 +202282,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -198193,7 +202314,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -198283,8 +202404,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -198307,8 +202426,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -198501,7 +202618,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -198550,7 +202667,9 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -198611,13 +202730,9 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -198653,7 +202768,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -198669,7 +202784,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -198683,7 +202798,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -198693,9 +202808,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -198707,8 +202820,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -198911,11 +203022,11 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -198943,15 +203054,23 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -198959,7 +203078,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -199000,7 +203119,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -199021,7 +203140,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -199041,11 +203160,13 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -199055,8 +203176,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -199088,6 +203207,20 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -199122,6 +203255,8 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -199131,7 +203266,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -199156,10 +203291,12 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -199226,6 +203363,8 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -199309,8 +203448,6 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -199329,11 +203466,11 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -199349,15 +203486,21 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -199382,7 +203525,7 @@ static const UV PL_CN_invlist[] = { /* for all charsets */
        0x10FFFE
 };
 
-static const UV PL_CO_invlist[] = { /* for all charsets */
+static const UV UNI_CO_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199396,7 +203539,7 @@ static const UV PL_CO_invlist[] = { /* for all charsets */
        0x10FFFE
 };
 
-static const UV PL_COMPATJAMO_invlist[] = { /* for all charsets */
+static const UV UNI_COMPATJAMO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199406,7 +203549,7 @@ static const UV PL_COMPATJAMO_invlist[] = { /* for all charsets */
        0x3190
 };
 
-static const UV PL_COMPEX_invlist[] = { /* for all charsets */
+static const UV UNI_COMPEX_invlist[] = {  /* for all charsets */
        147,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199560,7 +203703,7 @@ static const UV PL_COMPEX_invlist[] = { /* for all charsets */
        0x2FA1E
 };
 
-static const UV PL_CONTROLPICTURES_invlist[] = { /* for all charsets */
+static const UV UNI_CONTROLPICTURES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199570,7 +203713,7 @@ static const UV PL_CONTROLPICTURES_invlist[] = { /* for all charsets */
        0x2440
 };
 
-static const UV PL_COPT_invlist[] = { /* for all charsets */
+static const UV UNI_COPT_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199586,7 +203729,7 @@ static const UV PL_COPT_invlist[] = { /* for all charsets */
        0x102FC
 };
 
-static const UV PL_COPTICEPACTNUMBERS_invlist[] = { /* for all charsets */
+static const UV UNI_COPTICEPACTNUMBERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199596,7 +203739,7 @@ static const UV PL_COPTICEPACTNUMBERS_invlist[] = { /* for all charsets */
        0x10300
 };
 
-static const UV PL_COUNTINGROD_invlist[] = { /* for all charsets */
+static const UV UNI_COUNTINGROD_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199606,7 +203749,7 @@ static const UV PL_COUNTINGROD_invlist[] = { /* for all charsets */
        0x1D380
 };
 
-static const UV PL_CPRT_invlist[] = { /* for all charsets */
+static const UV UNI_CPRT_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199632,7 +203775,7 @@ static const UV PL_CPRT_invlist[] = { /* for all charsets */
        0x10840
 };
 
-static const UV PL_CUNEIFORMNUMBERS_invlist[] = { /* for all charsets */
+static const UV UNI_CUNEIFORMNUMBERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199642,7 +203785,7 @@ static const UV PL_CUNEIFORMNUMBERS_invlist[] = { /* for all charsets */
        0x12480
 };
 
-static const UV PL_CURRENCYSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_CURRENCYSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -199654,8 +203797,8 @@ static const UV PL_CURRENCYSYMBOLS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
-       1207,   /* Number of elements */
+static const UV UNI_CWCF_invlist[] = {  /* for ASCII/Latin1 */
+       1215,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -200226,6 +204369,10 @@ static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -200848,6 +204995,8 @@ static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -200864,6 +205013,8 @@ static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -200875,8 +205026,8 @@ static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWCF_invlist[] = { /* for EBCDIC 1047 */
-       1227,   /* Number of elements */
+static const UV UNI_CWCF_invlist[] = {  /* for EBCDIC 1047 */
+       1235,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -201467,6 +205618,10 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 1047 */
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -202089,6 +206244,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -202105,6 +206262,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -202116,8 +206275,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
-       1223,   /* Number of elements */
+static const UV UNI_CWCF_invlist[] = {  /* for EBCDIC 037 */
+       1231,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -202704,6 +206863,10 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -203326,6 +207489,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xAB70,
        0xABC0,
        0xFB00,
@@ -203342,6 +207507,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -203350,8 +207517,8 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
-       233,    /* Number of elements */
+static const UV UNI_CWCM_invlist[] = {  /* for ASCII/Latin1 */
+       243,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -203456,12 +207623,20 @@ static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -203561,7 +207736,7 @@ static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -203586,6 +207761,8 @@ static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -203597,8 +207774,8 @@ static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWCM_invlist[] = { /* for EBCDIC 1047 */
-       265,    /* Number of elements */
+static const UV UNI_CWCM_invlist[] = {  /* for EBCDIC 1047 */
+       275,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -203735,12 +207912,20 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 1047 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -203840,7 +208025,7 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 1047 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -203865,6 +208050,8 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -203876,8 +208063,8 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
-       261,    /* Number of elements */
+static const UV UNI_CWCM_invlist[] = {  /* for EBCDIC 037 */
+       271,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -204010,12 +208197,20 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
        0x10C8,
        0x10CD,
        0x10CE,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13A0,
        0x13F6,
        0x13F8,
        0x13FE,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D79,
        0x1D7A,
        0x1D7D,
@@ -204115,7 +208310,7 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
        0xA796,
        0xA7AF,
        0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -204140,6 +208335,8 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118A0,
        0x118E0,
+       0x16E40,
+       0x16E80,
        0x1E900,
        0x1E944
 };
@@ -204148,8 +208345,8 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
-       1631,   /* Number of elements */
+static const UV UNI_CWKCF_invlist[] = {  /* for ASCII/Latin1 */
+       1639,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -204798,6 +208995,10 @@ static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
        0x180F,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D2C,
        0x1D2F,
        0x1D30,
@@ -205552,6 +209753,8 @@ static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xA7F8,
        0xA7FA,
        0xAB5C,
@@ -205644,6 +209847,8 @@ static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1BCA0,
        0x1BCA4,
        0x1D15E,
@@ -205793,8 +209998,8 @@ static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 1047 */
-       1641,   /* Number of elements */
+static const UV UNI_CWKCF_invlist[] = {  /* for EBCDIC 1047 */
+       1649,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -206453,6 +210658,10 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 1047 */
        0x180F,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D2C,
        0x1D2F,
        0x1D30,
@@ -207207,6 +211416,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xA7F8,
        0xA7FA,
        0xAB5C,
@@ -207299,6 +211510,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1BCA0,
        0x1BCA4,
        0x1D15E,
@@ -207448,8 +211661,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
-       1639,   /* Number of elements */
+static const UV UNI_CWKCF_invlist[] = {  /* for EBCDIC 037 */
+       1647,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -208106,6 +212319,10 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
        0x180F,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1D2C,
        0x1D2F,
        0x1D30,
@@ -208860,6 +213077,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xA7F8,
        0xA7FA,
        0xAB5C,
@@ -208952,6 +213171,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1BCA0,
        0x1BCA4,
        0x1D15E,
@@ -209098,8 +213319,8 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
-       1181,   /* Number of elements */
+static const UV UNI_CWL_invlist[] = {  /* for ASCII/Latin1 */
+       1189,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -209654,6 +213875,10 @@ static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -210272,6 +214497,8 @@ static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -210282,6 +214509,8 @@ static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -210293,8 +214522,8 @@ static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWL_invlist[] = { /* for EBCDIC 1047 */
-       1199,   /* Number of elements */
+static const UV UNI_CWL_invlist[] = {  /* for EBCDIC 1047 */
+       1207,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -210867,6 +215096,10 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 1047 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -211485,6 +215718,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -211495,6 +215730,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -211506,8 +215743,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
-       1195,   /* Number of elements */
+static const UV UNI_CWL_invlist[] = {  /* for EBCDIC 037 */
+       1203,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -212076,6 +216313,10 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -212694,6 +216935,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -212704,6 +216947,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1E900,
        0x1E922
 };
@@ -212712,8 +216957,8 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWT_invlist[] = { /* for ASCII/Latin1 */
-       1217,   /* Number of elements */
+static const UV UNI_CWT_invlist[] = {  /* for ASCII/Latin1 */
+       1221,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -213914,6 +218159,8 @@ static const UV PL_CWT_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -213932,6 +218179,8 @@ static const UV PL_CWT_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
@@ -213943,8 +218192,8 @@ static const UV PL_CWT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWT_invlist[] = { /* for EBCDIC 1047 */
-       1231,   /* Number of elements */
+static const UV UNI_CWT_invlist[] = {  /* for EBCDIC 1047 */
+       1235,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -215159,6 +219408,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -215177,6 +219428,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
@@ -215188,8 +219441,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWT_invlist[] = { /* for EBCDIC 037 */
-       1231,   /* Number of elements */
+static const UV UNI_CWT_invlist[] = {  /* for EBCDIC 037 */
+       1235,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -216404,6 +220657,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -216422,6 +220677,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
@@ -216430,8 +220687,8 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
-       1215,   /* Number of elements */
+static const UV UNI_CWU_invlist[] = {  /* for ASCII/Latin1 */
+       1223,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -217006,6 +221263,10 @@ static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
        0x530,
        0x561,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -217630,6 +221891,8 @@ static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -217648,6 +221911,8 @@ static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
@@ -217659,8 +221924,8 @@ static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWU_invlist[] = { /* for EBCDIC 1047 */
-       1229,   /* Number of elements */
+static const UV UNI_CWU_invlist[] = {  /* for EBCDIC 1047 */
+       1237,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -218249,6 +222514,10 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 1047 */
        0x530,
        0x561,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -218873,6 +223142,8 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 1047 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -218891,6 +223162,8 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
@@ -218902,8 +223175,8 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_CWU_invlist[] = { /* for EBCDIC 037 */
-       1229,   /* Number of elements */
+static const UV UNI_CWU_invlist[] = {  /* for EBCDIC 037 */
+       1237,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -219492,6 +223765,10 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 037 */
        0x530,
        0x561,
        0x588,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -220116,6 +224393,8 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 037 */
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xAB53,
        0xAB54,
        0xAB70,
@@ -220134,13 +224413,15 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1E922,
        0x1E944
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_CYPRIOTSYLLABARY_invlist[] = { /* for all charsets */
+static const UV UNI_CYPRIOTSYLLABARY_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220150,7 +224431,7 @@ static const UV PL_CYPRIOTSYLLABARY_invlist[] = { /* for all charsets */
        0x10840
 };
 
-static const UV PL_CYRILLICEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_CYRILLICEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220160,7 +224441,7 @@ static const UV PL_CYRILLICEXTA_invlist[] = { /* for all charsets */
        0x2E00
 };
 
-static const UV PL_CYRILLICEXTB_invlist[] = { /* for all charsets */
+static const UV UNI_CYRILLICEXTB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220170,7 +224451,7 @@ static const UV PL_CYRILLICEXTB_invlist[] = { /* for all charsets */
        0xA6A0
 };
 
-static const UV PL_CYRILLICEXTC_invlist[] = { /* for all charsets */
+static const UV UNI_CYRILLICEXTC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220180,7 +224461,7 @@ static const UV PL_CYRILLICEXTC_invlist[] = { /* for all charsets */
        0x1C90
 };
 
-static const UV PL_CYRILLICSUP_invlist[] = { /* for all charsets */
+static const UV UNI_CYRILLICSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220190,7 +224471,7 @@ static const UV PL_CYRILLICSUP_invlist[] = { /* for all charsets */
        0x530
 };
 
-static const UV PL_CYRL_invlist[] = { /* for all charsets */
+static const UV UNI_CYRL_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220216,7 +224497,7 @@ static const UV PL_CYRL_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DASH_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DASH_invlist[] = {  /* for ASCII/Latin1 */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220273,7 +224554,7 @@ static const UV PL_DASH_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DASH_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DASH_invlist[] = {  /* for EBCDIC 1047 */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220330,7 +224611,7 @@ static const UV PL_DASH_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DASH_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DASH_invlist[] = {  /* for EBCDIC 037 */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220382,7 +224663,7 @@ static const UV PL_DASH_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DEP_invlist[] = { /* for all charsets */
+static const UV UNI_DEP_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220406,7 +224687,7 @@ static const UV PL_DEP_invlist[] = { /* for all charsets */
        0xE0002
 };
 
-static const UV PL_DEVA_invlist[] = { /* for all charsets */
+static const UV UNI_DEVA_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220423,10 +224704,10 @@ static const UV PL_DEVA_invlist[] = { /* for all charsets */
        0xA830,
        0xA83A,
        0xA8E0,
-       0xA8FE
+       0xA900
 };
 
-static const UV PL_DEVANAGARIEXT_invlist[] = { /* for all charsets */
+static const UV UNI_DEVANAGARIEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220438,7 +224719,7 @@ static const UV PL_DEVANAGARIEXT_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DI_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DI_invlist[] = {  /* for ASCII/Latin1 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220487,7 +224768,7 @@ static const UV PL_DI_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DI_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DI_invlist[] = {  /* for EBCDIC 1047 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220536,7 +224817,7 @@ static const UV PL_DI_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DI_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DI_invlist[] = {  /* for EBCDIC 037 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -220582,8 +224863,8 @@ static const UV PL_DI_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
-       319,    /* Number of elements */
+static const UV UNI_DIA_invlist[] = {  /* for ASCII/Latin1 */
+       327,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -220838,6 +225119,10 @@ static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
        0x102E1,
        0x10AE5,
        0x10AE7,
+       0x10D22,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x110B9,
        0x110BB,
        0x11133,
@@ -220874,6 +225159,8 @@ static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
        0x116B8,
        0x1172B,
        0x1172C,
+       0x11839,
+       0x1183B,
        0x11A34,
        0x11A35,
        0x11A47,
@@ -220886,6 +225173,8 @@ static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
        0x11D43,
        0x11D44,
        0x11D46,
+       0x11D97,
+       0x11D98,
        0x16AF0,
        0x16AF5,
        0x16F8F,
@@ -220915,8 +225204,8 @@ static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DIA_invlist[] = { /* for EBCDIC 1047 */
-       319,    /* Number of elements */
+static const UV UNI_DIA_invlist[] = {  /* for EBCDIC 1047 */
+       327,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -221171,6 +225460,10 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 1047 */
        0x102E1,
        0x10AE5,
        0x10AE7,
+       0x10D22,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x110B9,
        0x110BB,
        0x11133,
@@ -221207,6 +225500,8 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 1047 */
        0x116B8,
        0x1172B,
        0x1172C,
+       0x11839,
+       0x1183B,
        0x11A34,
        0x11A35,
        0x11A47,
@@ -221219,6 +225514,8 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 1047 */
        0x11D43,
        0x11D44,
        0x11D46,
+       0x11D97,
+       0x11D98,
        0x16AF0,
        0x16AF5,
        0x16F8F,
@@ -221248,8 +225545,8 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DIA_invlist[] = { /* for EBCDIC 037 */
-       317,    /* Number of elements */
+static const UV UNI_DIA_invlist[] = {  /* for EBCDIC 037 */
+       325,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -221502,6 +225799,10 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 037 */
        0x102E1,
        0x10AE5,
        0x10AE7,
+       0x10D22,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x110B9,
        0x110BB,
        0x11133,
@@ -221538,6 +225839,8 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 037 */
        0x116B8,
        0x1172B,
        0x1172C,
+       0x11839,
+       0x1183B,
        0x11A34,
        0x11A35,
        0x11A47,
@@ -221550,6 +225853,8 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 037 */
        0x11D43,
        0x11D44,
        0x11D46,
+       0x11D97,
+       0x11D98,
        0x16AF0,
        0x16AF5,
        0x16F8F,
@@ -221574,7 +225879,7 @@ static const UV PL_DIA_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DIACRITICALS_invlist[] = { /* for all charsets */
+static const UV UNI_DIACRITICALS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221584,7 +225889,7 @@ static const UV PL_DIACRITICALS_invlist[] = { /* for all charsets */
        0x370
 };
 
-static const UV PL_DIACRITICALSEXT_invlist[] = { /* for all charsets */
+static const UV UNI_DIACRITICALSEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221594,7 +225899,7 @@ static const UV PL_DIACRITICALSEXT_invlist[] = { /* for all charsets */
        0x1B00
 };
 
-static const UV PL_DIACRITICALSFORSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_DIACRITICALSFORSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221604,7 +225909,7 @@ static const UV PL_DIACRITICALSFORSYMBOLS_invlist[] = { /* for all charsets */
        0x2100
 };
 
-static const UV PL_DIACRITICALSSUP_invlist[] = { /* for all charsets */
+static const UV UNI_DIACRITICALSSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221614,7 +225919,7 @@ static const UV PL_DIACRITICALSSUP_invlist[] = { /* for all charsets */
        0x1E00
 };
 
-static const UV PL_DINGBATS_invlist[] = { /* for all charsets */
+static const UV UNI_DINGBATS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221624,7 +225929,21 @@ static const UV PL_DINGBATS_invlist[] = { /* for all charsets */
        0x27C0
 };
 
-static const UV PL_DOMINO_invlist[] = { /* for all charsets */
+static const UV UNI_DOGR_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x964,
+       0x970,
+       0xA830,
+       0xA83A,
+       0x11800,
+       0x1183C
+};
+
+static const UV UNI_DOMINO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221634,7 +225953,7 @@ static const UV PL_DOMINO_invlist[] = { /* for all charsets */
        0x1F0A0
 };
 
-static const UV PL_DSRT_invlist[] = { /* for all charsets */
+static const UV UNI_DSRT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -221646,7 +225965,7 @@ static const UV PL_DSRT_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__CAN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__CAN_invlist[] = {  /* for ASCII/Latin1 */
        463,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -222123,7 +226442,7 @@ static const UV PL_DT__CAN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__CAN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__CAN_invlist[] = {  /* for EBCDIC 1047 */
        467,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -222604,7 +226923,7 @@ static const UV PL_DT__CAN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__CAN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__CAN_invlist[] = {  /* for EBCDIC 037 */
        467,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223082,7 +227401,7 @@ static const UV PL_DT__CAN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__COM_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__COM_invlist[] = {  /* for ASCII/Latin1 */
        149,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223245,7 +227564,7 @@ static const UV PL_DT__COM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__COM_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__COM_invlist[] = {  /* for EBCDIC 1047 */
        149,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223408,7 +227727,7 @@ static const UV PL_DT__COM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__COM_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__COM_invlist[] = {  /* for EBCDIC 037 */
        147,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223564,7 +227883,7 @@ static const UV PL_DT__COM_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DT__ENC_invlist[] = { /* for all charsets */
+static const UV UNI_DT__ENC_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223588,7 +227907,7 @@ static const UV PL_DT__ENC_invlist[] = { /* for all charsets */
        0x1F252
 };
 
-static const UV PL_DT__FIN_invlist[] = { /* for all charsets */
+static const UV UNI_DT__FIN_invlist[] = {  /* for all charsets */
        227,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223822,7 +228141,7 @@ static const UV PL_DT__FIN_invlist[] = { /* for all charsets */
        0xFEFD
 };
 
-static const UV PL_DT__FONT_invlist[] = { /* for all charsets */
+static const UV UNI_DT__FONT_invlist[] = {  /* for all charsets */
        135,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223966,7 +228285,7 @@ static const UV PL_DT__FONT_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__FRA_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__FRA_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -223987,7 +228306,7 @@ static const UV PL_DT__FRA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__FRA_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__FRA_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224008,7 +228327,7 @@ static const UV PL_DT__FRA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__FRA_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__FRA_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224024,7 +228343,7 @@ static const UV PL_DT__FRA_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DT__INIT_invlist[] = { /* for all charsets */
+static const UV UNI_DT__INIT_invlist[] = {  /* for all charsets */
        151,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224182,7 +228501,7 @@ static const UV PL_DT__INIT_invlist[] = { /* for all charsets */
        0xFEF4
 };
 
-static const UV PL_DT__ISO_invlist[] = { /* for all charsets */
+static const UV UNI_DT__ISO_invlist[] = {  /* for all charsets */
        197,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224386,7 +228705,7 @@ static const UV PL_DT__ISO_invlist[] = { /* for all charsets */
        0xFEFC
 };
 
-static const UV PL_DT__MED_invlist[] = { /* for all charsets */
+static const UV UNI_DT__MED_invlist[] = {  /* for all charsets */
        109,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224502,7 +228821,7 @@ static const UV PL_DT__MED_invlist[] = { /* for all charsets */
        0xFEF5
 };
 
-static const UV PL_DT__NAR_invlist[] = { /* for all charsets */
+static const UV UNI_DT__NAR_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224524,7 +228843,7 @@ static const UV PL_DT__NAR_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__NB_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__NB_invlist[] = {  /* for ASCII/Latin1 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224549,7 +228868,7 @@ static const UV PL_DT__NB_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NB_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__NB_invlist[] = {  /* for EBCDIC 1047 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224574,7 +228893,7 @@ static const UV PL_DT__NB_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NB_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__NB_invlist[] = {  /* for EBCDIC 037 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224596,7 +228915,7 @@ static const UV PL_DT__NB_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__NONCANON_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__NONCANON_invlist[] = {  /* for ASCII/Latin1 */
        373,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -224983,7 +229302,7 @@ static const UV PL_DT__NONCANON_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NONCANON_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__NONCANON_invlist[] = {  /* for EBCDIC 1047 */
        379,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -225376,7 +229695,7 @@ static const UV PL_DT__NONCANON_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NONCANON_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__NONCANON_invlist[] = {  /* for EBCDIC 037 */
        377,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -225764,7 +230083,7 @@ static const UV PL_DT__NONCANON_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__NONE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__NONE_invlist[] = {  /* for ASCII/Latin1 */
        781,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -226559,7 +230878,7 @@ static const UV PL_DT__NONE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NONE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__NONE_invlist[] = {  /* for EBCDIC 1047 */
        779,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -227352,7 +231671,7 @@ static const UV PL_DT__NONE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__NONE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__NONE_invlist[] = {  /* for EBCDIC 037 */
        781,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -228142,7 +232461,7 @@ static const UV PL_DT__NONE_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DT__SML_invlist[] = { /* for all charsets */
+static const UV UNI_DT__SML_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228156,7 +232475,7 @@ static const UV PL_DT__SML_invlist[] = { /* for all charsets */
        0xFE6C
 };
 
-static const UV PL_DT__SQR_invlist[] = { /* for all charsets */
+static const UV UNI_DT__SQR_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228182,7 +232501,7 @@ static const UV PL_DT__SQR_invlist[] = { /* for all charsets */
        0x1F23C
 };
 
-static const UV PL_DT__SUB_invlist[] = { /* for all charsets */
+static const UV UNI_DT__SUB_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228200,7 +232519,7 @@ static const UV PL_DT__SUB_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DT__SUP_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_DT__SUP_invlist[] = {  /* for ASCII/Latin1 */
        49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228263,7 +232582,7 @@ static const UV PL_DT__SUP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__SUP_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_DT__SUP_invlist[] = {  /* for EBCDIC 1047 */
        51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228328,7 +232647,7 @@ static const UV PL_DT__SUP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_DT__SUP_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_DT__SUP_invlist[] = {  /* for EBCDIC 037 */
        51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228388,7 +232707,7 @@ static const UV PL_DT__SUP_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_DT__VERT_invlist[] = { /* for all charsets */
+static const UV UNI_DT__VERT_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228406,7 +232725,7 @@ static const UV PL_DT__VERT_invlist[] = { /* for all charsets */
        0xFE49
 };
 
-static const UV PL_DUPL_invlist[] = { /* for all charsets */
+static const UV UNI_DUPL_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228426,7 +232745,7 @@ static const UV PL_DUPL_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_EA__A_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_EA__A_invlist[] = {  /* for ASCII/Latin1 */
        359,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -228799,7 +233118,7 @@ static const UV PL_EA__A_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__A_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_EA__A_invlist[] = {  /* for EBCDIC 1047 */
        363,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -229176,7 +233495,7 @@ static const UV PL_EA__A_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__A_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_EA__A_invlist[] = {  /* for EBCDIC 037 */
        361,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -229546,7 +233865,7 @@ static const UV PL_EA__A_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_EA__F_invlist[] = { /* for all charsets */
+static const UV UNI_EA__F_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -229560,7 +233879,7 @@ static const UV PL_EA__F_invlist[] = { /* for all charsets */
        0xFFE7
 };
 
-static const UV PL_EA__H_invlist[] = { /* for all charsets */
+static const UV UNI_EA__H_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -229584,8 +233903,8 @@ static const UV PL_EA__H_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_EA__N_invlist[] = { /* for ASCII/Latin1 */
-       533,    /* Number of elements */
+static const UV UNI_EA__N_invlist[] = {  /* for ASCII/Latin1 */
+       537,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -229975,7 +234294,7 @@ static const UV PL_EA__N_invlist[] = { /* for ASCII/Latin1 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -230025,7 +234344,7 @@ static const UV PL_EA__N_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -230099,19 +234418,23 @@ static const UV PL_EA__N_invlist[] = { /* for ASCII/Latin1 */
        0x1F6EB,
        0x1F6ED,
        0x1F6F4,
-       0x1F6F9,
+       0x1F6FA,
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -230131,8 +234454,8 @@ static const UV PL_EA__N_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__N_invlist[] = { /* for EBCDIC 1047 */
-       531,    /* Number of elements */
+static const UV UNI_EA__N_invlist[] = {  /* for EBCDIC 1047 */
+       535,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -230520,7 +234843,7 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 1047 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -230570,7 +234893,7 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -230644,19 +234967,23 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 1047 */
        0x1F6EB,
        0x1F6ED,
        0x1F6F4,
-       0x1F6F9,
+       0x1F6FA,
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -230676,8 +235003,8 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__N_invlist[] = { /* for EBCDIC 037 */
-       531,    /* Number of elements */
+static const UV UNI_EA__N_invlist[] = {  /* for EBCDIC 037 */
+       535,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -231065,7 +235392,7 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 037 */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -231115,7 +235442,7 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -231189,19 +235516,23 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 037 */
        0x1F6EB,
        0x1F6ED,
        0x1F6F4,
-       0x1F6F9,
+       0x1F6FA,
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -231218,7 +235549,7 @@ static const UV PL_EA__N_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_EA__NA_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_EA__NA_invlist[] = {  /* for ASCII/Latin1 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231247,7 +235578,7 @@ static const UV PL_EA__NA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__NA_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_EA__NA_invlist[] = {  /* for EBCDIC 1047 */
        37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231298,7 +235629,7 @@ static const UV PL_EA__NA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EA__NA_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_EA__NA_invlist[] = {  /* for EBCDIC 037 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231342,8 +235673,8 @@ static const UV PL_EA__NA_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_EA__W_invlist[] = { /* for all charsets */
-       209,    /* Number of elements */
+static const UV UNI_EA__W_invlist[] = {  /* for all charsets */
+       213,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -231433,7 +235764,7 @@ static const UV PL_EA__W_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -231469,7 +235800,7 @@ static const UV PL_EA__W_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -231539,26 +235870,30 @@ static const UV PL_EA__W_invlist[] = { /* for all charsets */
        0x1F6EB,
        0x1F6ED,
        0x1F6F4,
-       0x1F6F9,
+       0x1F6FA,
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
        0x20000,
        0x2FFFE,
        0x30000,
        0x3FFFE
 };
 
-static const UV PL_EARLYDYNASTICCUNEIFORM_invlist[] = { /* for all charsets */
+static const UV UNI_EARLYDYNASTICCUNEIFORM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231568,7 +235903,7 @@ static const UV PL_EARLYDYNASTICCUNEIFORM_invlist[] = { /* for all charsets */
        0x12550
 };
 
-static const UV PL_EGYP_invlist[] = { /* for all charsets */
+static const UV UNI_EGYP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231578,7 +235913,7 @@ static const UV PL_EGYP_invlist[] = { /* for all charsets */
        0x1342F
 };
 
-static const UV PL_ELBA_invlist[] = { /* for all charsets */
+static const UV UNI_ELBA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231588,7 +235923,7 @@ static const UV PL_ELBA_invlist[] = { /* for all charsets */
        0x10528
 };
 
-static const UV PL_EMOTICONS_invlist[] = { /* for all charsets */
+static const UV UNI_EMOTICONS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231598,7 +235933,7 @@ static const UV PL_EMOTICONS_invlist[] = { /* for all charsets */
        0x1F650
 };
 
-static const UV PL_ENCLOSEDALPHANUM_invlist[] = { /* for all charsets */
+static const UV UNI_ENCLOSEDALPHANUM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231608,7 +235943,7 @@ static const UV PL_ENCLOSEDALPHANUM_invlist[] = { /* for all charsets */
        0x2500
 };
 
-static const UV PL_ENCLOSEDALPHANUMSUP_invlist[] = { /* for all charsets */
+static const UV UNI_ENCLOSEDALPHANUMSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231618,7 +235953,7 @@ static const UV PL_ENCLOSEDALPHANUMSUP_invlist[] = { /* for all charsets */
        0x1F200
 };
 
-static const UV PL_ENCLOSEDCJK_invlist[] = { /* for all charsets */
+static const UV UNI_ENCLOSEDCJK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231628,7 +235963,7 @@ static const UV PL_ENCLOSEDCJK_invlist[] = { /* for all charsets */
        0x3300
 };
 
-static const UV PL_ENCLOSEDIDEOGRAPHICSUP_invlist[] = { /* for all charsets */
+static const UV UNI_ENCLOSEDIDEOGRAPHICSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231638,7 +235973,7 @@ static const UV PL_ENCLOSEDIDEOGRAPHICSUP_invlist[] = { /* for all charsets */
        0x1F300
 };
 
-static const UV PL_ETHI_invlist[] = { /* for all charsets */
+static const UV UNI_ETHI_invlist[] = {  /* for all charsets */
        65,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231710,7 +236045,7 @@ static const UV PL_ETHI_invlist[] = { /* for all charsets */
        0xAB2F
 };
 
-static const UV PL_ETHIOPICEXT_invlist[] = { /* for all charsets */
+static const UV UNI_ETHIOPICEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231720,7 +236055,7 @@ static const UV PL_ETHIOPICEXT_invlist[] = { /* for all charsets */
        0x2DE0
 };
 
-static const UV PL_ETHIOPICEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_ETHIOPICEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231730,7 +236065,7 @@ static const UV PL_ETHIOPICEXTA_invlist[] = { /* for all charsets */
        0xAB30
 };
 
-static const UV PL_ETHIOPICSUP_invlist[] = { /* for all charsets */
+static const UV UNI_ETHIOPICSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231742,7 +236077,7 @@ static const UV PL_ETHIOPICSUP_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_EXT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_EXT_invlist[] = {  /* for ASCII/Latin1 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231815,7 +236150,7 @@ static const UV PL_EXT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EXT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_EXT_invlist[] = {  /* for EBCDIC 1047 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231888,7 +236223,7 @@ static const UV PL_EXT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_EXT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_EXT_invlist[] = {  /* for EBCDIC 037 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -231958,7 +236293,7 @@ static const UV PL_EXT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_GCB__CN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_GCB__CN_invlist[] = {  /* for ASCII/Latin1 */
        38,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -232010,7 +236345,7 @@ static const UV PL_GCB__CN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GCB__CN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_GCB__CN_invlist[] = {  /* for EBCDIC 1047 */
        38,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -232062,7 +236397,7 @@ static const UV PL_GCB__CN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GCB__CN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_GCB__CN_invlist[] = {  /* for EBCDIC 037 */
        38,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -232109,381 +236444,12 @@ static const UV PL_GCB__CN_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_GCB__L_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x1100,
-       0x1160,
-       0xA960,
-       0xA97D
-};
-
-static const UV PL_GCB__PP_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x600,
-       0x606,
-       0x6DD,
-       0x6DE,
-       0x70F,
-       0x710,
-       0x8E2,
-       0x8E3,
-       0xD4E,
-       0xD4F,
-       0x110BD,
-       0x110BE,
-       0x111C2,
-       0x111C4,
-       0x11A3A,
-       0x11A3B,
-       0x11A86,
-       0x11A8A,
-       0x11D46,
-       0x11D47
-};
-
-static const UV PL_GCB__SM_invlist[] = { /* for all charsets */
-       291,    /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x903,
-       0x904,
-       0x93B,
-       0x93C,
-       0x93E,
-       0x941,
-       0x949,
-       0x94D,
-       0x94E,
-       0x950,
-       0x982,
-       0x984,
-       0x9BF,
-       0x9C1,
-       0x9C7,
-       0x9C9,
-       0x9CB,
-       0x9CD,
-       0xA03,
-       0xA04,
-       0xA3E,
-       0xA41,
-       0xA83,
-       0xA84,
-       0xABE,
-       0xAC1,
-       0xAC9,
-       0xACA,
-       0xACB,
-       0xACD,
-       0xB02,
-       0xB04,
-       0xB40,
-       0xB41,
-       0xB47,
-       0xB49,
-       0xB4B,
-       0xB4D,
-       0xBBF,
-       0xBC0,
-       0xBC1,
-       0xBC3,
-       0xBC6,
-       0xBC9,
-       0xBCA,
-       0xBCD,
-       0xC01,
-       0xC04,
-       0xC41,
-       0xC45,
-       0xC82,
-       0xC84,
-       0xCBE,
-       0xCBF,
-       0xCC0,
-       0xCC2,
-       0xCC3,
-       0xCC5,
-       0xCC7,
-       0xCC9,
-       0xCCA,
-       0xCCC,
-       0xD02,
-       0xD04,
-       0xD3F,
-       0xD41,
-       0xD46,
-       0xD49,
-       0xD4A,
-       0xD4D,
-       0xD82,
-       0xD84,
-       0xDD0,
-       0xDD2,
-       0xDD8,
-       0xDDF,
-       0xDF2,
-       0xDF4,
-       0xE33,
-       0xE34,
-       0xEB3,
-       0xEB4,
-       0xF3E,
-       0xF40,
-       0xF7F,
-       0xF80,
-       0x1031,
-       0x1032,
-       0x103B,
-       0x103D,
-       0x1056,
-       0x1058,
-       0x1084,
-       0x1085,
-       0x17B6,
-       0x17B7,
-       0x17BE,
-       0x17C6,
-       0x17C7,
-       0x17C9,
-       0x1923,
-       0x1927,
-       0x1929,
-       0x192C,
-       0x1930,
-       0x1932,
-       0x1933,
-       0x1939,
-       0x1A19,
-       0x1A1B,
-       0x1A55,
-       0x1A56,
-       0x1A57,
-       0x1A58,
-       0x1A6D,
-       0x1A73,
-       0x1B04,
-       0x1B05,
-       0x1B35,
-       0x1B36,
-       0x1B3B,
-       0x1B3C,
-       0x1B3D,
-       0x1B42,
-       0x1B43,
-       0x1B45,
-       0x1B82,
-       0x1B83,
-       0x1BA1,
-       0x1BA2,
-       0x1BA6,
-       0x1BA8,
-       0x1BAA,
-       0x1BAB,
-       0x1BE7,
-       0x1BE8,
-       0x1BEA,
-       0x1BED,
-       0x1BEE,
-       0x1BEF,
-       0x1BF2,
-       0x1BF4,
-       0x1C24,
-       0x1C2C,
-       0x1C34,
-       0x1C36,
-       0x1CE1,
-       0x1CE2,
-       0x1CF2,
-       0x1CF4,
-       0x1CF7,
-       0x1CF8,
-       0xA823,
-       0xA825,
-       0xA827,
-       0xA828,
-       0xA880,
-       0xA882,
-       0xA8B4,
-       0xA8C4,
-       0xA952,
-       0xA954,
-       0xA983,
-       0xA984,
-       0xA9B4,
-       0xA9B6,
-       0xA9BA,
-       0xA9BC,
-       0xA9BD,
-       0xA9C1,
-       0xAA2F,
-       0xAA31,
-       0xAA33,
-       0xAA35,
-       0xAA4D,
-       0xAA4E,
-       0xAAEB,
-       0xAAEC,
-       0xAAEE,
-       0xAAF0,
-       0xAAF5,
-       0xAAF6,
-       0xABE3,
-       0xABE5,
-       0xABE6,
-       0xABE8,
-       0xABE9,
-       0xABEB,
-       0xABEC,
-       0xABED,
-       0x11000,
-       0x11001,
-       0x11002,
-       0x11003,
-       0x11082,
-       0x11083,
-       0x110B0,
-       0x110B3,
-       0x110B7,
-       0x110B9,
-       0x1112C,
-       0x1112D,
-       0x11182,
-       0x11183,
-       0x111B3,
-       0x111B6,
-       0x111BF,
-       0x111C1,
-       0x1122C,
-       0x1122F,
-       0x11232,
-       0x11234,
-       0x11235,
-       0x11236,
-       0x112E0,
-       0x112E3,
-       0x11302,
-       0x11304,
-       0x1133F,
-       0x11340,
-       0x11341,
-       0x11345,
-       0x11347,
-       0x11349,
-       0x1134B,
-       0x1134E,
-       0x11362,
-       0x11364,
-       0x11435,
-       0x11438,
-       0x11440,
-       0x11442,
-       0x11445,
-       0x11446,
-       0x114B1,
-       0x114B3,
-       0x114B9,
-       0x114BA,
-       0x114BB,
-       0x114BD,
-       0x114BE,
-       0x114BF,
-       0x114C1,
-       0x114C2,
-       0x115B0,
-       0x115B2,
-       0x115B8,
-       0x115BC,
-       0x115BE,
-       0x115BF,
-       0x11630,
-       0x11633,
-       0x1163B,
-       0x1163D,
-       0x1163E,
-       0x1163F,
-       0x116AC,
-       0x116AD,
-       0x116AE,
-       0x116B0,
-       0x116B6,
-       0x116B7,
-       0x11720,
-       0x11722,
-       0x11726,
-       0x11727,
-       0x11A07,
-       0x11A09,
-       0x11A39,
-       0x11A3A,
-       0x11A57,
-       0x11A59,
-       0x11A97,
-       0x11A98,
-       0x11C2F,
-       0x11C30,
-       0x11C3E,
-       0x11C3F,
-       0x11CA9,
-       0x11CAA,
-       0x11CB1,
-       0x11CB2,
-       0x11CB4,
-       0x11CB5,
-       0x16F51,
-       0x16F7F,
-       0x1D166,
-       0x1D167,
-       0x1D16D,
-       0x1D16E
-};
-
-static const UV PL_GCB__T_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x11A8,
-       0x1200,
-       0xD7CB,
-       0xD7FC
-};
-
-static const UV PL_GCB__V_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x1160,
-       0x11A8,
-       0xD7B0,
-       0xD7C7
-};
-
-#  if 'A' == 65 /* ASCII/Latin1 */
-
-static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
-       672,    /* Number of elements */
+static const UV UNI_GCB__EX_invlist[] = {  /* for all charsets */
+       665,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
-       0x20,
-       0x7F,
-       0xA0,
-       0xAD,
-       0xAE,
        0x300,
        0x370,
        0x483,
@@ -232498,26 +236464,20 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x5C6,
        0x5C7,
        0x5C8,
-       0x600,
-       0x606,
        0x610,
        0x61B,
-       0x61C,
-       0x61D,
        0x64B,
        0x660,
        0x670,
        0x671,
        0x6D6,
-       0x6DE,
+       0x6DD,
        0x6DF,
        0x6E5,
        0x6E7,
        0x6E9,
        0x6EA,
        0x6EE,
-       0x70F,
-       0x710,
        0x711,
        0x712,
        0x730,
@@ -232526,6 +236486,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -232536,35 +236498,43 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
-       0x904,
+       0x8D3,
+       0x8E2,
+       0x8E3,
+       0x903,
        0x93A,
+       0x93B,
+       0x93C,
        0x93D,
-       0x93E,
-       0x950,
+       0x941,
+       0x949,
+       0x94D,
+       0x94E,
        0x951,
        0x958,
        0x962,
        0x964,
        0x981,
-       0x984,
+       0x982,
        0x9BC,
        0x9BD,
        0x9BE,
+       0x9BF,
+       0x9C1,
        0x9C5,
-       0x9C7,
-       0x9C9,
-       0x9CB,
+       0x9CD,
        0x9CE,
        0x9D7,
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
-       0xA04,
+       0xA03,
        0xA3C,
        0xA3D,
-       0xA3E,
+       0xA41,
        0xA43,
        0xA47,
        0xA49,
@@ -232577,28 +236547,28 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA75,
        0xA76,
        0xA81,
-       0xA84,
+       0xA83,
        0xABC,
        0xABD,
-       0xABE,
+       0xAC1,
        0xAC6,
        0xAC7,
-       0xACA,
-       0xACB,
+       0xAC9,
+       0xACD,
        0xACE,
        0xAE2,
        0xAE4,
        0xAFA,
        0xB00,
        0xB01,
-       0xB04,
+       0xB02,
        0xB3C,
        0xB3D,
        0xB3E,
+       0xB40,
+       0xB41,
        0xB45,
-       0xB47,
-       0xB49,
-       0xB4B,
+       0xB4D,
        0xB4E,
        0xB56,
        0xB58,
@@ -232607,17 +236577,19 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xB82,
        0xB83,
        0xBBE,
-       0xBC3,
-       0xBC6,
-       0xBC9,
-       0xBCA,
+       0xBBF,
+       0xBC0,
+       0xBC1,
+       0xBCD,
        0xBCE,
        0xBD7,
        0xBD8,
        0xC00,
+       0xC01,
        0xC04,
+       0xC05,
        0xC3E,
-       0xC45,
+       0xC41,
        0xC46,
        0xC49,
        0xC4A,
@@ -232627,54 +236599,54 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xC62,
        0xC64,
        0xC81,
-       0xC84,
+       0xC82,
        0xCBC,
        0xCBD,
-       0xCBE,
-       0xCC5,
+       0xCBF,
+       0xCC0,
+       0xCC2,
+       0xCC3,
        0xCC6,
-       0xCC9,
-       0xCCA,
+       0xCC7,
+       0xCCC,
        0xCCE,
        0xCD5,
        0xCD7,
        0xCE2,
        0xCE4,
        0xD00,
-       0xD04,
+       0xD02,
        0xD3B,
        0xD3D,
        0xD3E,
+       0xD3F,
+       0xD41,
        0xD45,
-       0xD46,
-       0xD49,
-       0xD4A,
-       0xD4F,
+       0xD4D,
+       0xD4E,
        0xD57,
        0xD58,
        0xD62,
        0xD64,
-       0xD82,
-       0xD84,
        0xDCA,
        0xDCB,
        0xDCF,
+       0xDD0,
+       0xDD2,
        0xDD5,
        0xDD6,
        0xDD7,
-       0xDD8,
+       0xDDF,
        0xDE0,
-       0xDF2,
-       0xDF4,
        0xE31,
        0xE32,
-       0xE33,
+       0xE34,
        0xE3B,
        0xE47,
        0xE4F,
        0xEB1,
        0xEB2,
-       0xEB3,
+       0xEB4,
        0xEBA,
        0xEBB,
        0xEBD,
@@ -232688,9 +236660,9 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xF38,
        0xF39,
        0xF3A,
-       0xF3E,
-       0xF40,
        0xF71,
+       0xF7F,
+       0xF80,
        0xF85,
        0xF86,
        0xF88,
@@ -232701,10 +236673,14 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xFC6,
        0xFC7,
        0x102D,
+       0x1031,
+       0x1032,
        0x1038,
        0x1039,
+       0x103B,
+       0x103D,
        0x103F,
-       0x1056,
+       0x1058,
        0x105A,
        0x105E,
        0x1061,
@@ -232712,14 +236688,12 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1075,
        0x1082,
        0x1083,
-       0x1084,
+       0x1085,
        0x1087,
        0x108D,
        0x108E,
        0x109D,
        0x109E,
-       0x1100,
-       0x1200,
        0x135D,
        0x1360,
        0x1712,
@@ -232731,85 +236705,101 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1772,
        0x1774,
        0x17B4,
+       0x17B6,
+       0x17B7,
+       0x17BE,
+       0x17C6,
+       0x17C7,
+       0x17C9,
        0x17D4,
        0x17DD,
        0x17DE,
        0x180B,
-       0x180F,
+       0x180E,
        0x1885,
        0x1887,
        0x18A9,
        0x18AA,
        0x1920,
-       0x192C,
-       0x1930,
+       0x1923,
+       0x1927,
+       0x1929,
+       0x1932,
+       0x1933,
+       0x1939,
        0x193C,
        0x1A17,
+       0x1A19,
+       0x1A1B,
        0x1A1C,
-       0x1A55,
+       0x1A56,
+       0x1A57,
+       0x1A58,
        0x1A5F,
        0x1A60,
        0x1A61,
        0x1A62,
        0x1A63,
        0x1A65,
+       0x1A6D,
+       0x1A73,
        0x1A7D,
        0x1A7F,
        0x1A80,
        0x1AB0,
        0x1ABF,
        0x1B00,
-       0x1B05,
+       0x1B04,
        0x1B34,
-       0x1B45,
+       0x1B35,
+       0x1B36,
+       0x1B3B,
+       0x1B3C,
+       0x1B3D,
+       0x1B42,
+       0x1B43,
        0x1B6B,
        0x1B74,
        0x1B80,
-       0x1B83,
-       0x1BA1,
+       0x1B82,
+       0x1BA2,
+       0x1BA6,
+       0x1BA8,
+       0x1BAA,
+       0x1BAB,
        0x1BAE,
        0x1BE6,
-       0x1BF4,
-       0x1C24,
+       0x1BE7,
+       0x1BE8,
+       0x1BEA,
+       0x1BED,
+       0x1BEE,
+       0x1BEF,
+       0x1BF2,
+       0x1C2C,
+       0x1C34,
+       0x1C36,
        0x1C38,
        0x1CD0,
        0x1CD3,
        0x1CD4,
+       0x1CE1,
+       0x1CE2,
        0x1CE9,
        0x1CED,
        0x1CEE,
-       0x1CF2,
+       0x1CF4,
        0x1CF5,
-       0x1CF7,
+       0x1CF8,
        0x1CFA,
        0x1DC0,
        0x1DFA,
        0x1DFB,
        0x1E00,
-       0x200B,
-       0x2010,
-       0x2028,
-       0x202F,
-       0x2060,
-       0x2070,
+       0x200C,
+       0x200D,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -232834,32 +236824,38 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA807,
        0xA80B,
        0xA80C,
-       0xA823,
-       0xA828,
-       0xA880,
-       0xA882,
-       0xA8B4,
+       0xA825,
+       0xA827,
+       0xA8C4,
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
-       0xA954,
-       0xA960,
-       0xA97D,
+       0xA952,
        0xA980,
-       0xA984,
+       0xA983,
        0xA9B3,
-       0xA9C1,
+       0xA9B4,
+       0xA9B6,
+       0xA9BA,
+       0xA9BC,
+       0xA9BD,
        0xA9E5,
        0xA9E6,
        0xAA29,
+       0xAA2F,
+       0xAA31,
+       0xAA33,
+       0xAA35,
        0xAA37,
        0xAA43,
        0xAA44,
        0xAA4C,
-       0xAA4E,
+       0xAA4D,
        0xAA7C,
        0xAA7D,
        0xAAB0,
@@ -232872,34 +236868,24 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xAAC0,
        0xAAC1,
        0xAAC2,
-       0xAAEB,
-       0xAAF0,
-       0xAAF5,
+       0xAAEC,
+       0xAAEE,
+       0xAAF6,
        0xAAF7,
-       0xABE3,
-       0xABEB,
-       0xABEC,
+       0xABE5,
+       0xABE6,
+       0xABE8,
+       0xABE9,
+       0xABED,
        0xABEE,
-       0xAC00,
-       0xD7A4,
-       0xD7B0,
-       0xD7C7,
-       0xD7CB,
-       0xD7FC,
-       0xD800,
-       0xE000,
        0xFB1E,
        0xFB1F,
        0xFE00,
        0xFE10,
        0xFE20,
        0xFE30,
-       0xFEFF,
-       0xFF00,
        0xFF9E,
        0xFFA0,
-       0xFFF0,
-       0xFFFC,
        0x101FD,
        0x101FE,
        0x102E0,
@@ -232918,87 +236904,143 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x10A40,
        0x10AE5,
        0x10AE7,
-       0x11000,
-       0x11003,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
+       0x11001,
+       0x11002,
        0x11038,
        0x11047,
        0x1107F,
-       0x11083,
-       0x110B0,
+       0x11082,
+       0x110B3,
+       0x110B7,
+       0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
+       0x1112C,
+       0x1112D,
        0x11135,
        0x11173,
        0x11174,
        0x11180,
-       0x11183,
-       0x111B3,
-       0x111C1,
-       0x111C2,
-       0x111C4,
-       0x111CA,
+       0x11182,
+       0x111B6,
+       0x111BF,
+       0x111C9,
        0x111CD,
-       0x1122C,
+       0x1122F,
+       0x11232,
+       0x11234,
+       0x11235,
+       0x11236,
        0x11238,
        0x1123E,
        0x1123F,
        0x112DF,
+       0x112E0,
+       0x112E3,
        0x112EB,
        0x11300,
-       0x11304,
-       0x1133C,
+       0x11302,
+       0x1133B,
        0x1133D,
        0x1133E,
-       0x11345,
-       0x11347,
-       0x11349,
-       0x1134B,
-       0x1134E,
+       0x1133F,
+       0x11340,
+       0x11341,
        0x11357,
        0x11358,
-       0x11362,
-       0x11364,
        0x11366,
        0x1136D,
        0x11370,
        0x11375,
-       0x11435,
+       0x11438,
+       0x11440,
+       0x11442,
+       0x11445,
+       0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
+       0x114B1,
+       0x114B3,
+       0x114B9,
+       0x114BA,
+       0x114BB,
+       0x114BD,
+       0x114BE,
+       0x114BF,
+       0x114C1,
+       0x114C2,
        0x114C4,
        0x115AF,
+       0x115B0,
+       0x115B2,
        0x115B6,
-       0x115B8,
+       0x115BC,
+       0x115BE,
+       0x115BF,
        0x115C1,
        0x115DC,
        0x115DE,
-       0x11630,
+       0x11633,
+       0x1163B,
+       0x1163D,
+       0x1163E,
+       0x1163F,
        0x11641,
        0x116AB,
+       0x116AC,
+       0x116AD,
+       0x116AE,
+       0x116B0,
+       0x116B6,
+       0x116B7,
        0x116B8,
        0x1171D,
+       0x11720,
+       0x11722,
+       0x11726,
+       0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
+       0x11A39,
+       0x11A3B,
        0x11A3F,
        0x11A47,
        0x11A48,
        0x11A51,
+       0x11A57,
+       0x11A59,
        0x11A5C,
-       0x11A86,
+       0x11A8A,
+       0x11A97,
+       0x11A98,
        0x11A9A,
-       0x11C2F,
+       0x11C30,
        0x11C37,
        0x11C38,
+       0x11C3E,
+       0x11C3F,
        0x11C40,
        0x11C92,
        0x11CA8,
-       0x11CA9,
+       0x11CAA,
+       0x11CB1,
+       0x11CB2,
+       0x11CB4,
+       0x11CB5,
        0x11CB7,
        0x11D31,
        0x11D37,
@@ -233007,22 +237049,32 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11D3C,
        0x11D3E,
        0x11D3F,
+       0x11D46,
+       0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
        0x16B37,
-       0x16F51,
-       0x16F7F,
        0x16F8F,
        0x16F93,
        0x1BC9D,
        0x1BC9F,
-       0x1BCA0,
-       0x1BCA4,
        0x1D165,
+       0x1D166,
+       0x1D167,
        0x1D16A,
-       0x1D16D,
+       0x1D16E,
+       0x1D173,
+       0x1D17B,
        0x1D183,
        0x1D185,
        0x1D18C,
@@ -233056,120 +237108,403 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1E8D7,
        0x1E944,
        0x1E94B,
-       0x1F1E6,
-       0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
-       0xE0000,
-       0xE1000
+       0xE0020,
+       0xE0080,
+       0xE0100,
+       0xE01F0
 };
 
-#  endif       /* ASCII/Latin1 */
+static const UV UNI_GCB__L_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1100,
+       0x1160,
+       0xA960,
+       0xA97D
+};
 
-#  if 'A' == 193 /* EBCDIC 1047 */ \
-     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
-     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 121
+static const UV UNI_GCB__PP_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x600,
+       0x606,
+       0x6DD,
+       0x6DE,
+       0x70F,
+       0x710,
+       0x8E2,
+       0x8E3,
+       0xD4E,
+       0xD4F,
+       0x110BD,
+       0x110BE,
+       0x110CD,
+       0x110CE,
+       0x111C2,
+       0x111C4,
+       0x11A3A,
+       0x11A3B,
+       0x11A86,
+       0x11A8A,
+       0x11D46,
+       0x11D47
+};
 
-static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
-       672,    /* Number of elements */
+static const UV UNI_GCB__SM_invlist[] = {  /* for all charsets */
+       303,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
-       0x40,
-       0xCA,
-       0xCB,
-       0xFF,
-       0x100,
+       0x903,
+       0x904,
+       0x93B,
+       0x93C,
+       0x93E,
+       0x941,
+       0x949,
+       0x94D,
+       0x94E,
+       0x950,
+       0x982,
+       0x984,
+       0x9BF,
+       0x9C1,
+       0x9C7,
+       0x9C9,
+       0x9CB,
+       0x9CD,
+       0xA03,
+       0xA04,
+       0xA3E,
+       0xA41,
+       0xA83,
+       0xA84,
+       0xABE,
+       0xAC1,
+       0xAC9,
+       0xACA,
+       0xACB,
+       0xACD,
+       0xB02,
+       0xB04,
+       0xB40,
+       0xB41,
+       0xB47,
+       0xB49,
+       0xB4B,
+       0xB4D,
+       0xBBF,
+       0xBC0,
+       0xBC1,
+       0xBC3,
+       0xBC6,
+       0xBC9,
+       0xBCA,
+       0xBCD,
+       0xC01,
+       0xC04,
+       0xC41,
+       0xC45,
+       0xC82,
+       0xC84,
+       0xCBE,
+       0xCBF,
+       0xCC0,
+       0xCC2,
+       0xCC3,
+       0xCC5,
+       0xCC7,
+       0xCC9,
+       0xCCA,
+       0xCCC,
+       0xD02,
+       0xD04,
+       0xD3F,
+       0xD41,
+       0xD46,
+       0xD49,
+       0xD4A,
+       0xD4D,
+       0xD82,
+       0xD84,
+       0xDD0,
+       0xDD2,
+       0xDD8,
+       0xDDF,
+       0xDF2,
+       0xDF4,
+       0xE33,
+       0xE34,
+       0xEB3,
+       0xEB4,
+       0xF3E,
+       0xF40,
+       0xF7F,
+       0xF80,
+       0x1031,
+       0x1032,
+       0x103B,
+       0x103D,
+       0x1056,
+       0x1058,
+       0x1084,
+       0x1085,
+       0x17B6,
+       0x17B7,
+       0x17BE,
+       0x17C6,
+       0x17C7,
+       0x17C9,
+       0x1923,
+       0x1927,
+       0x1929,
+       0x192C,
+       0x1930,
+       0x1932,
+       0x1933,
+       0x1939,
+       0x1A19,
+       0x1A1B,
+       0x1A55,
+       0x1A56,
+       0x1A57,
+       0x1A58,
+       0x1A6D,
+       0x1A73,
+       0x1B04,
+       0x1B05,
+       0x1B35,
+       0x1B36,
+       0x1B3B,
+       0x1B3C,
+       0x1B3D,
+       0x1B42,
+       0x1B43,
+       0x1B45,
+       0x1B82,
+       0x1B83,
+       0x1BA1,
+       0x1BA2,
+       0x1BA6,
+       0x1BA8,
+       0x1BAA,
+       0x1BAB,
+       0x1BE7,
+       0x1BE8,
+       0x1BEA,
+       0x1BED,
+       0x1BEE,
+       0x1BEF,
+       0x1BF2,
+       0x1BF4,
+       0x1C24,
+       0x1C2C,
+       0x1C34,
+       0x1C36,
+       0x1CE1,
+       0x1CE2,
+       0x1CF2,
+       0x1CF4,
+       0x1CF7,
+       0x1CF8,
+       0xA823,
+       0xA825,
+       0xA827,
+       0xA828,
+       0xA880,
+       0xA882,
+       0xA8B4,
+       0xA8C4,
+       0xA952,
+       0xA954,
+       0xA983,
+       0xA984,
+       0xA9B4,
+       0xA9B6,
+       0xA9BA,
+       0xA9BC,
+       0xA9BD,
+       0xA9C1,
+       0xAA2F,
+       0xAA31,
+       0xAA33,
+       0xAA35,
+       0xAA4D,
+       0xAA4E,
+       0xAAEB,
+       0xAAEC,
+       0xAAEE,
+       0xAAF0,
+       0xAAF5,
+       0xAAF6,
+       0xABE3,
+       0xABE5,
+       0xABE6,
+       0xABE8,
+       0xABE9,
+       0xABEB,
+       0xABEC,
+       0xABED,
+       0x11000,
+       0x11001,
+       0x11002,
+       0x11003,
+       0x11082,
+       0x11083,
+       0x110B0,
+       0x110B3,
+       0x110B7,
+       0x110B9,
+       0x1112C,
+       0x1112D,
+       0x11145,
+       0x11147,
+       0x11182,
+       0x11183,
+       0x111B3,
+       0x111B6,
+       0x111BF,
+       0x111C1,
+       0x1122C,
+       0x1122F,
+       0x11232,
+       0x11234,
+       0x11235,
+       0x11236,
+       0x112E0,
+       0x112E3,
+       0x11302,
+       0x11304,
+       0x1133F,
+       0x11340,
+       0x11341,
+       0x11345,
+       0x11347,
+       0x11349,
+       0x1134B,
+       0x1134E,
+       0x11362,
+       0x11364,
+       0x11435,
+       0x11438,
+       0x11440,
+       0x11442,
+       0x11445,
+       0x11446,
+       0x114B1,
+       0x114B3,
+       0x114B9,
+       0x114BA,
+       0x114BB,
+       0x114BD,
+       0x114BE,
+       0x114BF,
+       0x114C1,
+       0x114C2,
+       0x115B0,
+       0x115B2,
+       0x115B8,
+       0x115BC,
+       0x115BE,
+       0x115BF,
+       0x11630,
+       0x11633,
+       0x1163B,
+       0x1163D,
+       0x1163E,
+       0x1163F,
+       0x116AC,
+       0x116AD,
+       0x116AE,
+       0x116B0,
+       0x116B6,
+       0x116B7,
+       0x11720,
+       0x11722,
+       0x11726,
+       0x11727,
+       0x1182C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x11A39,
+       0x11A3A,
+       0x11A57,
+       0x11A59,
+       0x11A97,
+       0x11A98,
+       0x11C2F,
+       0x11C30,
+       0x11C3E,
+       0x11C3F,
+       0x11CA9,
+       0x11CAA,
+       0x11CB1,
+       0x11CB2,
+       0x11CB4,
+       0x11CB5,
+       0x11D8A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11EF5,
+       0x11EF7,
+       0x16F51,
+       0x16F7F,
+       0x1D166,
+       0x1D167,
+       0x1D16D,
+       0x1D16E
+};
+
+static const UV UNI_GCB__T_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11A8,
+       0x1200,
+       0xD7CB,
+       0xD7FC
+};
+
+static const UV UNI_GCB__V_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1160,
+       0x11A8,
+       0xD7B0,
+       0xD7C7
+};
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
+static const UV UNI_GCB__XX_invlist[] = {  /* for ASCII/Latin1 */
+       594,    /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x20,
+       0x7F,
+       0xA0,
+       0xAD,
+       0xAE,
        0x300,
        0x370,
        0x483,
@@ -233212,6 +237547,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -233222,7 +237559,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x904,
        0x93A,
        0x93D,
@@ -233246,6 +237583,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -233301,7 +237640,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -233480,22 +237819,6 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x2070,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -233528,6 +237851,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -233604,6 +237929,10 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -233614,10 +237943,14 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
@@ -233626,7 +237959,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x111C1,
        0x111C2,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -233636,7 +237969,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -233654,6 +237987,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -233668,6 +238003,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x116B8,
        0x1171D,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -233694,6 +238031,14 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11D3E,
        0x11D3F,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -233744,109 +238089,21 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1E94B,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
        0xE0000,
        0xE1000
 };
 
-#  endif       /* EBCDIC 1047 */
+#  endif       /* ASCII/Latin1 */
 
-#  if 'A' == 193 /* EBCDIC 037 */ \
-     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
-     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
-       672,    /* Number of elements */
+static const UV UNI_GCB__XX_invlist[] = {  /* for EBCDIC 1047 */
+       594,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -233898,6 +238155,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -233908,7 +238167,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x904,
        0x93A,
        0x93D,
@@ -233932,6 +238191,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -233987,7 +238248,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -234166,22 +238427,6 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x2070,
        0x20D0,
        0x20F1,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2CEF,
        0x2CF2,
        0x2D7F,
@@ -234214,6 +238459,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -234290,6 +238537,10 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -234300,10 +238551,14 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x11100,
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
@@ -234312,7 +238567,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x111C1,
        0x111C2,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -234322,7 +238577,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -234340,6 +238595,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -234354,6 +238611,8 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x116B8,
        0x1171D,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -234380,6 +238639,622 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11D3E,
        0x11D3F,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
+       0x16AF0,
+       0x16AF5,
+       0x16B30,
+       0x16B37,
+       0x16F51,
+       0x16F7F,
+       0x16F8F,
+       0x16F93,
+       0x1BC9D,
+       0x1BC9F,
+       0x1BCA0,
+       0x1BCA4,
+       0x1D165,
+       0x1D16A,
+       0x1D16D,
+       0x1D183,
+       0x1D185,
+       0x1D18C,
+       0x1D1AA,
+       0x1D1AE,
+       0x1D242,
+       0x1D245,
+       0x1DA00,
+       0x1DA37,
+       0x1DA3B,
+       0x1DA6D,
+       0x1DA75,
+       0x1DA76,
+       0x1DA84,
+       0x1DA85,
+       0x1DA9B,
+       0x1DAA0,
+       0x1DAA1,
+       0x1DAB0,
+       0x1E000,
+       0x1E007,
+       0x1E008,
+       0x1E019,
+       0x1E01B,
+       0x1E022,
+       0x1E023,
+       0x1E025,
+       0x1E026,
+       0x1E02B,
+       0x1E8D0,
+       0x1E8D7,
+       0x1E944,
+       0x1E94B,
+       0x1F1E6,
+       0x1F200,
+       0x1F3FB,
+       0x1F400,
+       0xE0000,
+       0xE1000
+};
+
+#  endif       /* EBCDIC 1047 */
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
+static const UV UNI_GCB__XX_invlist[] = {  /* for EBCDIC 037 */
+       594,    /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x40,
+       0xCA,
+       0xCB,
+       0xFF,
+       0x100,
+       0x300,
+       0x370,
+       0x483,
+       0x48A,
+       0x591,
+       0x5BE,
+       0x5BF,
+       0x5C0,
+       0x5C1,
+       0x5C3,
+       0x5C4,
+       0x5C6,
+       0x5C7,
+       0x5C8,
+       0x600,
+       0x606,
+       0x610,
+       0x61B,
+       0x61C,
+       0x61D,
+       0x64B,
+       0x660,
+       0x670,
+       0x671,
+       0x6D6,
+       0x6DE,
+       0x6DF,
+       0x6E5,
+       0x6E7,
+       0x6E9,
+       0x6EA,
+       0x6EE,
+       0x70F,
+       0x710,
+       0x711,
+       0x712,
+       0x730,
+       0x74B,
+       0x7A6,
+       0x7B1,
+       0x7EB,
+       0x7F4,
+       0x7FD,
+       0x7FE,
+       0x816,
+       0x81A,
+       0x81B,
+       0x824,
+       0x825,
+       0x828,
+       0x829,
+       0x82E,
+       0x859,
+       0x85C,
+       0x8D3,
+       0x904,
+       0x93A,
+       0x93D,
+       0x93E,
+       0x950,
+       0x951,
+       0x958,
+       0x962,
+       0x964,
+       0x981,
+       0x984,
+       0x9BC,
+       0x9BD,
+       0x9BE,
+       0x9C5,
+       0x9C7,
+       0x9C9,
+       0x9CB,
+       0x9CE,
+       0x9D7,
+       0x9D8,
+       0x9E2,
+       0x9E4,
+       0x9FE,
+       0x9FF,
+       0xA01,
+       0xA04,
+       0xA3C,
+       0xA3D,
+       0xA3E,
+       0xA43,
+       0xA47,
+       0xA49,
+       0xA4B,
+       0xA4E,
+       0xA51,
+       0xA52,
+       0xA70,
+       0xA72,
+       0xA75,
+       0xA76,
+       0xA81,
+       0xA84,
+       0xABC,
+       0xABD,
+       0xABE,
+       0xAC6,
+       0xAC7,
+       0xACA,
+       0xACB,
+       0xACE,
+       0xAE2,
+       0xAE4,
+       0xAFA,
+       0xB00,
+       0xB01,
+       0xB04,
+       0xB3C,
+       0xB3D,
+       0xB3E,
+       0xB45,
+       0xB47,
+       0xB49,
+       0xB4B,
+       0xB4E,
+       0xB56,
+       0xB58,
+       0xB62,
+       0xB64,
+       0xB82,
+       0xB83,
+       0xBBE,
+       0xBC3,
+       0xBC6,
+       0xBC9,
+       0xBCA,
+       0xBCE,
+       0xBD7,
+       0xBD8,
+       0xC00,
+       0xC05,
+       0xC3E,
+       0xC45,
+       0xC46,
+       0xC49,
+       0xC4A,
+       0xC4E,
+       0xC55,
+       0xC57,
+       0xC62,
+       0xC64,
+       0xC81,
+       0xC84,
+       0xCBC,
+       0xCBD,
+       0xCBE,
+       0xCC5,
+       0xCC6,
+       0xCC9,
+       0xCCA,
+       0xCCE,
+       0xCD5,
+       0xCD7,
+       0xCE2,
+       0xCE4,
+       0xD00,
+       0xD04,
+       0xD3B,
+       0xD3D,
+       0xD3E,
+       0xD45,
+       0xD46,
+       0xD49,
+       0xD4A,
+       0xD4F,
+       0xD57,
+       0xD58,
+       0xD62,
+       0xD64,
+       0xD82,
+       0xD84,
+       0xDCA,
+       0xDCB,
+       0xDCF,
+       0xDD5,
+       0xDD6,
+       0xDD7,
+       0xDD8,
+       0xDE0,
+       0xDF2,
+       0xDF4,
+       0xE31,
+       0xE32,
+       0xE33,
+       0xE3B,
+       0xE47,
+       0xE4F,
+       0xEB1,
+       0xEB2,
+       0xEB3,
+       0xEBA,
+       0xEBB,
+       0xEBD,
+       0xEC8,
+       0xECE,
+       0xF18,
+       0xF1A,
+       0xF35,
+       0xF36,
+       0xF37,
+       0xF38,
+       0xF39,
+       0xF3A,
+       0xF3E,
+       0xF40,
+       0xF71,
+       0xF85,
+       0xF86,
+       0xF88,
+       0xF8D,
+       0xF98,
+       0xF99,
+       0xFBD,
+       0xFC6,
+       0xFC7,
+       0x102D,
+       0x1038,
+       0x1039,
+       0x103F,
+       0x1056,
+       0x105A,
+       0x105E,
+       0x1061,
+       0x1071,
+       0x1075,
+       0x1082,
+       0x1083,
+       0x1084,
+       0x1087,
+       0x108D,
+       0x108E,
+       0x109D,
+       0x109E,
+       0x1100,
+       0x1200,
+       0x135D,
+       0x1360,
+       0x1712,
+       0x1715,
+       0x1732,
+       0x1735,
+       0x1752,
+       0x1754,
+       0x1772,
+       0x1774,
+       0x17B4,
+       0x17D4,
+       0x17DD,
+       0x17DE,
+       0x180B,
+       0x180F,
+       0x1885,
+       0x1887,
+       0x18A9,
+       0x18AA,
+       0x1920,
+       0x192C,
+       0x1930,
+       0x193C,
+       0x1A17,
+       0x1A1C,
+       0x1A55,
+       0x1A5F,
+       0x1A60,
+       0x1A61,
+       0x1A62,
+       0x1A63,
+       0x1A65,
+       0x1A7D,
+       0x1A7F,
+       0x1A80,
+       0x1AB0,
+       0x1ABF,
+       0x1B00,
+       0x1B05,
+       0x1B34,
+       0x1B45,
+       0x1B6B,
+       0x1B74,
+       0x1B80,
+       0x1B83,
+       0x1BA1,
+       0x1BAE,
+       0x1BE6,
+       0x1BF4,
+       0x1C24,
+       0x1C38,
+       0x1CD0,
+       0x1CD3,
+       0x1CD4,
+       0x1CE9,
+       0x1CED,
+       0x1CEE,
+       0x1CF2,
+       0x1CF5,
+       0x1CF7,
+       0x1CFA,
+       0x1DC0,
+       0x1DFA,
+       0x1DFB,
+       0x1E00,
+       0x200B,
+       0x2010,
+       0x2028,
+       0x202F,
+       0x2060,
+       0x2070,
+       0x20D0,
+       0x20F1,
+       0x2CEF,
+       0x2CF2,
+       0x2D7F,
+       0x2D80,
+       0x2DE0,
+       0x2E00,
+       0x302A,
+       0x3030,
+       0x3099,
+       0x309B,
+       0xA66F,
+       0xA673,
+       0xA674,
+       0xA67E,
+       0xA69E,
+       0xA6A0,
+       0xA6F0,
+       0xA6F2,
+       0xA802,
+       0xA803,
+       0xA806,
+       0xA807,
+       0xA80B,
+       0xA80C,
+       0xA823,
+       0xA828,
+       0xA880,
+       0xA882,
+       0xA8B4,
+       0xA8C6,
+       0xA8E0,
+       0xA8F2,
+       0xA8FF,
+       0xA900,
+       0xA926,
+       0xA92E,
+       0xA947,
+       0xA954,
+       0xA960,
+       0xA97D,
+       0xA980,
+       0xA984,
+       0xA9B3,
+       0xA9C1,
+       0xA9E5,
+       0xA9E6,
+       0xAA29,
+       0xAA37,
+       0xAA43,
+       0xAA44,
+       0xAA4C,
+       0xAA4E,
+       0xAA7C,
+       0xAA7D,
+       0xAAB0,
+       0xAAB1,
+       0xAAB2,
+       0xAAB5,
+       0xAAB7,
+       0xAAB9,
+       0xAABE,
+       0xAAC0,
+       0xAAC1,
+       0xAAC2,
+       0xAAEB,
+       0xAAF0,
+       0xAAF5,
+       0xAAF7,
+       0xABE3,
+       0xABEB,
+       0xABEC,
+       0xABEE,
+       0xAC00,
+       0xD7A4,
+       0xD7B0,
+       0xD7C7,
+       0xD7CB,
+       0xD7FC,
+       0xD800,
+       0xE000,
+       0xFB1E,
+       0xFB1F,
+       0xFE00,
+       0xFE10,
+       0xFE20,
+       0xFE30,
+       0xFEFF,
+       0xFF00,
+       0xFF9E,
+       0xFFA0,
+       0xFFF0,
+       0xFFFC,
+       0x101FD,
+       0x101FE,
+       0x102E0,
+       0x102E1,
+       0x10376,
+       0x1037B,
+       0x10A01,
+       0x10A04,
+       0x10A05,
+       0x10A07,
+       0x10A0C,
+       0x10A10,
+       0x10A38,
+       0x10A3B,
+       0x10A3F,
+       0x10A40,
+       0x10AE5,
+       0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
+       0x11000,
+       0x11003,
+       0x11038,
+       0x11047,
+       0x1107F,
+       0x11083,
+       0x110B0,
+       0x110BB,
+       0x110BD,
+       0x110BE,
+       0x110CD,
+       0x110CE,
+       0x11100,
+       0x11103,
+       0x11127,
+       0x11135,
+       0x11145,
+       0x11147,
+       0x11173,
+       0x11174,
+       0x11180,
+       0x11183,
+       0x111B3,
+       0x111C1,
+       0x111C2,
+       0x111C4,
+       0x111C9,
+       0x111CD,
+       0x1122C,
+       0x11238,
+       0x1123E,
+       0x1123F,
+       0x112DF,
+       0x112EB,
+       0x11300,
+       0x11304,
+       0x1133B,
+       0x1133D,
+       0x1133E,
+       0x11345,
+       0x11347,
+       0x11349,
+       0x1134B,
+       0x1134E,
+       0x11357,
+       0x11358,
+       0x11362,
+       0x11364,
+       0x11366,
+       0x1136D,
+       0x11370,
+       0x11375,
+       0x11435,
+       0x11447,
+       0x1145E,
+       0x1145F,
+       0x114B0,
+       0x114C4,
+       0x115AF,
+       0x115B6,
+       0x115B8,
+       0x115C1,
+       0x115DC,
+       0x115DE,
+       0x11630,
+       0x11641,
+       0x116AB,
+       0x116B8,
+       0x1171D,
+       0x1172C,
+       0x1182C,
+       0x1183B,
+       0x11A01,
+       0x11A0B,
+       0x11A33,
+       0x11A3F,
+       0x11A47,
+       0x11A48,
+       0x11A51,
+       0x11A5C,
+       0x11A86,
+       0x11A9A,
+       0x11C2F,
+       0x11C37,
+       0x11C38,
+       0x11C40,
+       0x11C92,
+       0x11CA8,
+       0x11CA9,
+       0x11CB7,
+       0x11D31,
+       0x11D37,
+       0x11D3A,
+       0x11D3B,
+       0x11D3C,
+       0x11D3E,
+       0x11D3F,
+       0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -234430,103 +239305,15 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1E94B,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
        0xE0000,
        0xE1000
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_GEOMETRICSHAPES_invlist[] = { /* for all charsets */
+static const UV UNI_GEOMETRICSHAPES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234536,7 +239323,7 @@ static const UV PL_GEOMETRICSHAPES_invlist[] = { /* for all charsets */
        0x2600
 };
 
-static const UV PL_GEOMETRICSHAPESEXT_invlist[] = { /* for all charsets */
+static const UV UNI_GEOMETRICSHAPESEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234546,8 +239333,8 @@ static const UV PL_GEOMETRICSHAPESEXT_invlist[] = { /* for all charsets */
        0x1F800
 };
 
-static const UV PL_GEOR_invlist[] = { /* for all charsets */
-       17,     /* Number of elements */
+static const UV UNI_GEOR_invlist[] = {  /* for all charsets */
+       21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -234562,6 +239349,10 @@ static const UV PL_GEOR_invlist[] = { /* for all charsets */
        0x10CE,
        0x10D0,
        0x1100,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x2D00,
        0x2D26,
        0x2D27,
@@ -234570,7 +239361,17 @@ static const UV PL_GEOR_invlist[] = { /* for all charsets */
        0x2D2E
 };
 
-static const UV PL_GEORGIANSUP_invlist[] = { /* for all charsets */
+static const UV UNI_GEORGIANEXT_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1C90,
+       0x1CC0
+};
+
+static const UV UNI_GEORGIANSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234580,7 +239381,7 @@ static const UV PL_GEORGIANSUP_invlist[] = { /* for all charsets */
        0x2D30
 };
 
-static const UV PL_GLAG_invlist[] = { /* for all charsets */
+static const UV UNI_GLAG_invlist[] = {  /* for all charsets */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234610,7 +239411,7 @@ static const UV PL_GLAG_invlist[] = { /* for all charsets */
        0x1E02B
 };
 
-static const UV PL_GLAGOLITICSUP_invlist[] = { /* for all charsets */
+static const UV UNI_GLAGOLITICSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234620,7 +239421,29 @@ static const UV PL_GLAGOLITICSUP_invlist[] = { /* for all charsets */
        0x1E030
 };
 
-static const UV PL_GONM_invlist[] = { /* for all charsets */
+static const UV UNI_GONG_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x964,
+       0x966,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA
+};
+
+static const UV UNI_GONM_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234642,7 +239465,7 @@ static const UV PL_GONM_invlist[] = { /* for all charsets */
        0x11D5A
 };
 
-static const UV PL_GOTH_invlist[] = { /* for all charsets */
+static const UV UNI_GOTH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -234652,8 +239475,8 @@ static const UV PL_GOTH_invlist[] = { /* for all charsets */
        0x1034B
 };
 
-static const UV PL_GRAN_invlist[] = { /* for all charsets */
-       51,     /* Number of elements */
+static const UV UNI_GRAN_invlist[] = {  /* for all charsets */
+       47,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -234662,12 +239485,8 @@ static const UV PL_GRAN_invlist[] = { /* for all charsets */
        0x953,
        0x964,
        0x966,
-       0xBAA,
-       0xBAB,
-       0xBB5,
-       0xBB6,
        0xBE6,
-       0xBF3,
+       0xBF4,
        0x1CD0,
        0x1CD1,
        0x1CD2,
@@ -234692,7 +239511,7 @@ static const UV PL_GRAN_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -234712,8 +239531,8 @@ static const UV PL_GRAN_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
-       1583,   /* Number of elements */
+static const UV UNI_GRBASE_invlist[] = {  /* for ASCII/Latin1 */
+       1613,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -234741,10 +239560,6 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -234758,7 +239573,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x5C7,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x610,
@@ -234790,7 +239605,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x7EB,
        0x7F4,
        0x7FB,
-       0x800,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -234880,6 +239695,8 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0xA70,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA83,
        0xA84,
        0xA85,
@@ -234991,8 +239808,6 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0xC78,
        0xC81,
        0xC82,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -235237,7 +240052,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -235326,7 +240141,9 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -235397,13 +240214,9 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -235441,7 +240254,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x2DD8,
        0x2DDF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -235459,7 +240272,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x309B,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -235473,7 +240286,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -235491,9 +240304,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0xA6F2,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -235513,7 +240324,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0xA8CE,
        0xA8DA,
        0xA8F2,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA926,
        0xA92E,
@@ -235755,9 +240566,9 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -235785,9 +240596,17 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11000,
        0x11001,
        0x11002,
@@ -235813,7 +240632,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1112C,
        0x1112D,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -235821,7 +240640,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -235943,21 +240762,25 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x11720,
        0x11722,
        0x11726,
        0x11727,
        0x11730,
        0x11740,
+       0x11800,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
        0x11900,
        0x11A00,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -235975,8 +240798,6 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x11A97,
        0x11A98,
        0x11A9A,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -236008,6 +240829,24 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x11D47,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF5,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -236044,6 +240883,8 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -236053,7 +240894,7 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -236092,10 +240933,12 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -236156,6 +240999,8 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -236239,8 +241084,6 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -236259,11 +241102,11 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -236279,15 +241122,21 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -236309,8 +241158,8 @@ static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
-       1583,   /* Number of elements */
+static const UV UNI_GRBASE_invlist[] = {  /* for EBCDIC 1047 */
+       1613,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -236338,10 +241187,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -236355,7 +241200,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x5C7,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x610,
@@ -236387,7 +241232,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x7EB,
        0x7F4,
        0x7FB,
-       0x800,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -236477,6 +241322,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0xA70,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA83,
        0xA84,
        0xA85,
@@ -236588,8 +241435,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0xC78,
        0xC81,
        0xC82,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -236834,7 +241679,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -236923,7 +241768,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -236994,13 +241841,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -237038,7 +241881,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x2DD8,
        0x2DDF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -237056,7 +241899,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x309B,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -237070,7 +241913,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -237088,9 +241931,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0xA6F2,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -237110,7 +241951,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0xA8CE,
        0xA8DA,
        0xA8F2,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA926,
        0xA92E,
@@ -237352,9 +242193,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -237382,9 +242223,17 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11000,
        0x11001,
        0x11002,
@@ -237410,7 +242259,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1112C,
        0x1112D,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -237418,7 +242267,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -237540,21 +242389,25 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x11720,
        0x11722,
        0x11726,
        0x11727,
        0x11730,
        0x11740,
+       0x11800,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
        0x11900,
        0x11A00,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -237572,8 +242425,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x11A97,
        0x11A98,
        0x11A9A,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -237605,6 +242456,24 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x11D47,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF5,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -237641,6 +242510,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -237650,7 +242521,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -237689,10 +242560,12 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -237753,6 +242626,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -237836,8 +242711,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -237856,11 +242729,11 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -237876,15 +242749,21 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -237906,8 +242785,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
-       1583,   /* Number of elements */
+static const UV UNI_GRBASE_invlist[] = {  /* for EBCDIC 037 */
+       1613,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -237935,10 +242814,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -237952,7 +242827,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x5C7,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x606,
        0x610,
@@ -237984,7 +242859,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x7EB,
        0x7F4,
        0x7FB,
-       0x800,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -238074,6 +242949,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0xA70,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA83,
        0xA84,
        0xA85,
@@ -238185,8 +243062,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0xC78,
        0xC81,
        0xC82,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -238431,7 +243306,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -238520,7 +243395,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -238591,13 +243468,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -238635,7 +243508,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x2DD8,
        0x2DDF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -238653,7 +243526,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x309B,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -238667,7 +243540,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -238685,9 +243558,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0xA6F2,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -238707,7 +243578,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0xA8CE,
        0xA8DA,
        0xA8F2,
-       0xA8FE,
+       0xA8FF,
        0xA900,
        0xA926,
        0xA92E,
@@ -238949,9 +243820,9 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -238979,9 +243850,17 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11000,
        0x11001,
        0x11002,
@@ -239007,7 +243886,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1112C,
        0x1112D,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11173,
        0x11174,
@@ -239015,7 +243894,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111D0,
@@ -239137,21 +244016,25 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x11720,
        0x11722,
        0x11726,
        0x11727,
        0x11730,
        0x11740,
+       0x11800,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
        0x11900,
        0x11A00,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -239169,8 +244052,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x11A97,
        0x11A98,
        0x11A9A,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -239202,6 +244083,24 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x11D47,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF3,
+       0x11EF5,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -239238,6 +244137,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -239247,7 +244148,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -239286,10 +244187,12 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -239350,6 +244253,8 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -239433,8 +244338,6 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -239453,11 +244356,11 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -239473,15 +244376,21 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -239498,7 +244407,7 @@ static const UV PL_GRBASE_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_GREEKEXT_invlist[] = { /* for all charsets */
+static const UV UNI_GREEKEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -239508,7 +244417,7 @@ static const UV PL_GREEKEXT_invlist[] = { /* for all charsets */
        0x2000
 };
 
-static const UV PL_GREK_invlist[] = { /* for all charsets */
+static const UV UNI_GREK_invlist[] = {  /* for all charsets */
        77,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -239592,8 +244501,8 @@ static const UV PL_GREK_invlist[] = { /* for all charsets */
        0x1D246
 };
 
-static const UV PL_GREXT_invlist[] = { /* for all charsets */
-       639,    /* Number of elements */
+static const UV UNI_GREXT_invlist[] = {  /* for all charsets */
+       663,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -239634,6 +244543,8 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -239644,7 +244555,7 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -239674,6 +244585,8 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -239730,6 +244643,8 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0xBD8,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -239972,6 +244887,8 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -240044,6 +244961,10 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -240066,7 +244987,7 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -240082,7 +245003,7 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x1133F,
@@ -240100,6 +245021,8 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114B1,
        0x114B3,
@@ -240142,9 +245065,11 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -240184,6 +245109,14 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -240238,7 +245171,7 @@ static const UV PL_GREXT_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_GUJR_invlist[] = { /* for all charsets */
+static const UV UNI_GUJR_invlist[] = {  /* for all charsets */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240280,7 +245213,7 @@ static const UV PL_GUJR_invlist[] = { /* for all charsets */
        0xA83A
 };
 
-static const UV PL_GURU_invlist[] = { /* for all charsets */
+static const UV UNI_GURU_invlist[] = {  /* for all charsets */
        39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240321,12 +245254,12 @@ static const UV PL_GURU_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA830,
        0xA83A
 };
 
-static const UV PL_HALFANDFULLFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_HALFANDFULLFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240336,7 +245269,7 @@ static const UV PL_HALFANDFULLFORMS_invlist[] = { /* for all charsets */
        0xFFF0
 };
 
-static const UV PL_HALFMARKS_invlist[] = { /* for all charsets */
+static const UV UNI_HALFMARKS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240346,7 +245279,7 @@ static const UV PL_HALFMARKS_invlist[] = { /* for all charsets */
        0xFE30
 };
 
-static const UV PL_HAN_invlist[] = { /* for all charsets */
+static const UV UNI_HAN_invlist[] = {  /* for all charsets */
        65,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240391,7 +245324,7 @@ static const UV PL_HAN_invlist[] = { /* for all charsets */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xF900,
        0xFA6E,
        0xFA70,
@@ -240418,7 +245351,7 @@ static const UV PL_HAN_invlist[] = { /* for all charsets */
        0x2FA1E
 };
 
-static const UV PL_HANG_invlist[] = { /* for all charsets */
+static const UV UNI_HANG_invlist[] = {  /* for all charsets */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240468,7 +245401,7 @@ static const UV PL_HANG_invlist[] = { /* for all charsets */
        0xFFDD
 };
 
-static const UV PL_HANO_invlist[] = { /* for all charsets */
+static const UV UNI_HANO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240478,7 +245411,7 @@ static const UV PL_HANO_invlist[] = { /* for all charsets */
        0x1737
 };
 
-static const UV PL_HATR_invlist[] = { /* for all charsets */
+static const UV UNI_HATR_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240492,7 +245425,7 @@ static const UV PL_HATR_invlist[] = { /* for all charsets */
        0x10900
 };
 
-static const UV PL_HEBR_invlist[] = { /* for all charsets */
+static const UV UNI_HEBR_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240502,7 +245435,7 @@ static const UV PL_HEBR_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0xFB1D,
        0xFB37,
@@ -240518,7 +245451,7 @@ static const UV PL_HEBR_invlist[] = { /* for all charsets */
        0xFB50
 };
 
-static const UV PL_HIGHPUSURROGATES_invlist[] = { /* for all charsets */
+static const UV UNI_HIGHPUSURROGATES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240528,7 +245461,7 @@ static const UV PL_HIGHPUSURROGATES_invlist[] = { /* for all charsets */
        0xDC00
 };
 
-static const UV PL_HIGHSURROGATES_invlist[] = { /* for all charsets */
+static const UV UNI_HIGHSURROGATES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240538,7 +245471,7 @@ static const UV PL_HIGHSURROGATES_invlist[] = { /* for all charsets */
        0xDB80
 };
 
-static const UV PL_HIRA_invlist[] = { /* for all charsets */
+static const UV UNI_HIRA_invlist[] = {  /* for all charsets */
        31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240576,7 +245509,7 @@ static const UV PL_HIRA_invlist[] = { /* for all charsets */
        0x1F201
 };
 
-static const UV PL_HLUW_invlist[] = { /* for all charsets */
+static const UV UNI_HLUW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240586,7 +245519,7 @@ static const UV PL_HLUW_invlist[] = { /* for all charsets */
        0x14647
 };
 
-static const UV PL_HMNG_invlist[] = { /* for all charsets */
+static const UV UNI_HMNG_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240604,7 +245537,7 @@ static const UV PL_HMNG_invlist[] = { /* for all charsets */
        0x16B90
 };
 
-static const UV PL_HST__NA_invlist[] = { /* for all charsets */
+static const UV UNI_HST__NA_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -240622,7 +245555,7 @@ static const UV PL_HST__NA_invlist[] = { /* for all charsets */
        0xD7FC
 };
 
-static const UV PL_HUNG_invlist[] = { /* for all charsets */
+static const UV UNI_HUNG_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240638,7 +245571,7 @@ static const UV PL_HUNG_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_HYPHEN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_HYPHEN_invlist[] = {  /* for ASCII/Latin1 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240673,7 +245606,7 @@ static const UV PL_HYPHEN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_HYPHEN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_HYPHEN_invlist[] = {  /* for EBCDIC 1047 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240708,7 +245641,7 @@ static const UV PL_HYPHEN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_HYPHEN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_HYPHEN_invlist[] = {  /* for EBCDIC 037 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -240740,8 +245673,8 @@ static const UV PL_HYPHEN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
-       1379,   /* Number of elements */
+static const UV UNI_IDC_invlist[] = {  /* for ASCII/Latin1 */
+       1415,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -240802,8 +245735,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -240816,7 +245749,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -240840,6 +245773,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -240850,7 +245785,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -240886,6 +245821,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -241009,8 +245946,6 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -241261,7 +246196,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -241312,6 +246247,10 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -241453,7 +246392,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -241463,7 +246402,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -241483,9 +246422,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -241499,8 +246436,6 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -241707,7 +246642,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -241734,6 +246669,16 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -241748,13 +246693,15 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -241794,7 +246741,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -241814,6 +246761,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -241837,11 +246786,13 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -241854,6 +246805,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -241884,6 +246837,20 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -241914,6 +246881,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -241923,7 +246892,7 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -242133,8 +247102,8 @@ static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
-       1403,   /* Number of elements */
+static const UV UNI_IDC_invlist[] = {  /* for EBCDIC 1047 */
+       1439,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -242219,8 +247188,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -242233,7 +247202,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -242257,6 +247226,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -242267,7 +247238,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -242303,6 +247274,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -242426,8 +247399,6 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -242678,7 +247649,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -242729,6 +247700,10 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -242870,7 +247845,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -242880,7 +247855,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -242900,9 +247875,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -242916,8 +247889,6 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -243124,7 +248095,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -243151,6 +248122,16 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -243165,13 +248146,15 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -243211,7 +248194,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -243231,6 +248214,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -243254,11 +248239,13 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -243271,6 +248258,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -243301,6 +248290,20 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -243331,6 +248334,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -243340,7 +248345,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -243550,8 +248555,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
-       1399,   /* Number of elements */
+static const UV UNI_IDC_invlist[] = {  /* for EBCDIC 037 */
+       1435,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -243632,8 +248637,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -243646,7 +248651,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -243670,6 +248675,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -243680,7 +248687,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -243716,6 +248723,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -243839,8 +248848,6 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -244091,7 +249098,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -244142,6 +249149,10 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -244283,7 +249294,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -244293,7 +249304,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -244313,9 +249324,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -244329,8 +249338,6 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -244537,7 +249544,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -244564,6 +249571,16 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -244578,13 +249595,15 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -244624,7 +249643,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -244644,6 +249663,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -244667,11 +249688,13 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -244684,6 +249707,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -244714,6 +249739,20 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -244744,6 +249783,8 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -244753,7 +249794,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -244958,7 +249999,7 @@ static const UV PL_IDC_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_IDEO_invlist[] = { /* for all charsets */
+static const UV UNI_IDEO_invlist[] = {  /* for all charsets */
        33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -244973,13 +250014,13 @@ static const UV PL_IDEO_invlist[] = { /* for all charsets */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xF900,
        0xFA6E,
        0xFA70,
        0xFADA,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B170,
@@ -244998,7 +250039,7 @@ static const UV PL_IDEO_invlist[] = { /* for all charsets */
        0x2FA1E
 };
 
-static const UV PL_IDEOGRAPHICSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_IDEOGRAPHICSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -245010,8 +250051,8 @@ static const UV PL_IDEOGRAPHICSYMBOLS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
-       1171,   /* Number of elements */
+static const UV UNI_IDS_invlist[] = {  /* for ASCII/Latin1 */
+       1199,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -245066,11 +250107,11 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -245435,7 +250476,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -245476,6 +250517,10 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -245609,7 +250654,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -245619,7 +250664,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -245641,9 +250686,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -245661,7 +250704,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -245863,7 +250906,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -245886,6 +250929,14 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -245894,6 +250945,8 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -245961,7 +251014,9 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -245978,6 +251033,8 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -245996,6 +251053,16 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -246020,6 +251087,8 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -246029,7 +251098,7 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -246195,8 +251264,8 @@ static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
-       1197,   /* Number of elements */
+static const UV UNI_IDS_invlist[] = {  /* for EBCDIC 1047 */
+       1225,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -246277,11 +251346,11 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -246646,7 +251715,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -246687,6 +251756,10 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -246820,7 +251893,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -246830,7 +251903,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -246852,9 +251925,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -246872,7 +251943,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -247074,7 +252145,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -247097,6 +252168,14 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -247105,6 +252184,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -247172,7 +252253,9 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -247189,6 +252272,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -247207,6 +252292,16 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -247231,6 +252326,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -247240,7 +252337,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -247406,8 +252503,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
-       1193,   /* Number of elements */
+static const UV UNI_IDS_invlist[] = {  /* for EBCDIC 037 */
+       1221,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -247484,11 +252581,11 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -247853,7 +252950,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -247894,6 +252991,10 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -248027,7 +253128,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -248037,7 +253138,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -248059,9 +253160,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -248079,7 +253178,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -248281,7 +253380,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -248304,6 +253403,14 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -248312,6 +253419,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -248379,7 +253488,9 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -248396,6 +253507,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -248414,6 +253527,16 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -248438,6 +253561,8 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -248447,7 +253572,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -248608,7 +253733,7 @@ static const UV PL_IDS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_IDSB_invlist[] = { /* for all charsets */
+static const UV UNI_IDSB_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -248620,7 +253745,7 @@ static const UV PL_IDSB_invlist[] = { /* for all charsets */
        0x2FFC
 };
 
-static const UV PL_IDST_invlist[] = { /* for all charsets */
+static const UV UNI_IDST_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -248630,7 +253755,7 @@ static const UV PL_IDST_invlist[] = { /* for all charsets */
        0x2FF4
 };
 
-static const UV PL_IN__1_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__1_DOT_1_invlist[] = {  /* for all charsets */
        576,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -249213,7 +254338,7 @@ static const UV PL_IN__1_DOT_1_invlist[] = { /* for all charsets */
        0x10000
 };
 
-static const UV PL_IN__10_invlist[] = { /* for all charsets */
+static const UV UNI_IN__10_invlist[] = {  /* for all charsets */
        1318,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -249297,7 +254422,1328 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FE,
+       0xA01,
+       0xA04,
+       0xA05,
+       0xA0B,
+       0xA0F,
+       0xA11,
+       0xA13,
+       0xA29,
+       0xA2A,
+       0xA31,
+       0xA32,
+       0xA34,
+       0xA35,
+       0xA37,
+       0xA38,
+       0xA3A,
+       0xA3C,
+       0xA3D,
+       0xA3E,
+       0xA43,
+       0xA47,
+       0xA49,
+       0xA4B,
+       0xA4E,
+       0xA51,
+       0xA52,
+       0xA59,
+       0xA5D,
+       0xA5E,
+       0xA5F,
+       0xA66,
+       0xA76,
+       0xA81,
+       0xA84,
+       0xA85,
+       0xA8E,
+       0xA8F,
+       0xA92,
+       0xA93,
+       0xAA9,
+       0xAAA,
+       0xAB1,
+       0xAB2,
+       0xAB4,
+       0xAB5,
+       0xABA,
+       0xABC,
+       0xAC6,
+       0xAC7,
+       0xACA,
+       0xACB,
+       0xACE,
+       0xAD0,
+       0xAD1,
+       0xAE0,
+       0xAE4,
+       0xAE6,
+       0xAF2,
+       0xAF9,
+       0xB00,
+       0xB01,
+       0xB04,
+       0xB05,
+       0xB0D,
+       0xB0F,
+       0xB11,
+       0xB13,
+       0xB29,
+       0xB2A,
+       0xB31,
+       0xB32,
+       0xB34,
+       0xB35,
+       0xB3A,
+       0xB3C,
+       0xB45,
+       0xB47,
+       0xB49,
+       0xB4B,
+       0xB4E,
+       0xB56,
+       0xB58,
+       0xB5C,
+       0xB5E,
+       0xB5F,
+       0xB64,
+       0xB66,
+       0xB78,
+       0xB82,
+       0xB84,
+       0xB85,
+       0xB8B,
+       0xB8E,
+       0xB91,
+       0xB92,
+       0xB96,
+       0xB99,
+       0xB9B,
+       0xB9C,
+       0xB9D,
+       0xB9E,
+       0xBA0,
+       0xBA3,
+       0xBA5,
+       0xBA8,
+       0xBAB,
+       0xBAE,
+       0xBBA,
+       0xBBE,
+       0xBC3,
+       0xBC6,
+       0xBC9,
+       0xBCA,
+       0xBCE,
+       0xBD0,
+       0xBD1,
+       0xBD7,
+       0xBD8,
+       0xBE6,
+       0xBFB,
+       0xC00,
+       0xC04,
+       0xC05,
+       0xC0D,
+       0xC0E,
+       0xC11,
+       0xC12,
+       0xC29,
+       0xC2A,
+       0xC3A,
+       0xC3D,
+       0xC45,
+       0xC46,
+       0xC49,
+       0xC4A,
+       0xC4E,
+       0xC55,
+       0xC57,
+       0xC58,
+       0xC5B,
+       0xC60,
+       0xC64,
+       0xC66,
+       0xC70,
+       0xC78,
+       0xC84,
+       0xC85,
+       0xC8D,
+       0xC8E,
+       0xC91,
+       0xC92,
+       0xCA9,
+       0xCAA,
+       0xCB4,
+       0xCB5,
+       0xCBA,
+       0xCBC,
+       0xCC5,
+       0xCC6,
+       0xCC9,
+       0xCCA,
+       0xCCE,
+       0xCD5,
+       0xCD7,
+       0xCDE,
+       0xCDF,
+       0xCE0,
+       0xCE4,
+       0xCE6,
+       0xCF0,
+       0xCF1,
+       0xCF3,
+       0xD00,
+       0xD04,
+       0xD05,
+       0xD0D,
+       0xD0E,
+       0xD11,
+       0xD12,
+       0xD45,
+       0xD46,
+       0xD49,
+       0xD4A,
+       0xD50,
+       0xD54,
+       0xD64,
+       0xD66,
+       0xD80,
+       0xD82,
+       0xD84,
+       0xD85,
+       0xD97,
+       0xD9A,
+       0xDB2,
+       0xDB3,
+       0xDBC,
+       0xDBD,
+       0xDBE,
+       0xDC0,
+       0xDC7,
+       0xDCA,
+       0xDCB,
+       0xDCF,
+       0xDD5,
+       0xDD6,
+       0xDD7,
+       0xDD8,
+       0xDE0,
+       0xDE6,
+       0xDF0,
+       0xDF2,
+       0xDF5,
+       0xE01,
+       0xE3B,
+       0xE3F,
+       0xE5C,
+       0xE81,
+       0xE83,
+       0xE84,
+       0xE85,
+       0xE87,
+       0xE89,
+       0xE8A,
+       0xE8B,
+       0xE8D,
+       0xE8E,
+       0xE94,
+       0xE98,
+       0xE99,
+       0xEA0,
+       0xEA1,
+       0xEA4,
+       0xEA5,
+       0xEA6,
+       0xEA7,
+       0xEA8,
+       0xEAA,
+       0xEAC,
+       0xEAD,
+       0xEBA,
+       0xEBB,
+       0xEBE,
+       0xEC0,
+       0xEC5,
+       0xEC6,
+       0xEC7,
+       0xEC8,
+       0xECE,
+       0xED0,
+       0xEDA,
+       0xEDC,
+       0xEE0,
+       0xF00,
+       0xF48,
+       0xF49,
+       0xF6D,
+       0xF71,
+       0xF98,
+       0xF99,
+       0xFBD,
+       0xFBE,
+       0xFCD,
+       0xFCE,
+       0xFDB,
+       0x1000,
+       0x10C6,
+       0x10C7,
+       0x10C8,
+       0x10CD,
+       0x10CE,
+       0x10D0,
+       0x1249,
+       0x124A,
+       0x124E,
+       0x1250,
+       0x1257,
+       0x1258,
+       0x1259,
+       0x125A,
+       0x125E,
+       0x1260,
+       0x1289,
+       0x128A,
+       0x128E,
+       0x1290,
+       0x12B1,
+       0x12B2,
+       0x12B6,
+       0x12B8,
+       0x12BF,
+       0x12C0,
+       0x12C1,
+       0x12C2,
+       0x12C6,
+       0x12C8,
+       0x12D7,
+       0x12D8,
+       0x1311,
+       0x1312,
+       0x1316,
+       0x1318,
+       0x135B,
+       0x135D,
+       0x137D,
+       0x1380,
+       0x139A,
+       0x13A0,
+       0x13F6,
+       0x13F8,
+       0x13FE,
+       0x1400,
+       0x169D,
+       0x16A0,
+       0x16F9,
+       0x1700,
+       0x170D,
+       0x170E,
+       0x1715,
+       0x1720,
+       0x1737,
+       0x1740,
+       0x1754,
+       0x1760,
+       0x176D,
+       0x176E,
+       0x1771,
+       0x1772,
+       0x1774,
+       0x1780,
+       0x17DE,
+       0x17E0,
+       0x17EA,
+       0x17F0,
+       0x17FA,
+       0x1800,
+       0x180F,
+       0x1810,
+       0x181A,
+       0x1820,
+       0x1878,
+       0x1880,
+       0x18AB,
+       0x18B0,
+       0x18F6,
+       0x1900,
+       0x191F,
+       0x1920,
+       0x192C,
+       0x1930,
+       0x193C,
+       0x1940,
+       0x1941,
+       0x1944,
+       0x196E,
+       0x1970,
+       0x1975,
+       0x1980,
+       0x19AC,
+       0x19B0,
+       0x19CA,
+       0x19D0,
+       0x19DB,
+       0x19DE,
+       0x1A1C,
+       0x1A1E,
+       0x1A5F,
+       0x1A60,
+       0x1A7D,
+       0x1A7F,
+       0x1A8A,
+       0x1A90,
+       0x1A9A,
+       0x1AA0,
+       0x1AAE,
+       0x1AB0,
+       0x1ABF,
+       0x1B00,
+       0x1B4C,
+       0x1B50,
+       0x1B7D,
+       0x1B80,
+       0x1BF4,
+       0x1BFC,
+       0x1C38,
+       0x1C3B,
+       0x1C4A,
+       0x1C4D,
+       0x1C89,
+       0x1CC0,
+       0x1CC8,
+       0x1CD0,
+       0x1CFA,
+       0x1D00,
+       0x1DFA,
+       0x1DFB,
+       0x1F16,
+       0x1F18,
+       0x1F1E,
+       0x1F20,
+       0x1F46,
+       0x1F48,
+       0x1F4E,
+       0x1F50,
+       0x1F58,
+       0x1F59,
+       0x1F5A,
+       0x1F5B,
+       0x1F5C,
+       0x1F5D,
+       0x1F5E,
+       0x1F5F,
+       0x1F7E,
+       0x1F80,
+       0x1FB5,
+       0x1FB6,
+       0x1FC5,
+       0x1FC6,
+       0x1FD4,
+       0x1FD6,
+       0x1FDC,
+       0x1FDD,
+       0x1FF0,
+       0x1FF2,
+       0x1FF5,
+       0x1FF6,
+       0x1FFF,
+       0x2000,
+       0x2065,
+       0x2066,
+       0x2072,
+       0x2074,
+       0x208F,
+       0x2090,
+       0x209D,
+       0x20A0,
+       0x20C0,
+       0x20D0,
+       0x20F1,
+       0x2100,
+       0x218C,
+       0x2190,
+       0x2427,
+       0x2440,
+       0x244B,
+       0x2460,
+       0x2B74,
+       0x2B76,
+       0x2B96,
+       0x2B98,
+       0x2BBA,
+       0x2BBD,
+       0x2BC9,
+       0x2BCA,
+       0x2BD3,
+       0x2BEC,
+       0x2BF0,
+       0x2C00,
+       0x2C2F,
+       0x2C30,
+       0x2C5F,
+       0x2C60,
+       0x2CF4,
+       0x2CF9,
+       0x2D26,
+       0x2D27,
+       0x2D28,
+       0x2D2D,
+       0x2D2E,
+       0x2D30,
+       0x2D68,
+       0x2D6F,
+       0x2D71,
+       0x2D7F,
+       0x2D97,
+       0x2DA0,
+       0x2DA7,
+       0x2DA8,
+       0x2DAF,
+       0x2DB0,
+       0x2DB7,
+       0x2DB8,
+       0x2DBF,
+       0x2DC0,
+       0x2DC7,
+       0x2DC8,
+       0x2DCF,
+       0x2DD0,
+       0x2DD7,
+       0x2DD8,
+       0x2DDF,
+       0x2DE0,
+       0x2E4A,
+       0x2E80,
+       0x2E9A,
+       0x2E9B,
+       0x2EF4,
+       0x2F00,
+       0x2FD6,
+       0x2FF0,
+       0x2FFC,
+       0x3000,
+       0x3040,
+       0x3041,
+       0x3097,
+       0x3099,
+       0x3100,
+       0x3105,
+       0x312F,
+       0x3131,
+       0x318F,
+       0x3190,
+       0x31BB,
+       0x31C0,
+       0x31E4,
+       0x31F0,
+       0x321F,
+       0x3220,
+       0x32FF,
+       0x3300,
+       0x4DB6,
+       0x4DC0,
+       0x9FEB,
+       0xA000,
+       0xA48D,
+       0xA490,
+       0xA4C7,
+       0xA4D0,
+       0xA62C,
+       0xA640,
+       0xA6F8,
+       0xA700,
+       0xA7AF,
+       0xA7B0,
+       0xA7B8,
+       0xA7F7,
+       0xA82C,
+       0xA830,
+       0xA83A,
+       0xA840,
+       0xA878,
+       0xA880,
+       0xA8C6,
+       0xA8CE,
+       0xA8DA,
+       0xA8E0,
+       0xA8FE,
+       0xA900,
+       0xA954,
+       0xA95F,
+       0xA97D,
+       0xA980,
+       0xA9CE,
+       0xA9CF,
+       0xA9DA,
+       0xA9DE,
+       0xA9FF,
+       0xAA00,
+       0xAA37,
+       0xAA40,
+       0xAA4E,
+       0xAA50,
+       0xAA5A,
+       0xAA5C,
+       0xAAC3,
+       0xAADB,
+       0xAAF7,
+       0xAB01,
+       0xAB07,
+       0xAB09,
+       0xAB0F,
+       0xAB11,
+       0xAB17,
+       0xAB20,
+       0xAB27,
+       0xAB28,
+       0xAB2F,
+       0xAB30,
+       0xAB66,
+       0xAB70,
+       0xABEE,
+       0xABF0,
+       0xABFA,
+       0xAC00,
+       0xD7A4,
+       0xD7B0,
+       0xD7C7,
+       0xD7CB,
+       0xD7FC,
+       0xD800,
+       0xFA6E,
+       0xFA70,
+       0xFADA,
+       0xFB00,
+       0xFB07,
+       0xFB13,
+       0xFB18,
+       0xFB1D,
+       0xFB37,
+       0xFB38,
+       0xFB3D,
+       0xFB3E,
+       0xFB3F,
+       0xFB40,
+       0xFB42,
+       0xFB43,
+       0xFB45,
+       0xFB46,
+       0xFBC2,
+       0xFBD3,
+       0xFD40,
+       0xFD50,
+       0xFD90,
+       0xFD92,
+       0xFDC8,
+       0xFDD0,
+       0xFDFE,
+       0xFE00,
+       0xFE1A,
+       0xFE20,
+       0xFE53,
+       0xFE54,
+       0xFE67,
+       0xFE68,
+       0xFE6C,
+       0xFE70,
+       0xFE75,
+       0xFE76,
+       0xFEFD,
+       0xFEFF,
+       0xFF00,
+       0xFF01,
+       0xFFBF,
+       0xFFC2,
+       0xFFC8,
+       0xFFCA,
+       0xFFD0,
+       0xFFD2,
+       0xFFD8,
+       0xFFDA,
+       0xFFDD,
+       0xFFE0,
+       0xFFE7,
+       0xFFE8,
+       0xFFEF,
+       0xFFF9,
+       0x1000C,
+       0x1000D,
+       0x10027,
+       0x10028,
+       0x1003B,
+       0x1003C,
+       0x1003E,
+       0x1003F,
+       0x1004E,
+       0x10050,
+       0x1005E,
+       0x10080,
+       0x100FB,
+       0x10100,
+       0x10103,
+       0x10107,
+       0x10134,
+       0x10137,
+       0x1018F,
+       0x10190,
+       0x1019C,
+       0x101A0,
+       0x101A1,
+       0x101D0,
+       0x101FE,
+       0x10280,
+       0x1029D,
+       0x102A0,
+       0x102D1,
+       0x102E0,
+       0x102FC,
+       0x10300,
+       0x10324,
+       0x1032D,
+       0x1034B,
+       0x10350,
+       0x1037B,
+       0x10380,
+       0x1039E,
+       0x1039F,
+       0x103C4,
+       0x103C8,
+       0x103D6,
+       0x10400,
+       0x1049E,
+       0x104A0,
+       0x104AA,
+       0x104B0,
+       0x104D4,
+       0x104D8,
+       0x104FC,
+       0x10500,
+       0x10528,
+       0x10530,
+       0x10564,
+       0x1056F,
+       0x10570,
+       0x10600,
+       0x10737,
+       0x10740,
+       0x10756,
+       0x10760,
+       0x10768,
+       0x10800,
+       0x10806,
+       0x10808,
+       0x10809,
+       0x1080A,
+       0x10836,
+       0x10837,
+       0x10839,
+       0x1083C,
+       0x1083D,
+       0x1083F,
+       0x10856,
+       0x10857,
+       0x1089F,
+       0x108A7,
+       0x108B0,
+       0x108E0,
+       0x108F3,
+       0x108F4,
+       0x108F6,
+       0x108FB,
+       0x1091C,
+       0x1091F,
+       0x1093A,
+       0x1093F,
+       0x10940,
+       0x10980,
+       0x109B8,
+       0x109BC,
+       0x109D0,
+       0x109D2,
+       0x10A04,
+       0x10A05,
+       0x10A07,
+       0x10A0C,
+       0x10A14,
+       0x10A15,
+       0x10A18,
+       0x10A19,
+       0x10A34,
+       0x10A38,
+       0x10A3B,
+       0x10A3F,
+       0x10A48,
+       0x10A50,
+       0x10A59,
+       0x10A60,
+       0x10AA0,
+       0x10AC0,
+       0x10AE7,
+       0x10AEB,
+       0x10AF7,
+       0x10B00,
+       0x10B36,
+       0x10B39,
+       0x10B56,
+       0x10B58,
+       0x10B73,
+       0x10B78,
+       0x10B92,
+       0x10B99,
+       0x10B9D,
+       0x10BA9,
+       0x10BB0,
+       0x10C00,
+       0x10C49,
+       0x10C80,
+       0x10CB3,
+       0x10CC0,
+       0x10CF3,
+       0x10CFA,
+       0x10D00,
+       0x10E60,
+       0x10E7F,
+       0x11000,
+       0x1104E,
+       0x11052,
+       0x11070,
+       0x1107F,
+       0x110C2,
+       0x110D0,
+       0x110E9,
+       0x110F0,
+       0x110FA,
+       0x11100,
+       0x11135,
+       0x11136,
+       0x11144,
+       0x11150,
+       0x11177,
+       0x11180,
+       0x111CE,
+       0x111D0,
+       0x111E0,
+       0x111E1,
+       0x111F5,
+       0x11200,
+       0x11212,
+       0x11213,
+       0x1123F,
+       0x11280,
+       0x11287,
+       0x11288,
+       0x11289,
+       0x1128A,
+       0x1128E,
+       0x1128F,
+       0x1129E,
+       0x1129F,
+       0x112AA,
+       0x112B0,
+       0x112EB,
+       0x112F0,
+       0x112FA,
+       0x11300,
+       0x11304,
+       0x11305,
+       0x1130D,
+       0x1130F,
+       0x11311,
+       0x11313,
+       0x11329,
+       0x1132A,
+       0x11331,
+       0x11332,
+       0x11334,
+       0x11335,
+       0x1133A,
+       0x1133C,
+       0x11345,
+       0x11347,
+       0x11349,
+       0x1134B,
+       0x1134E,
+       0x11350,
+       0x11351,
+       0x11357,
+       0x11358,
+       0x1135D,
+       0x11364,
+       0x11366,
+       0x1136D,
+       0x11370,
+       0x11375,
+       0x11400,
+       0x1145A,
+       0x1145B,
+       0x1145C,
+       0x1145D,
+       0x1145E,
+       0x11480,
+       0x114C8,
+       0x114D0,
+       0x114DA,
+       0x11580,
+       0x115B6,
+       0x115B8,
+       0x115DE,
+       0x11600,
+       0x11645,
+       0x11650,
+       0x1165A,
+       0x11660,
+       0x1166D,
+       0x11680,
+       0x116B8,
+       0x116C0,
+       0x116CA,
+       0x11700,
+       0x1171A,
+       0x1171D,
+       0x1172C,
+       0x11730,
+       0x11740,
+       0x118A0,
+       0x118F3,
+       0x118FF,
+       0x11900,
+       0x11A00,
+       0x11A48,
+       0x11A50,
+       0x11A84,
+       0x11A86,
+       0x11A9D,
+       0x11A9E,
+       0x11AA3,
+       0x11AC0,
+       0x11AF9,
+       0x11C00,
+       0x11C09,
+       0x11C0A,
+       0x11C37,
+       0x11C38,
+       0x11C46,
+       0x11C50,
+       0x11C6D,
+       0x11C70,
+       0x11C90,
+       0x11C92,
+       0x11CA8,
+       0x11CA9,
+       0x11CB7,
+       0x11D00,
+       0x11D07,
+       0x11D08,
+       0x11D0A,
+       0x11D0B,
+       0x11D37,
+       0x11D3A,
+       0x11D3B,
+       0x11D3C,
+       0x11D3E,
+       0x11D3F,
+       0x11D48,
+       0x11D50,
+       0x11D5A,
+       0x12000,
+       0x1239A,
+       0x12400,
+       0x1246F,
+       0x12470,
+       0x12475,
+       0x12480,
+       0x12544,
+       0x13000,
+       0x1342F,
+       0x14400,
+       0x14647,
+       0x16800,
+       0x16A39,
+       0x16A40,
+       0x16A5F,
+       0x16A60,
+       0x16A6A,
+       0x16A6E,
+       0x16A70,
+       0x16AD0,
+       0x16AEE,
+       0x16AF0,
+       0x16AF6,
+       0x16B00,
+       0x16B46,
+       0x16B50,
+       0x16B5A,
+       0x16B5B,
+       0x16B62,
+       0x16B63,
+       0x16B78,
+       0x16B7D,
+       0x16B90,
+       0x16F00,
+       0x16F45,
+       0x16F50,
+       0x16F7F,
+       0x16F8F,
+       0x16FA0,
+       0x16FE0,
+       0x16FE2,
+       0x17000,
+       0x187ED,
+       0x18800,
+       0x18AF3,
+       0x1B000,
+       0x1B11F,
+       0x1B170,
+       0x1B2FC,
+       0x1BC00,
+       0x1BC6B,
+       0x1BC70,
+       0x1BC7D,
+       0x1BC80,
+       0x1BC89,
+       0x1BC90,
+       0x1BC9A,
+       0x1BC9C,
+       0x1BCA4,
+       0x1D000,
+       0x1D0F6,
+       0x1D100,
+       0x1D127,
+       0x1D129,
+       0x1D1E9,
+       0x1D200,
+       0x1D246,
+       0x1D300,
+       0x1D357,
+       0x1D360,
+       0x1D372,
+       0x1D400,
+       0x1D455,
+       0x1D456,
+       0x1D49D,
+       0x1D49E,
+       0x1D4A0,
+       0x1D4A2,
+       0x1D4A3,
+       0x1D4A5,
+       0x1D4A7,
+       0x1D4A9,
+       0x1D4AD,
+       0x1D4AE,
+       0x1D4BA,
+       0x1D4BB,
+       0x1D4BC,
+       0x1D4BD,
+       0x1D4C4,
+       0x1D4C5,
+       0x1D506,
+       0x1D507,
+       0x1D50B,
+       0x1D50D,
+       0x1D515,
+       0x1D516,
+       0x1D51D,
+       0x1D51E,
+       0x1D53A,
+       0x1D53B,
+       0x1D53F,
+       0x1D540,
+       0x1D545,
+       0x1D546,
+       0x1D547,
+       0x1D54A,
+       0x1D551,
+       0x1D552,
+       0x1D6A6,
+       0x1D6A8,
+       0x1D7CC,
+       0x1D7CE,
+       0x1DA8C,
+       0x1DA9B,
+       0x1DAA0,
+       0x1DAA1,
+       0x1DAB0,
+       0x1E000,
+       0x1E007,
+       0x1E008,
+       0x1E019,
+       0x1E01B,
+       0x1E022,
+       0x1E023,
+       0x1E025,
+       0x1E026,
+       0x1E02B,
+       0x1E800,
+       0x1E8C5,
+       0x1E8C7,
+       0x1E8D7,
+       0x1E900,
+       0x1E94B,
+       0x1E950,
+       0x1E95A,
+       0x1E95E,
+       0x1E960,
+       0x1EE00,
+       0x1EE04,
+       0x1EE05,
+       0x1EE20,
+       0x1EE21,
+       0x1EE23,
+       0x1EE24,
+       0x1EE25,
+       0x1EE27,
+       0x1EE28,
+       0x1EE29,
+       0x1EE33,
+       0x1EE34,
+       0x1EE38,
+       0x1EE39,
+       0x1EE3A,
+       0x1EE3B,
+       0x1EE3C,
+       0x1EE42,
+       0x1EE43,
+       0x1EE47,
+       0x1EE48,
+       0x1EE49,
+       0x1EE4A,
+       0x1EE4B,
+       0x1EE4C,
+       0x1EE4D,
+       0x1EE50,
+       0x1EE51,
+       0x1EE53,
+       0x1EE54,
+       0x1EE55,
+       0x1EE57,
+       0x1EE58,
+       0x1EE59,
+       0x1EE5A,
+       0x1EE5B,
+       0x1EE5C,
+       0x1EE5D,
+       0x1EE5E,
+       0x1EE5F,
+       0x1EE60,
+       0x1EE61,
+       0x1EE63,
+       0x1EE64,
+       0x1EE65,
+       0x1EE67,
+       0x1EE6B,
+       0x1EE6C,
+       0x1EE73,
+       0x1EE74,
+       0x1EE78,
+       0x1EE79,
+       0x1EE7D,
+       0x1EE7E,
+       0x1EE7F,
+       0x1EE80,
+       0x1EE8A,
+       0x1EE8B,
+       0x1EE9C,
+       0x1EEA1,
+       0x1EEA4,
+       0x1EEA5,
+       0x1EEAA,
+       0x1EEAB,
+       0x1EEBC,
+       0x1EEF0,
+       0x1EEF2,
+       0x1F000,
+       0x1F02C,
+       0x1F030,
+       0x1F094,
+       0x1F0A0,
+       0x1F0AF,
+       0x1F0B1,
+       0x1F0C0,
+       0x1F0C1,
+       0x1F0D0,
+       0x1F0D1,
+       0x1F0F6,
+       0x1F100,
+       0x1F10D,
+       0x1F110,
+       0x1F12F,
+       0x1F130,
+       0x1F16C,
+       0x1F170,
+       0x1F1AD,
+       0x1F1E6,
+       0x1F203,
+       0x1F210,
+       0x1F23C,
+       0x1F240,
+       0x1F249,
+       0x1F250,
+       0x1F252,
+       0x1F260,
+       0x1F266,
+       0x1F300,
+       0x1F6D5,
+       0x1F6E0,
+       0x1F6ED,
+       0x1F6F0,
+       0x1F6F9,
+       0x1F700,
+       0x1F774,
+       0x1F780,
+       0x1F7D5,
+       0x1F800,
+       0x1F80C,
+       0x1F810,
+       0x1F848,
+       0x1F850,
+       0x1F85A,
+       0x1F860,
+       0x1F888,
+       0x1F890,
+       0x1F8AE,
+       0x1F900,
+       0x1F90C,
+       0x1F910,
+       0x1F93F,
+       0x1F940,
+       0x1F94D,
+       0x1F950,
+       0x1F96C,
+       0x1F980,
+       0x1F998,
+       0x1F9C0,
+       0x1F9C1,
+       0x1F9D0,
+       0x1F9E7,
+       0x1FFFE,
+       0x2A6D7,
+       0x2A700,
+       0x2B735,
+       0x2B740,
+       0x2B81E,
+       0x2B820,
+       0x2CEA2,
+       0x2CEB0,
+       0x2EBE1,
+       0x2F800,
+       0x2FA1E,
+       0x2FFFE,
+       0x30000,
+       0x3FFFE,
+       0x40000,
+       0x4FFFE,
+       0x50000,
+       0x5FFFE,
+       0x60000,
+       0x6FFFE,
+       0x70000,
+       0x7FFFE,
+       0x80000,
+       0x8FFFE,
+       0x90000,
+       0x9FFFE,
+       0xA0000,
+       0xAFFFE,
+       0xB0000,
+       0xBFFFE,
+       0xC0000,
+       0xCFFFE,
+       0xD0000,
+       0xDFFFE,
+       0xE0000,
+       0xE0001,
+       0xE0002,
+       0xE0020,
+       0xE0080,
+       0xE0100,
+       0xE01F0,
+       0xEFFFE,
+       0x110000
+};
+
+static const UV UNI_IN__11_invlist[] = {  /* for all charsets */
+       1336,   /* Number of elements */
+       148565664, /* Version and data structure type */
+       0,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x378,
+       0x37A,
+       0x380,
+       0x384,
+       0x38B,
+       0x38C,
+       0x38D,
+       0x38E,
+       0x3A2,
+       0x3A3,
+       0x530,
+       0x531,
+       0x557,
+       0x559,
+       0x58B,
+       0x58D,
+       0x590,
+       0x591,
+       0x5C8,
+       0x5D0,
+       0x5EB,
+       0x5EF,
+       0x5F5,
+       0x600,
+       0x61D,
+       0x61E,
+       0x70E,
+       0x70F,
+       0x74B,
+       0x74D,
+       0x7B2,
+       0x7C0,
+       0x7FB,
+       0x7FD,
+       0x82E,
+       0x830,
+       0x83F,
+       0x840,
+       0x85C,
+       0x85E,
+       0x85F,
+       0x860,
+       0x86B,
+       0x8A0,
+       0x8B5,
+       0x8B6,
+       0x8BE,
+       0x8D3,
+       0x984,
+       0x985,
+       0x98D,
+       0x98F,
+       0x991,
+       0x993,
+       0x9A9,
+       0x9AA,
+       0x9B1,
+       0x9B2,
+       0x9B3,
+       0x9B6,
+       0x9BA,
+       0x9BC,
+       0x9C5,
+       0x9C7,
+       0x9C9,
+       0x9CB,
+       0x9CF,
+       0x9D7,
+       0x9D8,
+       0x9DC,
+       0x9DE,
+       0x9DF,
+       0x9E4,
+       0x9E6,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -249329,7 +255775,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -249419,8 +255865,6 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -249443,8 +255887,6 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -249637,7 +256079,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -249686,7 +256128,9 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -249747,13 +256191,9 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -249789,7 +256229,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -249805,7 +256245,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -249819,7 +256259,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -249829,9 +256269,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -249843,8 +256281,6 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -250045,11 +256481,11 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -250077,15 +256513,23 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -250093,7 +256537,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -250134,7 +256578,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -250155,7 +256599,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -250175,11 +256619,13 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -250189,8 +256635,6 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -250222,6 +256666,20 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -250256,6 +256714,8 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -250265,7 +256725,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -250290,10 +256750,12 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -250360,6 +256822,8 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -250443,8 +256907,6 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -250463,11 +256925,11 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -250483,15 +256945,21 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x1FFFE,
        0x2A6D7,
        0x2A700,
@@ -250538,7 +257006,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__2_invlist[] = { /* for all charsets */
+static const UV UNI_IN__2_invlist[] = {  /* for all charsets */
        624,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -251169,7 +257637,7 @@ static const UV PL_IN__2_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__2_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__2_DOT_1_invlist[] = {  /* for all charsets */
        624,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -251800,7 +258268,7 @@ static const UV PL_IN__2_DOT_1_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__3_invlist[] = { /* for all charsets */
+static const UV UNI_IN__3_invlist[] = {  /* for all charsets */
        738,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -252545,7 +259013,7 @@ static const UV PL_IN__3_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__3_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__3_DOT_1_invlist[] = {  /* for all charsets */
        804,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -253356,7 +259824,7 @@ static const UV PL_IN__3_DOT_1_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__3_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_IN__3_DOT_2_invlist[] = {  /* for all charsets */
        794,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -254157,7 +260625,7 @@ static const UV PL_IN__3_DOT_2_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__4_invlist[] = { /* for all charsets */
+static const UV UNI_IN__4_invlist[] = {  /* for all charsets */
        824,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -254988,7 +261456,7 @@ static const UV PL_IN__4_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__4_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__4_DOT_1_invlist[] = {  /* for all charsets */
        860,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -255855,7 +262323,7 @@ static const UV PL_IN__4_DOT_1_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__5_invlist[] = { /* for all charsets */
+static const UV UNI_IN__5_invlist[] = {  /* for all charsets */
        880,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -256742,7 +263210,7 @@ static const UV PL_IN__5_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__5_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__5_DOT_1_invlist[] = {  /* for all charsets */
        910,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -257659,7 +264127,7 @@ static const UV PL_IN__5_DOT_1_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__5_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_IN__5_DOT_2_invlist[] = {  /* for all charsets */
        990,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -258656,7 +265124,7 @@ static const UV PL_IN__5_DOT_2_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__6_invlist[] = { /* for all charsets */
+static const UV UNI_IN__6_invlist[] = {  /* for all charsets */
        1022,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -259685,7 +266153,7 @@ static const UV PL_IN__6_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__6_DOT_1_invlist[] = { /* for all charsets */
+static const UV UNI_IN__6_DOT_1_invlist[] = {  /* for all charsets */
        1098,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -260790,7 +267258,7 @@ static const UV PL_IN__6_DOT_1_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__6_DOT_2_invlist[] = { /* for all charsets */
+static const UV UNI_IN__6_DOT_2_invlist[] = {  /* for all charsets */
        1098,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -261895,7 +268363,7 @@ static const UV PL_IN__6_DOT_2_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__6_DOT_3_invlist[] = { /* for all charsets */
+static const UV UNI_IN__6_DOT_3_invlist[] = {  /* for all charsets */
        1098,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -263000,7 +269468,7 @@ static const UV PL_IN__6_DOT_3_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__7_invlist[] = { /* for all charsets */
+static const UV UNI_IN__7_invlist[] = {  /* for all charsets */
        1220,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -264227,7 +270695,7 @@ static const UV PL_IN__7_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__8_invlist[] = { /* for all charsets */
+static const UV UNI_IN__8_invlist[] = {  /* for all charsets */
        1246,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -265480,7 +271948,7 @@ static const UV PL_IN__8_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__9_invlist[] = { /* for all charsets */
+static const UV UNI_IN__9_invlist[] = {  /* for all charsets */
        1296,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -266783,7 +273251,7 @@ static const UV PL_IN__9_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_INADLAM_invlist[] = { /* for all charsets */
+static const UV UNI_INADLAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266793,7 +273261,7 @@ static const UV PL_INADLAM_invlist[] = { /* for all charsets */
        0x1E960
 };
 
-static const UV PL_INAHOM_invlist[] = { /* for all charsets */
+static const UV UNI_INAHOM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266803,7 +273271,7 @@ static const UV PL_INAHOM_invlist[] = { /* for all charsets */
        0x11740
 };
 
-static const UV PL_INANATOLIANHIEROGLYPHS_invlist[] = { /* for all charsets */
+static const UV UNI_INANATOLIANHIEROGLYPHS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266813,7 +273281,7 @@ static const UV PL_INANATOLIANHIEROGLYPHS_invlist[] = { /* for all charsets */
        0x14680
 };
 
-static const UV PL_INARABIC_invlist[] = { /* for all charsets */
+static const UV UNI_INARABIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266823,7 +273291,7 @@ static const UV PL_INARABIC_invlist[] = { /* for all charsets */
        0x700
 };
 
-static const UV PL_INARMENIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INARMENIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266833,7 +273301,7 @@ static const UV PL_INARMENIAN_invlist[] = { /* for all charsets */
        0x590
 };
 
-static const UV PL_INAVESTAN_invlist[] = { /* for all charsets */
+static const UV UNI_INAVESTAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266843,7 +273311,7 @@ static const UV PL_INAVESTAN_invlist[] = { /* for all charsets */
        0x10B40
 };
 
-static const UV PL_INBALINESE_invlist[] = { /* for all charsets */
+static const UV UNI_INBALINESE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266853,7 +273321,7 @@ static const UV PL_INBALINESE_invlist[] = { /* for all charsets */
        0x1B80
 };
 
-static const UV PL_INBAMUM_invlist[] = { /* for all charsets */
+static const UV UNI_INBAMUM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266863,7 +273331,7 @@ static const UV PL_INBAMUM_invlist[] = { /* for all charsets */
        0xA700
 };
 
-static const UV PL_INBASSAVAH_invlist[] = { /* for all charsets */
+static const UV UNI_INBASSAVAH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266873,7 +273341,7 @@ static const UV PL_INBASSAVAH_invlist[] = { /* for all charsets */
        0x16B00
 };
 
-static const UV PL_INBATAK_invlist[] = { /* for all charsets */
+static const UV UNI_INBATAK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266883,7 +273351,7 @@ static const UV PL_INBATAK_invlist[] = { /* for all charsets */
        0x1C00
 };
 
-static const UV PL_INBENGALI_invlist[] = { /* for all charsets */
+static const UV UNI_INBENGALI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266893,7 +273361,7 @@ static const UV PL_INBENGALI_invlist[] = { /* for all charsets */
        0xA00
 };
 
-static const UV PL_INBHAIKSUKI_invlist[] = { /* for all charsets */
+static const UV UNI_INBHAIKSUKI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266903,7 +273371,7 @@ static const UV PL_INBHAIKSUKI_invlist[] = { /* for all charsets */
        0x11C70
 };
 
-static const UV PL_INBOPOMOFO_invlist[] = { /* for all charsets */
+static const UV UNI_INBOPOMOFO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266913,7 +273381,7 @@ static const UV PL_INBOPOMOFO_invlist[] = { /* for all charsets */
        0x3130
 };
 
-static const UV PL_INBRAHMI_invlist[] = { /* for all charsets */
+static const UV UNI_INBRAHMI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266923,7 +273391,7 @@ static const UV PL_INBRAHMI_invlist[] = { /* for all charsets */
        0x11080
 };
 
-static const UV PL_INBUGINESE_invlist[] = { /* for all charsets */
+static const UV UNI_INBUGINESE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266933,7 +273401,7 @@ static const UV PL_INBUGINESE_invlist[] = { /* for all charsets */
        0x1A20
 };
 
-static const UV PL_INBUHID_invlist[] = { /* for all charsets */
+static const UV UNI_INBUHID_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266943,7 +273411,7 @@ static const UV PL_INBUHID_invlist[] = { /* for all charsets */
        0x1760
 };
 
-static const UV PL_INCARIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INCARIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266953,7 +273421,7 @@ static const UV PL_INCARIAN_invlist[] = { /* for all charsets */
        0x102E0
 };
 
-static const UV PL_INCAUCASIANALBANIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INCAUCASIANALBANIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266963,7 +273431,7 @@ static const UV PL_INCAUCASIANALBANIAN_invlist[] = { /* for all charsets */
        0x10570
 };
 
-static const UV PL_INCHAKMA_invlist[] = { /* for all charsets */
+static const UV UNI_INCHAKMA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266973,7 +273441,7 @@ static const UV PL_INCHAKMA_invlist[] = { /* for all charsets */
        0x11150
 };
 
-static const UV PL_INCHAM_invlist[] = { /* for all charsets */
+static const UV UNI_INCHAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266983,7 +273451,7 @@ static const UV PL_INCHAM_invlist[] = { /* for all charsets */
        0xAA60
 };
 
-static const UV PL_INCHEROKEE_invlist[] = { /* for all charsets */
+static const UV UNI_INCHEROKEE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -266993,7 +273461,7 @@ static const UV PL_INCHEROKEE_invlist[] = { /* for all charsets */
        0x1400
 };
 
-static const UV PL_INCOPTIC_invlist[] = { /* for all charsets */
+static const UV UNI_INCOPTIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267003,7 +273471,7 @@ static const UV PL_INCOPTIC_invlist[] = { /* for all charsets */
        0x2D00
 };
 
-static const UV PL_INCUNEIFORM_invlist[] = { /* for all charsets */
+static const UV UNI_INCUNEIFORM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267013,7 +273481,7 @@ static const UV PL_INCUNEIFORM_invlist[] = { /* for all charsets */
        0x12400
 };
 
-static const UV PL_INCYRILLIC_invlist[] = { /* for all charsets */
+static const UV UNI_INCYRILLIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267023,7 +273491,7 @@ static const UV PL_INCYRILLIC_invlist[] = { /* for all charsets */
        0x500
 };
 
-static const UV PL_INDEVANAGARI_invlist[] = { /* for all charsets */
+static const UV UNI_INDEVANAGARI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267033,7 +273501,7 @@ static const UV PL_INDEVANAGARI_invlist[] = { /* for all charsets */
        0x980
 };
 
-static const UV PL_INDICNUMBERFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_INDICNUMBERFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267043,7 +273511,27 @@ static const UV PL_INDICNUMBERFORMS_invlist[] = { /* for all charsets */
        0xA840
 };
 
-static const UV PL_INDUPLOYAN_invlist[] = { /* for all charsets */
+static const UV UNI_INDICSIYAQNUMBERS_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1EC70,
+       0x1ECC0
+};
+
+static const UV UNI_INDOGRA_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11800,
+       0x11850
+};
+
+static const UV UNI_INDUPLOYAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267053,7 +273541,7 @@ static const UV PL_INDUPLOYAN_invlist[] = { /* for all charsets */
        0x1BCA0
 };
 
-static const UV PL_INEGYPTIANHIEROGLYPHS_invlist[] = { /* for all charsets */
+static const UV UNI_INEGYPTIANHIEROGLYPHS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267063,7 +273551,7 @@ static const UV PL_INEGYPTIANHIEROGLYPHS_invlist[] = { /* for all charsets */
        0x13430
 };
 
-static const UV PL_INELBASAN_invlist[] = { /* for all charsets */
+static const UV UNI_INELBASAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267073,7 +273561,7 @@ static const UV PL_INELBASAN_invlist[] = { /* for all charsets */
        0x10530
 };
 
-static const UV PL_INETHIOPIC_invlist[] = { /* for all charsets */
+static const UV UNI_INETHIOPIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267083,7 +273571,7 @@ static const UV PL_INETHIOPIC_invlist[] = { /* for all charsets */
        0x1380
 };
 
-static const UV PL_INGEORGIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INGEORGIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267093,7 +273581,7 @@ static const UV PL_INGEORGIAN_invlist[] = { /* for all charsets */
        0x1100
 };
 
-static const UV PL_INGLAGOLITIC_invlist[] = { /* for all charsets */
+static const UV UNI_INGLAGOLITIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267103,7 +273591,7 @@ static const UV PL_INGLAGOLITIC_invlist[] = { /* for all charsets */
        0x2C60
 };
 
-static const UV PL_INGOTHIC_invlist[] = { /* for all charsets */
+static const UV UNI_INGOTHIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267113,7 +273601,7 @@ static const UV PL_INGOTHIC_invlist[] = { /* for all charsets */
        0x10350
 };
 
-static const UV PL_INGRANTHA_invlist[] = { /* for all charsets */
+static const UV UNI_INGRANTHA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267123,7 +273611,7 @@ static const UV PL_INGRANTHA_invlist[] = { /* for all charsets */
        0x11380
 };
 
-static const UV PL_INGREEK_invlist[] = { /* for all charsets */
+static const UV UNI_INGREEK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267133,7 +273621,7 @@ static const UV PL_INGREEK_invlist[] = { /* for all charsets */
        0x400
 };
 
-static const UV PL_INGUJARATI_invlist[] = { /* for all charsets */
+static const UV UNI_INGUJARATI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267143,7 +273631,17 @@ static const UV PL_INGUJARATI_invlist[] = { /* for all charsets */
        0xB00
 };
 
-static const UV PL_INGURMUKHI_invlist[] = { /* for all charsets */
+static const UV UNI_INGUNJALAGONDI_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11D60,
+       0x11DB0
+};
+
+static const UV UNI_INGURMUKHI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267153,7 +273651,7 @@ static const UV PL_INGURMUKHI_invlist[] = { /* for all charsets */
        0xA80
 };
 
-static const UV PL_INHANGUL_invlist[] = { /* for all charsets */
+static const UV UNI_INHANGUL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267163,7 +273661,17 @@ static const UV PL_INHANGUL_invlist[] = { /* for all charsets */
        0xD7B0
 };
 
-static const UV PL_INHANUNOO_invlist[] = { /* for all charsets */
+static const UV UNI_INHANIFIROHINGYA_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10D00,
+       0x10D40
+};
+
+static const UV UNI_INHANUNOO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267173,7 +273681,7 @@ static const UV PL_INHANUNOO_invlist[] = { /* for all charsets */
        0x1740
 };
 
-static const UV PL_INHATRAN_invlist[] = { /* for all charsets */
+static const UV UNI_INHATRAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267183,7 +273691,7 @@ static const UV PL_INHATRAN_invlist[] = { /* for all charsets */
        0x10900
 };
 
-static const UV PL_INHEBREW_invlist[] = { /* for all charsets */
+static const UV UNI_INHEBREW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267193,7 +273701,7 @@ static const UV PL_INHEBREW_invlist[] = { /* for all charsets */
        0x600
 };
 
-static const UV PL_INHIRAGANA_invlist[] = { /* for all charsets */
+static const UV UNI_INHIRAGANA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267203,7 +273711,7 @@ static const UV PL_INHIRAGANA_invlist[] = { /* for all charsets */
        0x30A0
 };
 
-static const UV PL_INIDC_invlist[] = { /* for all charsets */
+static const UV UNI_INIDC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267213,7 +273721,7 @@ static const UV PL_INIDC_invlist[] = { /* for all charsets */
        0x3000
 };
 
-static const UV PL_INIMPERIALARAMAIC_invlist[] = { /* for all charsets */
+static const UV UNI_INIMPERIALARAMAIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267223,7 +273731,7 @@ static const UV PL_INIMPERIALARAMAIC_invlist[] = { /* for all charsets */
        0x10860
 };
 
-static const UV PL_ININSCRIPTIONALPAHLAVI_invlist[] = { /* for all charsets */
+static const UV UNI_ININSCRIPTIONALPAHLAVI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267233,7 +273741,7 @@ static const UV PL_ININSCRIPTIONALPAHLAVI_invlist[] = { /* for all charsets */
        0x10B80
 };
 
-static const UV PL_ININSCRIPTIONALPARTHIAN_invlist[] = { /* for all charsets */
+static const UV UNI_ININSCRIPTIONALPARTHIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267243,7 +273751,7 @@ static const UV PL_ININSCRIPTIONALPARTHIAN_invlist[] = { /* for all charsets */
        0x10B60
 };
 
-static const UV PL_INJAVANESE_invlist[] = { /* for all charsets */
+static const UV UNI_INJAVANESE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267253,7 +273761,7 @@ static const UV PL_INJAVANESE_invlist[] = { /* for all charsets */
        0xA9E0
 };
 
-static const UV PL_INKAITHI_invlist[] = { /* for all charsets */
+static const UV UNI_INKAITHI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267263,7 +273771,7 @@ static const UV PL_INKAITHI_invlist[] = { /* for all charsets */
        0x110D0
 };
 
-static const UV PL_INKANNADA_invlist[] = { /* for all charsets */
+static const UV UNI_INKANNADA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267273,7 +273781,7 @@ static const UV PL_INKANNADA_invlist[] = { /* for all charsets */
        0xD00
 };
 
-static const UV PL_INKATAKANA_invlist[] = { /* for all charsets */
+static const UV UNI_INKATAKANA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267283,7 +273791,7 @@ static const UV PL_INKATAKANA_invlist[] = { /* for all charsets */
        0x3100
 };
 
-static const UV PL_INKHAROSHTHI_invlist[] = { /* for all charsets */
+static const UV UNI_INKHAROSHTHI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267293,7 +273801,7 @@ static const UV PL_INKHAROSHTHI_invlist[] = { /* for all charsets */
        0x10A60
 };
 
-static const UV PL_INKHMER_invlist[] = { /* for all charsets */
+static const UV UNI_INKHMER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267303,7 +273811,7 @@ static const UV PL_INKHMER_invlist[] = { /* for all charsets */
        0x1800
 };
 
-static const UV PL_INKHOJKI_invlist[] = { /* for all charsets */
+static const UV UNI_INKHOJKI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267313,7 +273821,7 @@ static const UV PL_INKHOJKI_invlist[] = { /* for all charsets */
        0x11250
 };
 
-static const UV PL_INKHUDAWADI_invlist[] = { /* for all charsets */
+static const UV UNI_INKHUDAWADI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267323,7 +273831,7 @@ static const UV PL_INKHUDAWADI_invlist[] = { /* for all charsets */
        0x11300
 };
 
-static const UV PL_INLAO_invlist[] = { /* for all charsets */
+static const UV UNI_INLAO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267333,7 +273841,7 @@ static const UV PL_INLAO_invlist[] = { /* for all charsets */
        0xF00
 };
 
-static const UV PL_INLEPCHA_invlist[] = { /* for all charsets */
+static const UV UNI_INLEPCHA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267343,7 +273851,7 @@ static const UV PL_INLEPCHA_invlist[] = { /* for all charsets */
        0x1C50
 };
 
-static const UV PL_INLIMBU_invlist[] = { /* for all charsets */
+static const UV UNI_INLIMBU_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267353,7 +273861,7 @@ static const UV PL_INLIMBU_invlist[] = { /* for all charsets */
        0x1950
 };
 
-static const UV PL_INLINEARA_invlist[] = { /* for all charsets */
+static const UV UNI_INLINEARA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267363,7 +273871,7 @@ static const UV PL_INLINEARA_invlist[] = { /* for all charsets */
        0x10780
 };
 
-static const UV PL_INLYCIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INLYCIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267373,7 +273881,7 @@ static const UV PL_INLYCIAN_invlist[] = { /* for all charsets */
        0x102A0
 };
 
-static const UV PL_INLYDIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INLYDIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267383,7 +273891,7 @@ static const UV PL_INLYDIAN_invlist[] = { /* for all charsets */
        0x10940
 };
 
-static const UV PL_INMAHAJANI_invlist[] = { /* for all charsets */
+static const UV UNI_INMAHAJANI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267393,7 +273901,17 @@ static const UV PL_INMAHAJANI_invlist[] = { /* for all charsets */
        0x11180
 };
 
-static const UV PL_INMALAYALAM_invlist[] = { /* for all charsets */
+static const UV UNI_INMAKASAR_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11EE0,
+       0x11F00
+};
+
+static const UV UNI_INMALAYALAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267403,7 +273921,7 @@ static const UV PL_INMALAYALAM_invlist[] = { /* for all charsets */
        0xD80
 };
 
-static const UV PL_INMANDAIC_invlist[] = { /* for all charsets */
+static const UV UNI_INMANDAIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267413,7 +273931,7 @@ static const UV PL_INMANDAIC_invlist[] = { /* for all charsets */
        0x860
 };
 
-static const UV PL_INMANICHAEAN_invlist[] = { /* for all charsets */
+static const UV UNI_INMANICHAEAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267423,7 +273941,7 @@ static const UV PL_INMANICHAEAN_invlist[] = { /* for all charsets */
        0x10B00
 };
 
-static const UV PL_INMARCHEN_invlist[] = { /* for all charsets */
+static const UV UNI_INMARCHEN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267433,7 +273951,7 @@ static const UV PL_INMARCHEN_invlist[] = { /* for all charsets */
        0x11CC0
 };
 
-static const UV PL_INMASARAMGONDI_invlist[] = { /* for all charsets */
+static const UV UNI_INMASARAMGONDI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267443,7 +273961,17 @@ static const UV PL_INMASARAMGONDI_invlist[] = { /* for all charsets */
        0x11D60
 };
 
-static const UV PL_INMEETEIMAYEK_invlist[] = { /* for all charsets */
+static const UV UNI_INMEDEFAIDRIN_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x16E40,
+       0x16EA0
+};
+
+static const UV UNI_INMEETEIMAYEK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267453,7 +273981,7 @@ static const UV PL_INMEETEIMAYEK_invlist[] = { /* for all charsets */
        0xAC00
 };
 
-static const UV PL_INMENDEKIKAKUI_invlist[] = { /* for all charsets */
+static const UV UNI_INMENDEKIKAKUI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267463,7 +273991,7 @@ static const UV PL_INMENDEKIKAKUI_invlist[] = { /* for all charsets */
        0x1E8E0
 };
 
-static const UV PL_INMEROITICCURSIVE_invlist[] = { /* for all charsets */
+static const UV UNI_INMEROITICCURSIVE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267473,7 +274001,7 @@ static const UV PL_INMEROITICCURSIVE_invlist[] = { /* for all charsets */
        0x10A00
 };
 
-static const UV PL_INMIAO_invlist[] = { /* for all charsets */
+static const UV UNI_INMIAO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267483,7 +274011,7 @@ static const UV PL_INMIAO_invlist[] = { /* for all charsets */
        0x16FA0
 };
 
-static const UV PL_INMODI_invlist[] = { /* for all charsets */
+static const UV UNI_INMODI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267493,7 +274021,7 @@ static const UV PL_INMODI_invlist[] = { /* for all charsets */
        0x11660
 };
 
-static const UV PL_INMONGOLIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INMONGOLIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267503,7 +274031,7 @@ static const UV PL_INMONGOLIAN_invlist[] = { /* for all charsets */
        0x18B0
 };
 
-static const UV PL_INMRO_invlist[] = { /* for all charsets */
+static const UV UNI_INMRO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267513,7 +274041,7 @@ static const UV PL_INMRO_invlist[] = { /* for all charsets */
        0x16A70
 };
 
-static const UV PL_INMULTANI_invlist[] = { /* for all charsets */
+static const UV UNI_INMULTANI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267523,7 +274051,7 @@ static const UV PL_INMULTANI_invlist[] = { /* for all charsets */
        0x112B0
 };
 
-static const UV PL_INMYANMAR_invlist[] = { /* for all charsets */
+static const UV UNI_INMYANMAR_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267533,7 +274061,7 @@ static const UV PL_INMYANMAR_invlist[] = { /* for all charsets */
        0x10A0
 };
 
-static const UV PL_INNABATAEAN_invlist[] = { /* for all charsets */
+static const UV UNI_INNABATAEAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267543,7 +274071,7 @@ static const UV PL_INNABATAEAN_invlist[] = { /* for all charsets */
        0x108B0
 };
 
-static const UV PL_INNEWA_invlist[] = { /* for all charsets */
+static const UV UNI_INNEWA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267553,7 +274081,7 @@ static const UV PL_INNEWA_invlist[] = { /* for all charsets */
        0x11480
 };
 
-static const UV PL_INNEWTAILUE_invlist[] = { /* for all charsets */
+static const UV UNI_INNEWTAILUE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267563,7 +274091,7 @@ static const UV PL_INNEWTAILUE_invlist[] = { /* for all charsets */
        0x19E0
 };
 
-static const UV PL_INNKO_invlist[] = { /* for all charsets */
+static const UV UNI_INNKO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267573,7 +274101,7 @@ static const UV PL_INNKO_invlist[] = { /* for all charsets */
        0x800
 };
 
-static const UV PL_INNUSHU_invlist[] = { /* for all charsets */
+static const UV UNI_INNUSHU_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267583,7 +274111,7 @@ static const UV PL_INNUSHU_invlist[] = { /* for all charsets */
        0x1B300
 };
 
-static const UV PL_INOGHAM_invlist[] = { /* for all charsets */
+static const UV UNI_INOGHAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267593,7 +274121,7 @@ static const UV PL_INOGHAM_invlist[] = { /* for all charsets */
        0x16A0
 };
 
-static const UV PL_INOLDHUNGARIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INOLDHUNGARIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267603,7 +274131,7 @@ static const UV PL_INOLDHUNGARIAN_invlist[] = { /* for all charsets */
        0x10D00
 };
 
-static const UV PL_INOLDITALIC_invlist[] = { /* for all charsets */
+static const UV UNI_INOLDITALIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267613,7 +274141,7 @@ static const UV PL_INOLDITALIC_invlist[] = { /* for all charsets */
        0x10330
 };
 
-static const UV PL_INOLDPERMIC_invlist[] = { /* for all charsets */
+static const UV UNI_INOLDPERMIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267623,7 +274151,7 @@ static const UV PL_INOLDPERMIC_invlist[] = { /* for all charsets */
        0x10380
 };
 
-static const UV PL_INOLDPERSIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INOLDPERSIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267633,7 +274161,17 @@ static const UV PL_INOLDPERSIAN_invlist[] = { /* for all charsets */
        0x103E0
 };
 
-static const UV PL_INOLDTURKIC_invlist[] = { /* for all charsets */
+static const UV UNI_INOLDSOGDIAN_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10F00,
+       0x10F30
+};
+
+static const UV UNI_INOLDTURKIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267643,7 +274181,7 @@ static const UV PL_INOLDTURKIC_invlist[] = { /* for all charsets */
        0x10C50
 };
 
-static const UV PL_INORIYA_invlist[] = { /* for all charsets */
+static const UV UNI_INORIYA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267653,7 +274191,7 @@ static const UV PL_INORIYA_invlist[] = { /* for all charsets */
        0xB80
 };
 
-static const UV PL_INOSAGE_invlist[] = { /* for all charsets */
+static const UV UNI_INOSAGE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267663,7 +274201,7 @@ static const UV PL_INOSAGE_invlist[] = { /* for all charsets */
        0x10500
 };
 
-static const UV PL_INOSMANYA_invlist[] = { /* for all charsets */
+static const UV UNI_INOSMANYA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267673,7 +274211,7 @@ static const UV PL_INOSMANYA_invlist[] = { /* for all charsets */
        0x104B0
 };
 
-static const UV PL_INPAHAWHHMONG_invlist[] = { /* for all charsets */
+static const UV UNI_INPAHAWHHMONG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267683,7 +274221,7 @@ static const UV PL_INPAHAWHHMONG_invlist[] = { /* for all charsets */
        0x16B90
 };
 
-static const UV PL_INPAUCINHAU_invlist[] = { /* for all charsets */
+static const UV UNI_INPAUCINHAU_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267693,8 +274231,8 @@ static const UV PL_INPAUCINHAU_invlist[] = { /* for all charsets */
        0x11B00
 };
 
-static const UV PL_INPC__BOTTOM_invlist[] = { /* for all charsets */
-       265,    /* Number of elements */
+static const UV UNI_INPC__BOTTOM_invlist[] = {  /* for all charsets */
+       275,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -267893,6 +274431,8 @@ static const UV PL_INPC__BOTTOM_invlist[] = { /* for all charsets */
        0x11174,
        0x111B6,
        0x111BC,
+       0x111C9,
+       0x111CA,
        0x111CC,
        0x111CD,
        0x1122F,
@@ -267901,6 +274441,8 @@ static const UV PL_INPC__BOTTOM_invlist[] = { /* for all charsets */
        0x112E5,
        0x112E9,
        0x112EB,
+       0x1133B,
+       0x1133D,
        0x11438,
        0x1143E,
        0x11442,
@@ -267931,6 +274473,10 @@ static const UV PL_INPC__BOTTOM_invlist[] = { /* for all charsets */
        0x11726,
        0x11728,
        0x11729,
+       0x1182F,
+       0x11833,
+       0x11839,
+       0x1183B,
        0x11A02,
        0x11A04,
        0x11A0A,
@@ -267962,10 +274508,12 @@ static const UV PL_INPC__BOTTOM_invlist[] = { /* for all charsets */
        0x11D44,
        0x11D45,
        0x11D47,
-       0x11D48
+       0x11D48,
+       0x11EF4,
+       0x11EF5
 };
 
-static const UV PL_INPC__BOTTOMANDLEFT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__BOTTOMANDLEFT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267975,7 +274523,7 @@ static const UV PL_INPC__BOTTOMANDLEFT_invlist[] = { /* for all charsets */
        0xA9C0
 };
 
-static const UV PL_INPC__BOTTOMANDRIGHT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__BOTTOMANDRIGHT_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -267987,8 +274535,8 @@ static const UV PL_INPC__BOTTOMANDRIGHT_invlist[] = { /* for all charsets */
        0xA9C1
 };
 
-static const UV PL_INPC__LEFT_invlist[] = { /* for all charsets */
-       81,     /* Number of elements */
+static const UV UNI_INPC__LEFT_invlist[] = {  /* for all charsets */
+       85,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -268071,11 +274619,15 @@ static const UV PL_INPC__LEFT_invlist[] = { /* for all charsets */
        0x116AF,
        0x11726,
        0x11727,
+       0x1182D,
+       0x1182E,
        0x11CB1,
-       0x11CB2
+       0x11CB2,
+       0x11EF5,
+       0x11EF6
 };
 
-static const UV PL_INPC__LEFTANDRIGHT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__LEFTANDRIGHT_invlist[] = {  /* for all charsets */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -268109,8 +274661,8 @@ static const UV PL_INPC__LEFTANDRIGHT_invlist[] = { /* for all charsets */
        0x115BB
 };
 
-static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
-       383,    /* Number of elements */
+static const UV UNI_INPC__NA_invlist[] = {  /* for all charsets */
+       405,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -268139,6 +274691,8 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -268192,7 +274746,7 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -268369,6 +274923,8 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA92B,
        0xA92E,
        0xA947,
@@ -268421,12 +274977,16 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x11133,
        0x11134,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
+       0x111C9,
+       0x111CA,
        0x111CB,
        0x111CD,
        0x1122C,
@@ -268437,6 +274997,8 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x112EB,
        0x11301,
        0x11304,
+       0x1133B,
+       0x1133D,
        0x1133E,
        0x11345,
        0x11347,
@@ -268453,6 +275015,8 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -268469,6 +275033,8 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x1171E,
        0x1171F,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -268496,10 +275062,18 @@ static const UV PL_INPC__NA_invlist[] = { /* for all charsets */
        0x11D3F,
        0x11D45,
        0x11D47,
-       0x11D48
+       0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D97,
+       0x11EF3,
+       0x11EF7
 };
 
-static const UV PL_INPC__OVERSTRUCK_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__OVERSTRUCK_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -268515,8 +275089,8 @@ static const UV PL_INPC__OVERSTRUCK_invlist[] = { /* for all charsets */
        0x10A07
 };
 
-static const UV PL_INPC__RIGHT_invlist[] = { /* for all charsets */
-       301,    /* Number of elements */
+static const UV UNI_INPC__RIGHT_invlist[] = {  /* for all charsets */
+       317,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -268743,6 +275317,8 @@ static const UV PL_INPC__RIGHT_invlist[] = { /* for all charsets */
        0x110B3,
        0x110B7,
        0x110B9,
+       0x11145,
+       0x11147,
        0x11182,
        0x11183,
        0x111B3,
@@ -268807,6 +275383,12 @@ static const UV PL_INPC__RIGHT_invlist[] = { /* for all charsets */
        0x116B7,
        0x11720,
        0x11722,
+       0x1182C,
+       0x1182D,
+       0x1182E,
+       0x1182F,
+       0x11838,
+       0x11839,
        0x11A39,
        0x11A3A,
        0x11A57,
@@ -268820,11 +275402,19 @@ static const UV PL_INPC__RIGHT_invlist[] = { /* for all charsets */
        0x11CA9,
        0x11CAA,
        0x11CB4,
-       0x11CB5
+       0x11CB5,
+       0x11D8A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11EF6,
+       0x11EF7
 };
 
-static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
-       349,    /* Number of elements */
+static const UV UNI_INPC__TOP_invlist[] = {  /* for all charsets */
+       365,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -268841,6 +275431,8 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0x956,
        0x981,
        0x982,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA47,
@@ -268871,6 +275463,8 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -269023,6 +275617,8 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA94A,
        0xA94B,
        0xA94F,
@@ -269119,6 +275715,8 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0x11440,
        0x11443,
        0x11445,
+       0x1145E,
+       0x1145F,
        0x114BA,
        0x114BB,
        0x114BF,
@@ -269145,6 +275743,8 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0x11728,
        0x11729,
        0x1172C,
+       0x11833,
+       0x11838,
        0x11A01,
        0x11A02,
        0x11A04,
@@ -269176,10 +275776,16 @@ static const UV PL_INPC__TOP_invlist[] = { /* for all charsets */
        0x11D3F,
        0x11D42,
        0x11D43,
-       0x11D44
+       0x11D44,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11EF3,
+       0x11EF4
 };
 
-static const UV PL_INPC__TOPANDBOTTOM_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__TOPANDBOTTOM_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269199,7 +275805,7 @@ static const UV PL_INPC__TOPANDBOTTOM_invlist[] = { /* for all charsets */
        0x11130
 };
 
-static const UV PL_INPC__TOPANDBOTTOMANDRIGHT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__TOPANDBOTTOMANDRIGHT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269209,7 +275815,7 @@ static const UV PL_INPC__TOPANDBOTTOMANDRIGHT_invlist[] = { /* for all charsets
        0x1B3E
 };
 
-static const UV PL_INPC__TOPANDLEFT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__TOPANDLEFT_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269229,7 +275835,7 @@ static const UV PL_INPC__TOPANDLEFT_invlist[] = { /* for all charsets */
        0x115BA
 };
 
-static const UV PL_INPC__TOPANDLEFTANDRIGHT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__TOPANDLEFTANDRIGHT_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269245,7 +275851,7 @@ static const UV PL_INPC__TOPANDLEFTANDRIGHT_invlist[] = { /* for all charsets */
        0x115BC
 };
 
-static const UV PL_INPC__TOPANDRIGHT_invlist[] = { /* for all charsets */
+static const UV UNI_INPC__TOPANDRIGHT_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269271,7 +275877,7 @@ static const UV PL_INPC__TOPANDRIGHT_invlist[] = { /* for all charsets */
        0x11234
 };
 
-static const UV PL_INPHAGSPA_invlist[] = { /* for all charsets */
+static const UV UNI_INPHAGSPA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269281,7 +275887,7 @@ static const UV PL_INPHAGSPA_invlist[] = { /* for all charsets */
        0xA880
 };
 
-static const UV PL_INPHOENICIAN_invlist[] = { /* for all charsets */
+static const UV UNI_INPHOENICIAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269291,7 +275897,7 @@ static const UV PL_INPHOENICIAN_invlist[] = { /* for all charsets */
        0x10920
 };
 
-static const UV PL_INPSALTERPAHLAVI_invlist[] = { /* for all charsets */
+static const UV UNI_INPSALTERPAHLAVI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269301,7 +275907,7 @@ static const UV PL_INPSALTERPAHLAVI_invlist[] = { /* for all charsets */
        0x10BB0
 };
 
-static const UV PL_INPUNCTUATION_invlist[] = { /* for all charsets */
+static const UV UNI_INPUNCTUATION_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269311,7 +275917,7 @@ static const UV PL_INPUNCTUATION_invlist[] = { /* for all charsets */
        0x2070
 };
 
-static const UV PL_INREJANG_invlist[] = { /* for all charsets */
+static const UV UNI_INREJANG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269321,7 +275927,7 @@ static const UV PL_INREJANG_invlist[] = { /* for all charsets */
        0xA960
 };
 
-static const UV PL_INRUNIC_invlist[] = { /* for all charsets */
+static const UV UNI_INRUNIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269331,7 +275937,7 @@ static const UV PL_INRUNIC_invlist[] = { /* for all charsets */
        0x1700
 };
 
-static const UV PL_INSAMARITAN_invlist[] = { /* for all charsets */
+static const UV UNI_INSAMARITAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269341,7 +275947,7 @@ static const UV PL_INSAMARITAN_invlist[] = { /* for all charsets */
        0x840
 };
 
-static const UV PL_INSAURASHTRA_invlist[] = { /* for all charsets */
+static const UV UNI_INSAURASHTRA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269351,8 +275957,8 @@ static const UV PL_INSAURASHTRA_invlist[] = { /* for all charsets */
        0xA8E0
 };
 
-static const UV PL_INSC__AVAGRAHA_invlist[] = { /* for all charsets */
-       31,     /* Number of elements */
+static const UV UNI_INSC__AVAGRAHA_invlist[] = {  /* for all charsets */
+       33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269385,12 +275991,14 @@ static const UV PL_INSC__AVAGRAHA_invlist[] = { /* for all charsets */
        0x11448,
        0x114C4,
        0x114C5,
+       0x11A9D,
+       0x11A9E,
        0x11C40,
        0x11C41
 };
 
-static const UV PL_INSC__BINDU_invlist[] = { /* for all charsets */
-       97,     /* Number of elements */
+static const UV UNI_INSC__BINDU_invlist[] = {  /* for all charsets */
+       103,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269413,6 +276021,8 @@ static const UV PL_INSC__BINDU_invlist[] = { /* for all charsets */
        0xB83,
        0xC00,
        0xC03,
+       0xC04,
+       0xC05,
        0xC81,
        0xC83,
        0xD00,
@@ -269481,6 +276091,8 @@ static const UV PL_INSC__BINDU_invlist[] = { /* for all charsets */
        0x1163E,
        0x116AB,
        0x116AC,
+       0x11837,
+       0x11838,
        0x11A35,
        0x11A39,
        0x11A96,
@@ -269490,10 +276102,12 @@ static const UV PL_INSC__BINDU_invlist[] = { /* for all charsets */
        0x11CB5,
        0x11CB7,
        0x11D40,
-       0x11D41
+       0x11D41,
+       0x11D95,
+       0x11D96
 };
 
-static const UV PL_INSC__BRAHMIJOININGNUMBER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__BRAHMIJOININGNUMBER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269503,14 +276117,16 @@ static const UV PL_INSC__BRAHMIJOININGNUMBER_invlist[] = { /* for all charsets *
        0x11066
 };
 
-static const UV PL_INSC__CANTILLATIONMARK_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
+static const UV UNI_INSC__CANTILLATIONMARK_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x951,
        0x953,
+       0xA51,
+       0xA52,
        0xAFA,
        0xAFD,
        0x1CD0,
@@ -269531,8 +276147,8 @@ static const UV PL_INSC__CANTILLATIONMARK_invlist[] = { /* for all charsets */
        0x11375
 };
 
-static const UV PL_INSC__CONSONANT_invlist[] = { /* for all charsets */
-       299,    /* Number of elements */
+static const UV UNI_INSC__CONSONANT_invlist[] = {  /* for all charsets */
+       307,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269778,13 +276394,15 @@ static const UV PL_INSC__CONSONANT_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x11013,
        0x11038,
        0x1108D,
        0x110B0,
        0x11107,
        0x11127,
+       0x11144,
+       0x11145,
        0x11155,
        0x11173,
        0x11191,
@@ -269824,7 +276442,9 @@ static const UV PL_INSC__CONSONANT_invlist[] = { /* for all charsets */
        0x1168A,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x1180A,
+       0x1182C,
        0x11A0B,
        0x11A33,
        0x11A5C,
@@ -269834,10 +276454,14 @@ static const UV PL_INSC__CONSONANT_invlist[] = { /* for all charsets */
        0x11C72,
        0x11C90,
        0x11D0C,
-       0x11D31
+       0x11D31,
+       0x11D6C,
+       0x11D8A,
+       0x11EE0,
+       0x11EF2
 };
 
-static const UV PL_INSC__CONSONANTDEAD_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTDEAD_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269851,8 +276475,8 @@ static const UV PL_INSC__CONSONANTDEAD_invlist[] = { /* for all charsets */
        0xD80
 };
 
-static const UV PL_INSC__CONSONANTFINAL_invlist[] = { /* for all charsets */
-       25,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTFINAL_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269871,8 +276495,6 @@ static const UV PL_INSC__CONSONANTFINAL_invlist[] = { /* for all charsets */
        0x1BF2,
        0x1C2D,
        0x1C34,
-       0xA8B4,
-       0xA8B5,
        0xA94F,
        0xA953,
        0xAA40,
@@ -269883,7 +276505,7 @@ static const UV PL_INSC__CONSONANTFINAL_invlist[] = { /* for all charsets */
        0x11A96
 };
 
-static const UV PL_INSC__CONSONANTHEADLETTER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTHEADLETTER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269893,7 +276515,17 @@ static const UV PL_INSC__CONSONANTHEADLETTER_invlist[] = { /* for all charsets *
        0xF8D
 };
 
-static const UV PL_INSC__CONSONANTKILLER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTINITIALPOSTFIXED_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1A5A,
+       0x1A5B
+};
+
+static const UV UNI_INSC__CONSONANTKILLER_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -269905,8 +276537,8 @@ static const UV PL_INSC__CONSONANTKILLER_invlist[] = { /* for all charsets */
        0x17CE
 };
 
-static const UV PL_INSC__CONSONANTMEDIAL_invlist[] = { /* for all charsets */
-       23,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTMEDIAL_invlist[] = {  /* for all charsets */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269923,6 +276555,8 @@ static const UV PL_INSC__CONSONANTMEDIAL_invlist[] = { /* for all charsets */
        0x1083,
        0x1A55,
        0x1A57,
+       0xA8B4,
+       0xA8B5,
        0xA9BE,
        0xA9C0,
        0xAA33,
@@ -269937,8 +276571,8 @@ static const UV PL_INSC__CONSONANTMEDIAL_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for ASCII/Latin1 */
-       23,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = {  /* for ASCII/Latin1 */
+       29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269949,8 +276583,12 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for ASCII/Latin1
        0xA1,
        0xD7,
        0xD8,
+       0x980,
+       0x981,
        0xA72,
        0xA74,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1900,
@@ -269964,7 +276602,9 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for ASCII/Latin1
        0x11A3F,
        0x11A40,
        0x11A45,
-       0x11A46
+       0x11A46,
+       0x11EF2,
+       0x11EF3
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -269974,8 +276614,8 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for ASCII/Latin1
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 1047 */
-       23,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = {  /* for EBCDIC 1047 */
+       29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -269986,8 +276626,12 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 1047 *
        0x61,
        0xBF,
        0xC0,
+       0x980,
+       0x981,
        0xA72,
        0xA74,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1900,
@@ -270001,7 +276645,9 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 1047 *
        0x11A3F,
        0x11A40,
        0x11A45,
-       0x11A46
+       0x11A46,
+       0x11EF2,
+       0x11EF3
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -270011,8 +276657,8 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 1047 *
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 037 */
-       23,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = {  /* for EBCDIC 037 */
+       29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270023,8 +276669,12 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 037 */
        0x61,
        0xBF,
        0xC0,
+       0x980,
+       0x981,
        0xA72,
        0xA74,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1900,
@@ -270038,12 +276688,14 @@ static const UV PL_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 037 */
        0x11A3F,
        0x11A40,
        0x11A45,
-       0x11A46
+       0x11A46,
+       0x11EF2,
+       0x11EF3
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_INSC__CONSONANTPRECEDINGREPHA_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTPRECEDINGREPHA_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270055,7 +276707,7 @@ static const UV PL_INSC__CONSONANTPRECEDINGREPHA_invlist[] = { /* for all charse
        0x11D47
 };
 
-static const UV PL_INSC__CONSONANTPREFIXED_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTPREFIXED_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270069,7 +276721,7 @@ static const UV PL_INSC__CONSONANTPREFIXED_invlist[] = { /* for all charsets */
        0x11A8A
 };
 
-static const UV PL_INSC__CONSONANTSUBJOINED_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__CONSONANTSUBJOINED_invlist[] = {  /* for all charsets */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270103,16 +276755,14 @@ static const UV PL_INSC__CONSONANTSUBJOINED_invlist[] = { /* for all charsets */
        0x11CB0
 };
 
-static const UV PL_INSC__CONSONANTSUCCEEDINGREPHA_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_INSC__CONSONANTSUCCEEDINGREPHA_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x17CC,
        0x17CD,
-       0x1A5A,
-       0x1A5B,
        0x1B03,
        0x1B04,
        0x1B81,
@@ -270121,19 +276771,21 @@ static const UV PL_INSC__CONSONANTSUCCEEDINGREPHA_invlist[] = { /* for all chars
        0xA983
 };
 
-static const UV PL_INSC__CONSONANTWITHSTACKER_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_INSC__CONSONANTWITHSTACKER_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xCF1,
        0xCF3,
+       0x1CF5,
+       0x1CF7,
        0x11003,
        0x11005
 };
 
-static const UV PL_INSC__GEMINATIONMARK_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__GEMINATIONMARK_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270147,8 +276799,8 @@ static const UV PL_INSC__GEMINATIONMARK_invlist[] = { /* for all charsets */
        0x11A99
 };
 
-static const UV PL_INSC__INVISIBLESTACKER_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
+static const UV UNI_INSC__INVISIBLESTACKER_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270172,10 +276824,12 @@ static const UV PL_INSC__INVISIBLESTACKER_invlist[] = { /* for all charsets */
        0x11A99,
        0x11A9A,
        0x11D45,
-       0x11D46
+       0x11D46,
+       0x11D97,
+       0x11D98
 };
 
-static const UV PL_INSC__MODIFYINGLETTER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__MODIFYINGLETTER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270185,7 +276839,7 @@ static const UV PL_INSC__MODIFYINGLETTER_invlist[] = { /* for all charsets */
        0xB84
 };
 
-static const UV PL_INSC__NONJOINER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__NONJOINER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270195,8 +276849,8 @@ static const UV PL_INSC__NONJOINER_invlist[] = { /* for all charsets */
        0x200D
 };
 
-static const UV PL_INSC__NUKTA_invlist[] = { /* for all charsets */
-       49,     /* Number of elements */
+static const UV UNI_INSC__NUKTA_invlist[] = {  /* for all charsets */
+       51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270237,7 +276891,7 @@ static const UV PL_INSC__NUKTA_invlist[] = { /* for all charsets */
        0x11237,
        0x112E9,
        0x112EA,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11446,
        0x11447,
@@ -270247,14 +276901,16 @@ static const UV PL_INSC__NUKTA_invlist[] = { /* for all charsets */
        0x115C1,
        0x116B7,
        0x116B8,
+       0x1183A,
+       0x1183B,
        0x11D42,
        0x11D43
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_INSC__NUMBER_invlist[] = { /* for ASCII/Latin1 */
-       87,     /* Number of elements */
+static const UV UNI_INSC__NUMBER_invlist[] = {  /* for ASCII/Latin1 */
+       89,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270320,7 +276976,7 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for ASCII/Latin1 */
        0xABF0,
        0xABFA,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x11066,
        0x11070,
        0x11136,
@@ -270344,7 +277000,9 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for ASCII/Latin1 */
        0x11C50,
        0x11C6D,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11DA0,
+       0x11DAA
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -270354,8 +277012,8 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 1047 */
-       87,     /* Number of elements */
+static const UV UNI_INSC__NUMBER_invlist[] = {  /* for EBCDIC 1047 */
+       89,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270421,7 +277079,7 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 1047 */
        0xABF0,
        0xABFA,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x11066,
        0x11070,
        0x11136,
@@ -270445,7 +277103,9 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 1047 */
        0x11C50,
        0x11C6D,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11DA0,
+       0x11DAA
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -270455,8 +277115,8 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 037 */
-       87,     /* Number of elements */
+static const UV UNI_INSC__NUMBER_invlist[] = {  /* for EBCDIC 037 */
+       89,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270522,7 +277182,7 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 037 */
        0xABF0,
        0xABFA,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x11066,
        0x11070,
        0x11136,
@@ -270546,12 +277206,14 @@ static const UV PL_INSC__NUMBER_invlist[] = { /* for EBCDIC 037 */
        0x11C50,
        0x11C6D,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11DA0,
+       0x11DAA
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_INSC__NUMBERJOINER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__NUMBERJOINER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -270563,8 +277225,8 @@ static const UV PL_INSC__NUMBERJOINER_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
-       613,    /* Number of elements */
+static const UV UNI_INSC__OTHER_invlist[] = {  /* for ASCII/Latin1 */
+       635,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -270588,8 +277250,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x966,
        0x970,
        0x972,
-       0x980,
-       0x981,
        0x984,
        0x985,
        0x98D,
@@ -270619,6 +277279,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -270643,6 +277305,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0xA49,
        0xA4B,
        0xA4E,
+       0xA51,
+       0xA52,
        0xA59,
        0xA5D,
        0xA5E,
@@ -270738,8 +277402,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -270903,6 +277565,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0xFC7,
        0x1000,
        0x104A,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1050,
@@ -270972,8 +277636,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x1CD4,
        0x1CE2,
        0x1CF2,
-       0x1CF5,
-       0x1CF7,
        0x1CFA,
        0x1DFB,
        0x1DFC,
@@ -270999,7 +277661,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0xA8DA,
        0xA8E0,
        0xA8F4,
-       0xA900,
+       0xA8FE,
        0xA92E,
        0xA930,
        0xA954,
@@ -271042,11 +277704,11 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x11000,
        0x11047,
        0x11052,
@@ -271057,11 +277719,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11180,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -271101,7 +277765,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -271119,6 +277783,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x11448,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11481,
        0x114C5,
        0x114D0,
@@ -271138,11 +277804,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173C,
+       0x11800,
+       0x1183B,
        0x11A00,
        0x11A40,
        0x11A45,
@@ -271153,6 +277821,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11C00,
        0x11C09,
        0x11C0A,
@@ -271180,7 +277850,21 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
        0x11D3F,
        0x11D48,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -271190,8 +277874,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
-       613,    /* Number of elements */
+static const UV UNI_INSC__OTHER_invlist[] = {  /* for EBCDIC 1047 */
+       635,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -271215,8 +277899,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x966,
        0x970,
        0x972,
-       0x980,
-       0x981,
        0x984,
        0x985,
        0x98D,
@@ -271246,6 +277928,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -271270,6 +277954,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0xA49,
        0xA4B,
        0xA4E,
+       0xA51,
+       0xA52,
        0xA59,
        0xA5D,
        0xA5E,
@@ -271365,8 +278051,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -271530,6 +278214,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0xFC7,
        0x1000,
        0x104A,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1050,
@@ -271599,8 +278285,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x1CD4,
        0x1CE2,
        0x1CF2,
-       0x1CF5,
-       0x1CF7,
        0x1CFA,
        0x1DFB,
        0x1DFC,
@@ -271626,7 +278310,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0xA8DA,
        0xA8E0,
        0xA8F4,
-       0xA900,
+       0xA8FE,
        0xA92E,
        0xA930,
        0xA954,
@@ -271669,11 +278353,11 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x11000,
        0x11047,
        0x11052,
@@ -271684,11 +278368,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11180,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -271728,7 +278414,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -271746,6 +278432,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x11448,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11481,
        0x114C5,
        0x114D0,
@@ -271765,11 +278453,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173C,
+       0x11800,
+       0x1183B,
        0x11A00,
        0x11A40,
        0x11A45,
@@ -271780,6 +278470,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11C00,
        0x11C09,
        0x11C0A,
@@ -271807,7 +278499,21 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
        0x11D3F,
        0x11D48,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -271817,8 +278523,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
-       613,    /* Number of elements */
+static const UV UNI_INSC__OTHER_invlist[] = {  /* for EBCDIC 037 */
+       635,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -271842,8 +278548,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x966,
        0x970,
        0x972,
-       0x980,
-       0x981,
        0x984,
        0x985,
        0x98D,
@@ -271873,6 +278577,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -271897,6 +278603,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0xA49,
        0xA4B,
        0xA4E,
+       0xA51,
+       0xA52,
        0xA59,
        0xA5D,
        0xA5E,
@@ -271992,8 +278700,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -272157,6 +278863,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0xFC7,
        0x1000,
        0x104A,
+       0x104B,
+       0x104C,
        0x104E,
        0x104F,
        0x1050,
@@ -272226,8 +278934,6 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x1CD4,
        0x1CE2,
        0x1CF2,
-       0x1CF5,
-       0x1CF7,
        0x1CFA,
        0x1DFB,
        0x1DFC,
@@ -272253,7 +278959,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0xA8DA,
        0xA8E0,
        0xA8F4,
-       0xA900,
+       0xA8FE,
        0xA92E,
        0xA930,
        0xA954,
@@ -272296,11 +279002,11 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x11000,
        0x11047,
        0x11052,
@@ -272311,11 +279017,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11180,
        0x111C4,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DA,
@@ -272355,7 +279063,7 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -272373,6 +279081,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x11448,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11481,
        0x114C5,
        0x114D0,
@@ -272392,11 +279102,13 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173C,
+       0x11800,
+       0x1183B,
        0x11A00,
        0x11A40,
        0x11A45,
@@ -272407,6 +279119,8 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11C00,
        0x11C09,
        0x11C0A,
@@ -272434,12 +279148,26 @@ static const UV PL_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */
        0x11D3F,
        0x11D48,
        0x11D50,
-       0x11D5A
+       0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_INSC__PUREKILLER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__PUREKILLER_invlist[] = {  /* for all charsets */
        39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -272485,7 +279213,7 @@ static const UV PL_INSC__PUREKILLER_invlist[] = { /* for all charsets */
        0x11D45
 };
 
-static const UV PL_INSC__REGISTERSHIFTER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__REGISTERSHIFTER_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -272497,14 +279225,16 @@ static const UV PL_INSC__REGISTERSHIFTER_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for ASCII/Latin1 */
-       33,     /* Number of elements */
+static const UV UNI_INSC__SYLLABLEMODIFIER_invlist[] = {  /* for ASCII/Latin1 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xB2,
        0xB4,
+       0x9FE,
+       0x9FF,
        0xF35,
        0xF36,
        0xF37,
@@ -272533,6 +279263,10 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for ASCII/Latin1 */
        0x2075,
        0x2082,
        0x2085,
+       0x111C9,
+       0x111CA,
+       0x1145E,
+       0x1145F,
        0x11A33,
        0x11A34
 };
@@ -272544,8 +279278,8 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 1047 */
-       35,     /* Number of elements */
+static const UV UNI_INSC__SYLLABLEMODIFIER_invlist[] = {  /* for EBCDIC 1047 */
+       41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -272554,6 +279288,8 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 1047 */
        0xEB,
        0xFA,
        0xFB,
+       0x9FE,
+       0x9FF,
        0xF35,
        0xF36,
        0xF37,
@@ -272582,6 +279318,10 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 1047 */
        0x2075,
        0x2082,
        0x2085,
+       0x111C9,
+       0x111CA,
+       0x1145E,
+       0x1145F,
        0x11A33,
        0x11A34
 };
@@ -272593,8 +279333,8 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 037 */
-       35,     /* Number of elements */
+static const UV UNI_INSC__SYLLABLEMODIFIER_invlist[] = {  /* for EBCDIC 037 */
+       41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -272603,6 +279343,8 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 037 */
        0xEB,
        0xFA,
        0xFB,
+       0x9FE,
+       0x9FF,
        0xF35,
        0xF36,
        0xF37,
@@ -272631,13 +279373,17 @@ static const UV PL_INSC__SYLLABLEMODIFIER_invlist[] = { /* for EBCDIC 037 */
        0x2075,
        0x2082,
        0x2085,
+       0x111C9,
+       0x111CA,
+       0x1145E,
+       0x1145F,
        0x11A33,
        0x11A34
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_INSC__TONELETTER_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__TONELETTER_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -272651,7 +279397,7 @@ static const UV PL_INSC__TONELETTER_invlist[] = { /* for all charsets */
        0xAAC3
 };
 
-static const UV PL_INSC__TONEMARK_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__TONEMARK_invlist[] = {  /* for all charsets */
        31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -272689,8 +279435,8 @@ static const UV PL_INSC__TONEMARK_invlist[] = { /* for all charsets */
        0xABED
 };
 
-static const UV PL_INSC__VIRAMA_invlist[] = { /* for all charsets */
-       49,     /* Number of elements */
+static const UV UNI_INSC__VIRAMA_invlist[] = {  /* for all charsets */
+       51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -272741,12 +279487,14 @@ static const UV PL_INSC__VIRAMA_invlist[] = { /* for all charsets */
        0x11640,
        0x116B6,
        0x116B7,
+       0x11839,
+       0x1183A,
        0x11C3F,
        0x11C40
 };
 
-static const UV PL_INSC__VISARGA_invlist[] = { /* for all charsets */
-       67,     /* Number of elements */
+static const UV UNI_INSC__VISARGA_invlist[] = {  /* for all charsets */
+       71,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -272809,6 +279557,8 @@ static const UV PL_INSC__VISARGA_invlist[] = { /* for all charsets */
        0x1163F,
        0x116AC,
        0x116AD,
+       0x11838,
+       0x11839,
        0x11A39,
        0x11A3A,
        0x11A97,
@@ -272816,10 +279566,12 @@ static const UV PL_INSC__VISARGA_invlist[] = { /* for all charsets */
        0x11C3E,
        0x11C3F,
        0x11D41,
-       0x11D42
+       0x11D42,
+       0x11D96,
+       0x11D97
 };
 
-static const UV PL_INSC__VOWEL_invlist[] = { /* for all charsets */
+static const UV UNI_INSC__VOWEL_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -272837,8 +279589,8 @@ static const UV PL_INSC__VOWEL_invlist[] = { /* for all charsets */
        0x11155
 };
 
-static const UV PL_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */
-       237,    /* Number of elements */
+static const UV UNI_INSC__VOWELDEPENDENT_invlist[] = {  /* for all charsets */
+       251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -272997,6 +279749,8 @@ static const UV PL_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */
        0xA828,
        0xA8B5,
        0xA8C4,
+       0xA8FF,
+       0xA900,
        0xA947,
        0xA94F,
        0xA9B4,
@@ -273023,6 +279777,8 @@ static const UV PL_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */
        0x110B9,
        0x11127,
        0x11133,
+       0x11145,
+       0x11147,
        0x111B3,
        0x111C0,
        0x111CB,
@@ -273059,6 +279815,8 @@ static const UV PL_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */
        0x116B6,
        0x11720,
        0x1172B,
+       0x1182C,
+       0x11837,
        0x11A01,
        0x11A0B,
        0x11A51,
@@ -273078,11 +279836,19 @@ static const UV PL_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */
        0x11D3F,
        0x11D40,
        0x11D43,
-       0x11D44
+       0x11D44,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D95,
+       0x11EF3,
+       0x11EF7
 };
 
-static const UV PL_INSC__VOWELINDEPENDENT_invlist[] = { /* for all charsets */
-       157,    /* Number of elements */
+static const UV UNI_INSC__VOWELINDEPENDENT_invlist[] = {  /* for all charsets */
+       167,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -273183,6 +279949,8 @@ static const UV PL_INSC__VOWELINDEPENDENT_invlist[] = { /* for all charsets */
        0xA806,
        0xA882,
        0xA892,
+       0xA8FE,
+       0xA8FF,
        0xA984,
        0xA989,
        0xA98C,
@@ -273229,6 +279997,8 @@ static const UV PL_INSC__VOWELINDEPENDENT_invlist[] = { /* for all charsets */
        0x1160E,
        0x11680,
        0x1168A,
+       0x11800,
+       0x1180A,
        0x11A00,
        0x11A01,
        0x11A50,
@@ -273242,10 +280012,16 @@ static const UV PL_INSC__VOWELINDEPENDENT_invlist[] = { /* for all charsets */
        0x11D08,
        0x11D0A,
        0x11D0B,
-       0x11D0C
+       0x11D0C,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D6C
 };
 
-static const UV PL_INSHARADA_invlist[] = { /* for all charsets */
+static const UV UNI_INSHARADA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273255,7 +280031,7 @@ static const UV PL_INSHARADA_invlist[] = { /* for all charsets */
        0x111E0
 };
 
-static const UV PL_INSIDDHAM_invlist[] = { /* for all charsets */
+static const UV UNI_INSIDDHAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273265,7 +280041,7 @@ static const UV PL_INSIDDHAM_invlist[] = { /* for all charsets */
        0x11600
 };
 
-static const UV PL_INSINHALA_invlist[] = { /* for all charsets */
+static const UV UNI_INSINHALA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273275,7 +280051,17 @@ static const UV PL_INSINHALA_invlist[] = { /* for all charsets */
        0xE00
 };
 
-static const UV PL_INSORASOMPENG_invlist[] = { /* for all charsets */
+static const UV UNI_INSOGDIAN_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10F30,
+       0x10F70
+};
+
+static const UV UNI_INSORASOMPENG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273285,7 +280071,7 @@ static const UV PL_INSORASOMPENG_invlist[] = { /* for all charsets */
        0x11100
 };
 
-static const UV PL_INSOYOMBO_invlist[] = { /* for all charsets */
+static const UV UNI_INSOYOMBO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273295,7 +280081,7 @@ static const UV PL_INSOYOMBO_invlist[] = { /* for all charsets */
        0x11AB0
 };
 
-static const UV PL_INSUNDANESE_invlist[] = { /* for all charsets */
+static const UV UNI_INSUNDANESE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273305,7 +280091,7 @@ static const UV PL_INSUNDANESE_invlist[] = { /* for all charsets */
        0x1BC0
 };
 
-static const UV PL_INSYLOTINAGRI_invlist[] = { /* for all charsets */
+static const UV UNI_INSYLOTINAGRI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273315,7 +280101,7 @@ static const UV PL_INSYLOTINAGRI_invlist[] = { /* for all charsets */
        0xA830
 };
 
-static const UV PL_INSYRIAC_invlist[] = { /* for all charsets */
+static const UV UNI_INSYRIAC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273325,7 +280111,7 @@ static const UV PL_INSYRIAC_invlist[] = { /* for all charsets */
        0x750
 };
 
-static const UV PL_INTAGALOG_invlist[] = { /* for all charsets */
+static const UV UNI_INTAGALOG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273335,7 +280121,7 @@ static const UV PL_INTAGALOG_invlist[] = { /* for all charsets */
        0x1720
 };
 
-static const UV PL_INTAGBANWA_invlist[] = { /* for all charsets */
+static const UV UNI_INTAGBANWA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273345,7 +280131,7 @@ static const UV PL_INTAGBANWA_invlist[] = { /* for all charsets */
        0x1780
 };
 
-static const UV PL_INTAILE_invlist[] = { /* for all charsets */
+static const UV UNI_INTAILE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273355,7 +280141,7 @@ static const UV PL_INTAILE_invlist[] = { /* for all charsets */
        0x1980
 };
 
-static const UV PL_INTAITHAM_invlist[] = { /* for all charsets */
+static const UV UNI_INTAITHAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273365,7 +280151,7 @@ static const UV PL_INTAITHAM_invlist[] = { /* for all charsets */
        0x1AB0
 };
 
-static const UV PL_INTAIVIET_invlist[] = { /* for all charsets */
+static const UV UNI_INTAIVIET_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273375,7 +280161,7 @@ static const UV PL_INTAIVIET_invlist[] = { /* for all charsets */
        0xAAE0
 };
 
-static const UV PL_INTAKRI_invlist[] = { /* for all charsets */
+static const UV UNI_INTAKRI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273385,7 +280171,7 @@ static const UV PL_INTAKRI_invlist[] = { /* for all charsets */
        0x116D0
 };
 
-static const UV PL_INTAMIL_invlist[] = { /* for all charsets */
+static const UV UNI_INTAMIL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273395,7 +280181,7 @@ static const UV PL_INTAMIL_invlist[] = { /* for all charsets */
        0xC00
 };
 
-static const UV PL_INTANGUT_invlist[] = { /* for all charsets */
+static const UV UNI_INTANGUT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273405,7 +280191,7 @@ static const UV PL_INTANGUT_invlist[] = { /* for all charsets */
        0x18800
 };
 
-static const UV PL_INTELUGU_invlist[] = { /* for all charsets */
+static const UV UNI_INTELUGU_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273415,7 +280201,7 @@ static const UV PL_INTELUGU_invlist[] = { /* for all charsets */
        0xC80
 };
 
-static const UV PL_INTHAANA_invlist[] = { /* for all charsets */
+static const UV UNI_INTHAANA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273425,7 +280211,7 @@ static const UV PL_INTHAANA_invlist[] = { /* for all charsets */
        0x7C0
 };
 
-static const UV PL_INTHAI_invlist[] = { /* for all charsets */
+static const UV UNI_INTHAI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273435,7 +280221,7 @@ static const UV PL_INTHAI_invlist[] = { /* for all charsets */
        0xE80
 };
 
-static const UV PL_INTIBETAN_invlist[] = { /* for all charsets */
+static const UV UNI_INTIBETAN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273445,7 +280231,7 @@ static const UV PL_INTIBETAN_invlist[] = { /* for all charsets */
        0x1000
 };
 
-static const UV PL_INTIFINAGH_invlist[] = { /* for all charsets */
+static const UV UNI_INTIFINAGH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273455,7 +280241,7 @@ static const UV PL_INTIFINAGH_invlist[] = { /* for all charsets */
        0x2D80
 };
 
-static const UV PL_INTIRHUTA_invlist[] = { /* for all charsets */
+static const UV UNI_INTIRHUTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273465,7 +280251,7 @@ static const UV PL_INTIRHUTA_invlist[] = { /* for all charsets */
        0x114E0
 };
 
-static const UV PL_INUGARITIC_invlist[] = { /* for all charsets */
+static const UV UNI_INUGARITIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273475,7 +280261,7 @@ static const UV PL_INUGARITIC_invlist[] = { /* for all charsets */
        0x103A0
 };
 
-static const UV PL_INVAI_invlist[] = { /* for all charsets */
+static const UV UNI_INVAI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273485,7 +280271,7 @@ static const UV PL_INVAI_invlist[] = { /* for all charsets */
        0xA640
 };
 
-static const UV PL_INVS_invlist[] = { /* for all charsets */
+static const UV UNI_INVS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273495,7 +280281,7 @@ static const UV PL_INVS_invlist[] = { /* for all charsets */
        0xFE10
 };
 
-static const UV PL_INWARANGCITI_invlist[] = { /* for all charsets */
+static const UV UNI_INWARANGCITI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273505,7 +280291,7 @@ static const UV PL_INWARANGCITI_invlist[] = { /* for all charsets */
        0x11900
 };
 
-static const UV PL_INZANABAZARSQUARE_invlist[] = { /* for all charsets */
+static const UV UNI_INZANABAZARSQUARE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273515,7 +280301,7 @@ static const UV PL_INZANABAZARSQUARE_invlist[] = { /* for all charsets */
        0x11A50
 };
 
-static const UV PL_IPAEXT_invlist[] = { /* for all charsets */
+static const UV UNI_IPAEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273525,7 +280311,7 @@ static const UV PL_IPAEXT_invlist[] = { /* for all charsets */
        0x2B0
 };
 
-static const UV PL_ITAL_invlist[] = { /* for all charsets */
+static const UV UNI_ITAL_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273537,7 +280323,7 @@ static const UV PL_ITAL_invlist[] = { /* for all charsets */
        0x10330
 };
 
-static const UV PL_JAMO_invlist[] = { /* for all charsets */
+static const UV UNI_JAMO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273547,7 +280333,7 @@ static const UV PL_JAMO_invlist[] = { /* for all charsets */
        0x1200
 };
 
-static const UV PL_JAMOEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_JAMOEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273557,7 +280343,7 @@ static const UV PL_JAMOEXTA_invlist[] = { /* for all charsets */
        0xA980
 };
 
-static const UV PL_JAMOEXTB_invlist[] = { /* for all charsets */
+static const UV UNI_JAMOEXTB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273567,7 +280353,7 @@ static const UV PL_JAMOEXTB_invlist[] = { /* for all charsets */
        0xD800
 };
 
-static const UV PL_JAVA_invlist[] = { /* for all charsets */
+static const UV UNI_JAVA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273581,7 +280367,7 @@ static const UV PL_JAVA_invlist[] = { /* for all charsets */
        0xA9E0
 };
 
-static const UV PL_JG__AFRICANFEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__AFRICANFEH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273591,7 +280377,7 @@ static const UV PL_JG__AFRICANFEH_invlist[] = { /* for all charsets */
        0x8BC
 };
 
-static const UV PL_JG__AFRICANNOON_invlist[] = { /* for all charsets */
+static const UV UNI_JG__AFRICANNOON_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273601,7 +280387,7 @@ static const UV PL_JG__AFRICANNOON_invlist[] = { /* for all charsets */
        0x8BE
 };
 
-static const UV PL_JG__AFRICANQAF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__AFRICANQAF_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273611,7 +280397,7 @@ static const UV PL_JG__AFRICANQAF_invlist[] = { /* for all charsets */
        0x8BD
 };
 
-static const UV PL_JG__AIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__AIN_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273629,7 +280415,7 @@ static const UV PL_JG__AIN_invlist[] = { /* for all charsets */
        0x8B4
 };
 
-static const UV PL_JG__ALAPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__ALAPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273639,7 +280425,7 @@ static const UV PL_JG__ALAPH_invlist[] = { /* for all charsets */
        0x711
 };
 
-static const UV PL_JG__ALEF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__ALEF_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273659,7 +280445,7 @@ static const UV PL_JG__ALEF_invlist[] = { /* for all charsets */
        0x775
 };
 
-static const UV PL_JG__BEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__BEH_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273681,7 +280467,7 @@ static const UV PL_JG__BEH_invlist[] = { /* for all charsets */
        0x8B9
 };
 
-static const UV PL_JG__BETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__BETH_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273693,7 +280479,7 @@ static const UV PL_JG__BETH_invlist[] = { /* for all charsets */
        0x72E
 };
 
-static const UV PL_JG__BURUSHASKIYEHBARREE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__BURUSHASKIYEHBARREE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273703,7 +280489,7 @@ static const UV PL_JG__BURUSHASKIYEHBARREE_invlist[] = { /* for all charsets */
        0x77C
 };
 
-static const UV PL_JG__DAL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__DAL_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273721,7 +280507,7 @@ static const UV PL_JG__DAL_invlist[] = { /* for all charsets */
        0x8AF
 };
 
-static const UV PL_JG__DALATHRISH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__DALATHRISH_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273735,7 +280521,7 @@ static const UV PL_JG__DALATHRISH_invlist[] = { /* for all charsets */
        0x730
 };
 
-static const UV PL_JG__E_invlist[] = { /* for all charsets */
+static const UV UNI_JG__E_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273745,7 +280531,7 @@ static const UV PL_JG__E_invlist[] = { /* for all charsets */
        0x726
 };
 
-static const UV PL_JG__FARSIYEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__FARSIYEH_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273761,7 +280547,7 @@ static const UV PL_JG__FARSIYEH_invlist[] = { /* for all charsets */
        0x777
 };
 
-static const UV PL_JG__FE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__FE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273771,7 +280557,7 @@ static const UV PL_JG__FE_invlist[] = { /* for all charsets */
        0x750
 };
 
-static const UV PL_JG__FEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__FEH_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273787,7 +280573,7 @@ static const UV PL_JG__FEH_invlist[] = { /* for all charsets */
        0x8A5
 };
 
-static const UV PL_JG__FINALSEMKATH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__FINALSEMKATH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273797,7 +280583,7 @@ static const UV PL_JG__FINALSEMKATH_invlist[] = { /* for all charsets */
        0x725
 };
 
-static const UV PL_JG__GAF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__GAF_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273817,7 +280603,7 @@ static const UV PL_JG__GAF_invlist[] = { /* for all charsets */
        0x8B1
 };
 
-static const UV PL_JG__GAMAL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__GAMAL_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273829,7 +280615,7 @@ static const UV PL_JG__GAMAL_invlist[] = { /* for all charsets */
        0x72F
 };
 
-static const UV PL_JG__HAH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HAH_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273853,7 +280639,7 @@ static const UV PL_JG__HAH_invlist[] = { /* for all charsets */
        0x8A3
 };
 
-static const UV PL_JG__HAMZAONHEHGOAL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HAMZAONHEHGOAL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273863,7 +280649,37 @@ static const UV PL_JG__HAMZAONHEHGOAL_invlist[] = { /* for all charsets */
        0x6C4
 };
 
-static const UV PL_JG__HE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HANIFIROHINGYAKINNAYA_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10D19,
+       0x10D1A,
+       0x10D1E,
+       0x10D1F,
+       0x10D20,
+       0x10D21,
+       0x10D23,
+       0x10D24
+};
+
+static const UV UNI_JG__HANIFIROHINGYAPA_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10D02,
+       0x10D03,
+       0x10D09,
+       0x10D0A,
+       0x10D1C,
+       0x10D1D
+};
+
+static const UV UNI_JG__HE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273873,7 +280689,7 @@ static const UV PL_JG__HE_invlist[] = { /* for all charsets */
        0x718
 };
 
-static const UV PL_JG__HEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HEH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273883,7 +280699,7 @@ static const UV PL_JG__HEH_invlist[] = { /* for all charsets */
        0x648
 };
 
-static const UV PL_JG__HEHGOAL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HEHGOAL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273893,7 +280709,7 @@ static const UV PL_JG__HEHGOAL_invlist[] = { /* for all charsets */
        0x6C3
 };
 
-static const UV PL_JG__HETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__HETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273903,7 +280719,7 @@ static const UV PL_JG__HETH_invlist[] = { /* for all charsets */
        0x71B
 };
 
-static const UV PL_JG__KAF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__KAF_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273919,7 +280735,7 @@ static const UV PL_JG__KAF_invlist[] = { /* for all charsets */
        0x8B5
 };
 
-static const UV PL_JG__KAPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__KAPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273929,7 +280745,7 @@ static const UV PL_JG__KAPH_invlist[] = { /* for all charsets */
        0x720
 };
 
-static const UV PL_JG__KHAPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__KHAPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273939,7 +280755,7 @@ static const UV PL_JG__KHAPH_invlist[] = { /* for all charsets */
        0x74F
 };
 
-static const UV PL_JG__KNOTTEDHEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__KNOTTEDHEH_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273951,7 +280767,7 @@ static const UV PL_JG__KNOTTEDHEH_invlist[] = { /* for all charsets */
        0x700
 };
 
-static const UV PL_JG__LAM_invlist[] = { /* for all charsets */
+static const UV UNI_JG__LAM_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273967,7 +280783,7 @@ static const UV PL_JG__LAM_invlist[] = { /* for all charsets */
        0x8A7
 };
 
-static const UV PL_JG__LAMADH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__LAMADH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273977,7 +280793,7 @@ static const UV PL_JG__LAMADH_invlist[] = { /* for all charsets */
        0x721
 };
 
-static const UV PL_JG__MALAYALAMBHA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMBHA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273987,7 +280803,7 @@ static const UV PL_JG__MALAYALAMBHA_invlist[] = { /* for all charsets */
        0x867
 };
 
-static const UV PL_JG__MALAYALAMJA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMJA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -273997,7 +280813,7 @@ static const UV PL_JG__MALAYALAMJA_invlist[] = { /* for all charsets */
        0x862
 };
 
-static const UV PL_JG__MALAYALAMLLA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMLLA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274007,7 +280823,7 @@ static const UV PL_JG__MALAYALAMLLA_invlist[] = { /* for all charsets */
        0x869
 };
 
-static const UV PL_JG__MALAYALAMLLLA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMLLLA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274017,7 +280833,7 @@ static const UV PL_JG__MALAYALAMLLLA_invlist[] = { /* for all charsets */
        0x86A
 };
 
-static const UV PL_JG__MALAYALAMNGA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMNGA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274027,7 +280843,7 @@ static const UV PL_JG__MALAYALAMNGA_invlist[] = { /* for all charsets */
        0x861
 };
 
-static const UV PL_JG__MALAYALAMNNA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMNNA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274037,7 +280853,7 @@ static const UV PL_JG__MALAYALAMNNA_invlist[] = { /* for all charsets */
        0x865
 };
 
-static const UV PL_JG__MALAYALAMNNNA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMNNNA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274047,7 +280863,7 @@ static const UV PL_JG__MALAYALAMNNNA_invlist[] = { /* for all charsets */
        0x866
 };
 
-static const UV PL_JG__MALAYALAMNYA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMNYA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274057,7 +280873,7 @@ static const UV PL_JG__MALAYALAMNYA_invlist[] = { /* for all charsets */
        0x863
 };
 
-static const UV PL_JG__MALAYALAMRA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMRA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274067,7 +280883,7 @@ static const UV PL_JG__MALAYALAMRA_invlist[] = { /* for all charsets */
        0x868
 };
 
-static const UV PL_JG__MALAYALAMSSA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMSSA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274077,7 +280893,7 @@ static const UV PL_JG__MALAYALAMSSA_invlist[] = { /* for all charsets */
        0x86B
 };
 
-static const UV PL_JG__MALAYALAMTTA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MALAYALAMTTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274087,7 +280903,7 @@ static const UV PL_JG__MALAYALAMTTA_invlist[] = { /* for all charsets */
        0x864
 };
 
-static const UV PL_JG__MANICHAEANALEPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANALEPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274097,7 +280913,7 @@ static const UV PL_JG__MANICHAEANALEPH_invlist[] = { /* for all charsets */
        0x10AC1
 };
 
-static const UV PL_JG__MANICHAEANAYIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANAYIN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274107,7 +280923,7 @@ static const UV PL_JG__MANICHAEANAYIN_invlist[] = { /* for all charsets */
        0x10ADB
 };
 
-static const UV PL_JG__MANICHAEANBETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANBETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274117,7 +280933,7 @@ static const UV PL_JG__MANICHAEANBETH_invlist[] = { /* for all charsets */
        0x10AC3
 };
 
-static const UV PL_JG__MANICHAEANDALETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANDALETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274127,7 +280943,7 @@ static const UV PL_JG__MANICHAEANDALETH_invlist[] = { /* for all charsets */
        0x10AC6
 };
 
-static const UV PL_JG__MANICHAEANDHAMEDH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANDHAMEDH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274137,7 +280953,7 @@ static const UV PL_JG__MANICHAEANDHAMEDH_invlist[] = { /* for all charsets */
        0x10AD5
 };
 
-static const UV PL_JG__MANICHAEANFIVE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANFIVE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274147,7 +280963,7 @@ static const UV PL_JG__MANICHAEANFIVE_invlist[] = { /* for all charsets */
        0x10AED
 };
 
-static const UV PL_JG__MANICHAEANGIMEL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANGIMEL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274157,7 +280973,7 @@ static const UV PL_JG__MANICHAEANGIMEL_invlist[] = { /* for all charsets */
        0x10AC5
 };
 
-static const UV PL_JG__MANICHAEANHETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANHETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274167,7 +280983,7 @@ static const UV PL_JG__MANICHAEANHETH_invlist[] = { /* for all charsets */
        0x10ACE
 };
 
-static const UV PL_JG__MANICHAEANHUNDRED_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANHUNDRED_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274177,7 +280993,7 @@ static const UV PL_JG__MANICHAEANHUNDRED_invlist[] = { /* for all charsets */
        0x10AF0
 };
 
-static const UV PL_JG__MANICHAEANKAPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANKAPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274187,7 +281003,7 @@ static const UV PL_JG__MANICHAEANKAPH_invlist[] = { /* for all charsets */
        0x10AD3
 };
 
-static const UV PL_JG__MANICHAEANLAMEDH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANLAMEDH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274197,7 +281013,7 @@ static const UV PL_JG__MANICHAEANLAMEDH_invlist[] = { /* for all charsets */
        0x10AD4
 };
 
-static const UV PL_JG__MANICHAEANMEM_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANMEM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274207,7 +281023,7 @@ static const UV PL_JG__MANICHAEANMEM_invlist[] = { /* for all charsets */
        0x10AD7
 };
 
-static const UV PL_JG__MANICHAEANNUN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANNUN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274217,7 +281033,7 @@ static const UV PL_JG__MANICHAEANNUN_invlist[] = { /* for all charsets */
        0x10AD8
 };
 
-static const UV PL_JG__MANICHAEANONE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANONE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274227,7 +281043,7 @@ static const UV PL_JG__MANICHAEANONE_invlist[] = { /* for all charsets */
        0x10AEC
 };
 
-static const UV PL_JG__MANICHAEANPE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANPE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274237,7 +281053,7 @@ static const UV PL_JG__MANICHAEANPE_invlist[] = { /* for all charsets */
        0x10ADD
 };
 
-static const UV PL_JG__MANICHAEANQOPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANQOPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274247,7 +281063,7 @@ static const UV PL_JG__MANICHAEANQOPH_invlist[] = { /* for all charsets */
        0x10AE1
 };
 
-static const UV PL_JG__MANICHAEANRESH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANRESH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274257,7 +281073,7 @@ static const UV PL_JG__MANICHAEANRESH_invlist[] = { /* for all charsets */
        0x10AE2
 };
 
-static const UV PL_JG__MANICHAEANSADHE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANSADHE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274267,7 +281083,7 @@ static const UV PL_JG__MANICHAEANSADHE_invlist[] = { /* for all charsets */
        0x10ADE
 };
 
-static const UV PL_JG__MANICHAEANSAMEKH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANSAMEKH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274277,7 +281093,7 @@ static const UV PL_JG__MANICHAEANSAMEKH_invlist[] = { /* for all charsets */
        0x10AD9
 };
 
-static const UV PL_JG__MANICHAEANTAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANTAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274287,7 +281103,7 @@ static const UV PL_JG__MANICHAEANTAW_invlist[] = { /* for all charsets */
        0x10AE5
 };
 
-static const UV PL_JG__MANICHAEANTEN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANTEN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274297,7 +281113,7 @@ static const UV PL_JG__MANICHAEANTEN_invlist[] = { /* for all charsets */
        0x10AEE
 };
 
-static const UV PL_JG__MANICHAEANTETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANTETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274307,7 +281123,7 @@ static const UV PL_JG__MANICHAEANTETH_invlist[] = { /* for all charsets */
        0x10ACF
 };
 
-static const UV PL_JG__MANICHAEANTHAMEDH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANTHAMEDH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274317,7 +281133,7 @@ static const UV PL_JG__MANICHAEANTHAMEDH_invlist[] = { /* for all charsets */
        0x10AD6
 };
 
-static const UV PL_JG__MANICHAEANTWENTY_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANTWENTY_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274327,7 +281143,7 @@ static const UV PL_JG__MANICHAEANTWENTY_invlist[] = { /* for all charsets */
        0x10AEF
 };
 
-static const UV PL_JG__MANICHAEANWAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANWAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274337,7 +281153,7 @@ static const UV PL_JG__MANICHAEANWAW_invlist[] = { /* for all charsets */
        0x10AC8
 };
 
-static const UV PL_JG__MANICHAEANYODH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANYODH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274347,7 +281163,7 @@ static const UV PL_JG__MANICHAEANYODH_invlist[] = { /* for all charsets */
        0x10AD0
 };
 
-static const UV PL_JG__MANICHAEANZAYIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MANICHAEANZAYIN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274357,7 +281173,7 @@ static const UV PL_JG__MANICHAEANZAYIN_invlist[] = { /* for all charsets */
        0x10ACB
 };
 
-static const UV PL_JG__MEEM_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MEEM_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274371,7 +281187,7 @@ static const UV PL_JG__MEEM_invlist[] = { /* for all charsets */
        0x8A8
 };
 
-static const UV PL_JG__MIM_invlist[] = { /* for all charsets */
+static const UV UNI_JG__MIM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274381,8 +281197,8 @@ static const UV PL_JG__MIM_invlist[] = { /* for all charsets */
        0x722
 };
 
-static const UV PL_JG__NOJOININGGROUP_invlist[] = { /* for all charsets */
-       47,     /* Number of elements */
+static const UV UNI_JG__NOJOININGGROUP_invlist[] = {  /* for all charsets */
+       61,     /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -274432,10 +281248,24 @@ static const UV PL_JG__NOJOININGGROUP_invlist[] = { /* for all charsets */
        0x10AE4,
        0x10AE5,
        0x10AEB,
-       0x10AF0
-};
-
-static const UV PL_JG__NOON_invlist[] = { /* for all charsets */
+       0x10AF0,
+       0x10D02,
+       0x10D03,
+       0x10D09,
+       0x10D0A,
+       0x10D19,
+       0x10D1A,
+       0x10D1C,
+       0x10D1D,
+       0x10D1E,
+       0x10D1F,
+       0x10D20,
+       0x10D21,
+       0x10D23,
+       0x10D24
+};
+
+static const UV UNI_JG__NOON_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274449,7 +281279,7 @@ static const UV PL_JG__NOON_invlist[] = { /* for all charsets */
        0x76A
 };
 
-static const UV PL_JG__NUN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__NUN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274459,7 +281289,7 @@ static const UV PL_JG__NUN_invlist[] = { /* for all charsets */
        0x723
 };
 
-static const UV PL_JG__NYA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__NYA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274469,7 +281299,7 @@ static const UV PL_JG__NYA_invlist[] = { /* for all charsets */
        0x6BE
 };
 
-static const UV PL_JG__PE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__PE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274479,7 +281309,7 @@ static const UV PL_JG__PE_invlist[] = { /* for all charsets */
        0x727
 };
 
-static const UV PL_JG__QAF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__QAF_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274495,7 +281325,7 @@ static const UV PL_JG__QAF_invlist[] = { /* for all charsets */
        0x8A6
 };
 
-static const UV PL_JG__QAPH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__QAPH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274505,7 +281335,7 @@ static const UV PL_JG__QAPH_invlist[] = { /* for all charsets */
        0x72A
 };
 
-static const UV PL_JG__REH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__REH_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274531,7 +281361,7 @@ static const UV PL_JG__REH_invlist[] = { /* for all charsets */
        0x8BA
 };
 
-static const UV PL_JG__REVERSEDPE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__REVERSEDPE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274541,7 +281371,7 @@ static const UV PL_JG__REVERSEDPE_invlist[] = { /* for all charsets */
        0x728
 };
 
-static const UV PL_JG__ROHINGYAYEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__ROHINGYAYEH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274551,7 +281381,7 @@ static const UV PL_JG__ROHINGYAYEH_invlist[] = { /* for all charsets */
        0x8AD
 };
 
-static const UV PL_JG__SAD_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SAD_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274567,7 +281397,7 @@ static const UV PL_JG__SAD_invlist[] = { /* for all charsets */
        0x8B0
 };
 
-static const UV PL_JG__SADHE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SADHE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274577,7 +281407,7 @@ static const UV PL_JG__SADHE_invlist[] = { /* for all charsets */
        0x729
 };
 
-static const UV PL_JG__SEEN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SEEN_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274599,7 +281429,7 @@ static const UV PL_JG__SEEN_invlist[] = { /* for all charsets */
        0x77F
 };
 
-static const UV PL_JG__SEMKATH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SEMKATH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274609,7 +281439,7 @@ static const UV PL_JG__SEMKATH_invlist[] = { /* for all charsets */
        0x724
 };
 
-static const UV PL_JG__SHIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SHIN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274619,7 +281449,7 @@ static const UV PL_JG__SHIN_invlist[] = { /* for all charsets */
        0x72C
 };
 
-static const UV PL_JG__STRAIGHTWAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__STRAIGHTWAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274629,7 +281459,7 @@ static const UV PL_JG__STRAIGHTWAW_invlist[] = { /* for all charsets */
        0x8B2
 };
 
-static const UV PL_JG__SWASHKAF_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SWASHKAF_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274639,7 +281469,7 @@ static const UV PL_JG__SWASHKAF_invlist[] = { /* for all charsets */
        0x6AB
 };
 
-static const UV PL_JG__SYRIACWAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__SYRIACWAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274649,7 +281479,7 @@ static const UV PL_JG__SYRIACWAW_invlist[] = { /* for all charsets */
        0x719
 };
 
-static const UV PL_JG__TAH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__TAH_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274663,7 +281493,7 @@ static const UV PL_JG__TAH_invlist[] = { /* for all charsets */
        0x8A4
 };
 
-static const UV PL_JG__TAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__TAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274673,7 +281503,7 @@ static const UV PL_JG__TAW_invlist[] = { /* for all charsets */
        0x72D
 };
 
-static const UV PL_JG__TEHMARBUTA_invlist[] = { /* for all charsets */
+static const UV UNI_JG__TEHMARBUTA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274687,7 +281517,7 @@ static const UV PL_JG__TEHMARBUTA_invlist[] = { /* for all charsets */
        0x6D6
 };
 
-static const UV PL_JG__TETH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__TETH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274697,7 +281527,7 @@ static const UV PL_JG__TETH_invlist[] = { /* for all charsets */
        0x71D
 };
 
-static const UV PL_JG__WAW_invlist[] = { /* for all charsets */
+static const UV UNI_JG__WAW_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274719,7 +281549,7 @@ static const UV PL_JG__WAW_invlist[] = { /* for all charsets */
        0x8AC
 };
 
-static const UV PL_JG__YEH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__YEH_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274743,7 +281573,7 @@ static const UV PL_JG__YEH_invlist[] = { /* for all charsets */
        0x8BB
 };
 
-static const UV PL_JG__YEHBARREE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__YEHBARREE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274753,7 +281583,7 @@ static const UV PL_JG__YEHBARREE_invlist[] = { /* for all charsets */
        0x6D4
 };
 
-static const UV PL_JG__YEHWITHTAIL_invlist[] = { /* for all charsets */
+static const UV UNI_JG__YEHWITHTAIL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274763,7 +281593,7 @@ static const UV PL_JG__YEHWITHTAIL_invlist[] = { /* for all charsets */
        0x6CE
 };
 
-static const UV PL_JG__YUDH_invlist[] = { /* for all charsets */
+static const UV UNI_JG__YUDH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274773,7 +281603,7 @@ static const UV PL_JG__YUDH_invlist[] = { /* for all charsets */
        0x71E
 };
 
-static const UV PL_JG__YUDHHE_invlist[] = { /* for all charsets */
+static const UV UNI_JG__YUDHHE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274783,7 +281613,7 @@ static const UV PL_JG__YUDHHE_invlist[] = { /* for all charsets */
        0x71F
 };
 
-static const UV PL_JG__ZAIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__ZAIN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274793,7 +281623,7 @@ static const UV PL_JG__ZAIN_invlist[] = { /* for all charsets */
        0x71A
 };
 
-static const UV PL_JG__ZHAIN_invlist[] = { /* for all charsets */
+static const UV UNI_JG__ZHAIN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274803,7 +281633,7 @@ static const UV PL_JG__ZHAIN_invlist[] = { /* for all charsets */
        0x74E
 };
 
-static const UV PL_JOINC_invlist[] = { /* for all charsets */
+static const UV UNI_JOINC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274813,7 +281643,7 @@ static const UV PL_JOINC_invlist[] = { /* for all charsets */
        0x200E
 };
 
-static const UV PL_JT__C_invlist[] = { /* for all charsets */
+static const UV UNI_JT__C_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -274829,8 +281659,8 @@ static const UV PL_JT__C_invlist[] = { /* for all charsets */
        0x200E
 };
 
-static const UV PL_JT__D_invlist[] = { /* for all charsets */
-       119,    /* Number of elements */
+static const UV UNI_JT__D_invlist[] = {  /* for all charsets */
+       129,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -274920,7 +281750,7 @@ static const UV PL_JT__D_invlist[] = { /* for all charsets */
        0x1807,
        0x1808,
        0x1820,
-       0x1878,
+       0x1879,
        0x1887,
        0x18A9,
        0x18AA,
@@ -274951,12 +281781,22 @@ static const UV PL_JT__D_invlist[] = { /* for all charsets */
        0x10B91,
        0x10BAD,
        0x10BAF,
+       0x10D01,
+       0x10D22,
+       0x10D23,
+       0x10D24,
+       0x10F30,
+       0x10F33,
+       0x10F34,
+       0x10F45,
+       0x10F51,
+       0x10F54,
        0x1E900,
        0x1E944
 };
 
-static const UV PL_JT__L_invlist[] = { /* for all charsets */
-       7,      /* Number of elements */
+static const UV UNI_JT__L_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -274966,11 +281806,13 @@ static const UV PL_JT__L_invlist[] = { /* for all charsets */
        0x10ACD,
        0x10ACE,
        0x10AD7,
-       0x10AD8
+       0x10AD8,
+       0x10D00,
+       0x10D01
 };
 
-static const UV PL_JT__R_invlist[] = { /* for all charsets */
-       107,    /* Number of elements */
+static const UV UNI_JT__R_invlist[] = {  /* for all charsets */
+       113,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -275080,13 +281922,19 @@ static const UV PL_JT__R_invlist[] = { /* for all charsets */
        0x10B91,
        0x10B92,
        0x10BA9,
-       0x10BAD
+       0x10BAD,
+       0x10D22,
+       0x10D23,
+       0x10F33,
+       0x10F34,
+       0x10F54,
+       0x10F55
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
-       627,    /* Number of elements */
+static const UV UNI_JT__T_invlist[] = {  /* for ASCII/Latin1 */
+       649,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -275133,6 +281981,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -275143,7 +281993,7 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -275169,6 +282019,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -275221,6 +282073,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -275459,6 +282313,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -275533,6 +282389,10 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -275543,8 +282403,6 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -275557,7 +282415,7 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -275573,7 +282431,7 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -275587,6 +282445,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -275623,9 +282483,11 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -275665,6 +282527,14 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -275726,8 +282596,8 @@ static const UV PL_JT__T_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
-       627,    /* Number of elements */
+static const UV UNI_JT__T_invlist[] = {  /* for EBCDIC 1047 */
+       649,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -275774,6 +282644,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -275784,7 +282656,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -275810,6 +282682,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -275862,6 +282736,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -276100,6 +282976,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -276174,6 +283052,10 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -276184,8 +283066,6 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -276198,7 +283078,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -276214,7 +283094,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -276228,6 +283108,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -276264,9 +283146,11 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -276306,6 +283190,14 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -276367,8 +283259,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
-       627,    /* Number of elements */
+static const UV UNI_JT__T_invlist[] = {  /* for EBCDIC 037 */
+       649,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -276415,6 +283307,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -276425,7 +283319,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -276451,6 +283345,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -276503,6 +283399,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -276741,6 +283639,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -276815,6 +283715,10 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -276825,8 +283729,6 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -276839,7 +283741,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -276855,7 +283757,7 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -276869,6 +283771,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -276905,9 +283809,11 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -276947,6 +283853,14 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -277005,8 +283919,8 @@ static const UV PL_JT__T_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
-       667,    /* Number of elements */
+static const UV UNI_JT__U_invlist[] = {  /* for ASCII/Latin1 */
+       691,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -277061,6 +283975,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x7F4,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -277085,7 +284001,7 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -277111,6 +284027,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -277163,6 +284081,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -277282,7 +284202,7 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x180A,
        0x180E,
        0x1820,
-       0x1878,
+       0x1879,
        0x1885,
        0x18AB,
        0x1920,
@@ -277405,6 +284325,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -277493,6 +284415,12 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x10B92,
        0x10BA9,
        0x10BAF,
+       0x10D00,
+       0x10D28,
+       0x10F30,
+       0x10F45,
+       0x10F46,
+       0x10F55,
        0x11001,
        0x11002,
        0x11038,
@@ -277503,8 +284431,6 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -277517,7 +284443,7 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -277533,7 +284459,7 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -277547,6 +284473,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -277583,9 +284511,11 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -277625,6 +284555,14 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -277686,8 +284624,8 @@ static const UV PL_JT__U_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
-       667,    /* Number of elements */
+static const UV UNI_JT__U_invlist[] = {  /* for EBCDIC 1047 */
+       691,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -277742,6 +284680,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x7F4,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -277766,7 +284706,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -277792,6 +284732,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -277844,6 +284786,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -277963,7 +284907,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x180A,
        0x180E,
        0x1820,
-       0x1878,
+       0x1879,
        0x1885,
        0x18AB,
        0x1920,
@@ -278086,6 +285030,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -278174,6 +285120,12 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x10B92,
        0x10BA9,
        0x10BAF,
+       0x10D00,
+       0x10D28,
+       0x10F30,
+       0x10F45,
+       0x10F46,
+       0x10F55,
        0x11001,
        0x11002,
        0x11038,
@@ -278184,8 +285136,6 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -278198,7 +285148,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -278214,7 +285164,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -278228,6 +285178,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -278264,9 +285216,11 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -278306,6 +285260,14 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -278367,8 +285329,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
-       667,    /* Number of elements */
+static const UV UNI_JT__U_invlist[] = {  /* for EBCDIC 037 */
+       691,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -278423,6 +285385,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x7F4,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -278447,7 +285411,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -278473,6 +285437,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -278525,6 +285491,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -278644,7 +285612,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x180A,
        0x180E,
        0x1820,
-       0x1878,
+       0x1879,
        0x1885,
        0x18AB,
        0x1920,
@@ -278767,6 +285735,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -278855,6 +285825,12 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x10B92,
        0x10BA9,
        0x10BAF,
+       0x10D00,
+       0x10D28,
+       0x10F30,
+       0x10F45,
+       0x10F46,
+       0x10F55,
        0x11001,
        0x11002,
        0x11038,
@@ -278865,8 +285841,6 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x110B7,
        0x110B9,
        0x110BB,
-       0x110BD,
-       0x110BE,
        0x11100,
        0x11103,
        0x11127,
@@ -278879,7 +285853,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -278895,7 +285869,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -278909,6 +285883,8 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -278945,9 +285921,11 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -278987,6 +285965,14 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -279043,7 +286029,7 @@ static const UV PL_JT__U_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_KALI_invlist[] = { /* for all charsets */
+static const UV UNI_KALI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279053,7 +286039,7 @@ static const UV PL_KALI_invlist[] = { /* for all charsets */
        0xA930
 };
 
-static const UV PL_KANA_invlist[] = { /* for all charsets */
+static const UV UNI_KANA_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279089,7 +286075,7 @@ static const UV PL_KANA_invlist[] = { /* for all charsets */
        0x1B001
 };
 
-static const UV PL_KANAEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_KANAEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279099,7 +286085,7 @@ static const UV PL_KANAEXTA_invlist[] = { /* for all charsets */
        0x1B130
 };
 
-static const UV PL_KANASUP_invlist[] = { /* for all charsets */
+static const UV UNI_KANASUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279109,7 +286095,7 @@ static const UV PL_KANASUP_invlist[] = { /* for all charsets */
        0x1B100
 };
 
-static const UV PL_KANBUN_invlist[] = { /* for all charsets */
+static const UV UNI_KANBUN_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279119,7 +286105,7 @@ static const UV PL_KANBUN_invlist[] = { /* for all charsets */
        0x31A0
 };
 
-static const UV PL_KANGXI_invlist[] = { /* for all charsets */
+static const UV UNI_KANGXI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279129,7 +286115,7 @@ static const UV PL_KANGXI_invlist[] = { /* for all charsets */
        0x2FE0
 };
 
-static const UV PL_KATAKANAEXT_invlist[] = { /* for all charsets */
+static const UV UNI_KATAKANAEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279139,7 +286125,7 @@ static const UV PL_KATAKANAEXT_invlist[] = { /* for all charsets */
        0x3200
 };
 
-static const UV PL_KHAR_invlist[] = { /* for all charsets */
+static const UV UNI_KHAR_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279154,16 +286140,16 @@ static const UV PL_KHAR_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59
 };
 
-static const UV PL_KHMERSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_KHMERSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279173,7 +286159,7 @@ static const UV PL_KHMERSYMBOLS_invlist[] = { /* for all charsets */
        0x1A00
 };
 
-static const UV PL_KHMR_invlist[] = { /* for all charsets */
+static const UV UNI_KHMR_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -279189,22 +286175,24 @@ static const UV PL_KHMR_invlist[] = { /* for all charsets */
        0x1A00
 };
 
-static const UV PL_KHOJ_invlist[] = { /* for all charsets */
-       7,      /* Number of elements */
+static const UV UNI_KHOJ_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xAE6,
        0xAF0,
+       0xA830,
+       0xA83A,
        0x11200,
        0x11212,
        0x11213,
        0x1123F
 };
 
-static const UV PL_KNDA_invlist[] = { /* for all charsets */
-       39,     /* Number of elements */
+static const UV UNI_KNDA_invlist[] = {  /* for all charsets */
+       41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -279214,8 +286202,6 @@ static const UV PL_KNDA_invlist[] = { /* for all charsets */
        0x964,
        0x966,
        0xC80,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -279241,16 +286227,20 @@ static const UV PL_KNDA_invlist[] = { /* for all charsets */
        0xCF0,
        0xCF1,
        0xCF3,
+       0x1CD0,
+       0x1CD1,
+       0x1CD2,
+       0x1CD3,
        0x1CDA,
        0x1CDB,
+       0x1CF4,
        0x1CF5,
-       0x1CF6,
        0xA830,
        0xA836
 };
 
-static const UV PL_KTHI_invlist[] = { /* for all charsets */
-       7,      /* Number of elements */
+static const UV UNI_KTHI_invlist[] = {  /* for all charsets */
+       9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -279260,13 +286250,15 @@ static const UV PL_KTHI_invlist[] = { /* for all charsets */
        0xA830,
        0xA83A,
        0x11080,
-       0x110C2
+       0x110C2,
+       0x110CD,
+       0x110CE
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
-       1171,   /* Number of elements */
+static const UV UNI_L_invlist[] = {  /* for ASCII/Latin1 */
+       1199,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -279321,11 +286313,11 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -279690,7 +286682,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -279733,6 +286725,10 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -279868,7 +286864,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -279878,7 +286874,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -279900,9 +286896,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -279920,7 +286914,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -280120,7 +287114,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -280143,6 +287137,14 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -280151,6 +287153,8 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -280218,7 +287222,9 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -280235,6 +287241,8 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -280253,6 +287261,16 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -280275,6 +287293,8 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -280284,7 +287304,7 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -280450,8 +287470,8 @@ static const UV PL_L_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
-       1197,   /* Number of elements */
+static const UV UNI_L_invlist[] = {  /* for EBCDIC 1047 */
+       1225,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -280532,11 +287552,11 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -280901,7 +287921,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -280944,6 +287964,10 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -281079,7 +288103,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -281089,7 +288113,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -281111,9 +288135,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -281131,7 +288153,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -281331,7 +288353,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -281354,6 +288376,14 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -281362,6 +288392,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -281429,7 +288461,9 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -281446,6 +288480,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -281464,6 +288500,16 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -281486,6 +288532,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -281495,7 +288543,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -281661,8 +288709,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
-       1193,   /* Number of elements */
+static const UV UNI_L_invlist[] = {  /* for EBCDIC 037 */
+       1221,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -281739,11 +288787,11 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -282108,7 +289156,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -282151,6 +289199,10 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -282286,7 +289338,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -282296,7 +289348,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -282318,9 +289370,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -282338,7 +289388,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -282538,7 +289588,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -282561,6 +289611,14 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -282569,6 +289627,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -282636,7 +289696,9 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -282653,6 +289715,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -282671,6 +289735,16 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -282693,6 +289767,8 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -282702,7 +289778,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -282863,7 +289939,7 @@ static const UV PL_L_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LANA_invlist[] = { /* for all charsets */
+static const UV UNI_LANA_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -282881,7 +289957,7 @@ static const UV PL_LANA_invlist[] = { /* for all charsets */
        0x1AAE
 };
 
-static const UV PL_LAO_invlist[] = { /* for all charsets */
+static const UV UNI_LAO_invlist[] = {  /* for all charsets */
        37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -282927,7 +290003,7 @@ static const UV PL_LAO_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LATIN1_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LATIN1_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -282944,7 +290020,7 @@ static const UV PL_LATIN1_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LATIN1_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LATIN1_invlist[] = {  /* for EBCDIC 1047 */
        55,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283013,7 +290089,7 @@ static const UV PL_LATIN1_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LATIN1_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LATIN1_invlist[] = {  /* for EBCDIC 037 */
        57,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283079,7 +290155,7 @@ static const UV PL_LATIN1_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LATINEXTA_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283089,7 +290165,7 @@ static const UV PL_LATINEXTA_invlist[] = { /* for all charsets */
        0x180
 };
 
-static const UV PL_LATINEXTADDITIONAL_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTADDITIONAL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283099,7 +290175,7 @@ static const UV PL_LATINEXTADDITIONAL_invlist[] = { /* for all charsets */
        0x1F00
 };
 
-static const UV PL_LATINEXTB_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283109,7 +290185,7 @@ static const UV PL_LATINEXTB_invlist[] = { /* for all charsets */
        0x250
 };
 
-static const UV PL_LATINEXTC_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283119,7 +290195,7 @@ static const UV PL_LATINEXTC_invlist[] = { /* for all charsets */
        0x2C80
 };
 
-static const UV PL_LATINEXTD_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTD_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283129,7 +290205,7 @@ static const UV PL_LATINEXTD_invlist[] = { /* for all charsets */
        0xA800
 };
 
-static const UV PL_LATINEXTE_invlist[] = { /* for all charsets */
+static const UV UNI_LATINEXTE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283141,8 +290217,8 @@ static const UV PL_LATINEXTE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LATN_invlist[] = { /* for ASCII/Latin1 */
-       75,     /* Number of elements */
+static const UV UNI_LATN_invlist[] = {  /* for ASCII/Latin1 */
+       73,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -283204,9 +290280,7 @@ static const UV PL_LATN_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA92E,
@@ -283230,8 +290304,8 @@ static const UV PL_LATN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LATN_invlist[] = { /* for EBCDIC 1047 */
-       101,    /* Number of elements */
+static const UV UNI_LATN_invlist[] = {  /* for EBCDIC 1047 */
+       99,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -283319,9 +290393,7 @@ static const UV PL_LATN_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA92E,
@@ -283345,8 +290417,8 @@ static const UV PL_LATN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LATN_invlist[] = { /* for EBCDIC 037 */
-       97,     /* Number of elements */
+static const UV UNI_LATN_invlist[] = {  /* for EBCDIC 037 */
+       95,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -283430,9 +290502,7 @@ static const UV PL_LATN_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xA92E,
@@ -283453,7 +290523,7 @@ static const UV PL_LATN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__AI_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__AI_invlist[] = {  /* for ASCII/Latin1 */
        219,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283686,7 +290756,7 @@ static const UV PL_LB__AI_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__AI_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__AI_invlist[] = {  /* for EBCDIC 1047 */
        225,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -283925,7 +290995,7 @@ static const UV PL_LB__AI_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__AI_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__AI_invlist[] = {  /* for EBCDIC 037 */
        225,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -284161,8 +291231,8 @@ static const UV PL_LB__AI_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
-       1443,   /* Number of elements */
+static const UV UNI_LB__AL_invlist[] = {  /* for ASCII/Latin1 */
+       1481,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -284226,9 +291296,7 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
+       0x589,
        0x58D,
        0x58F,
        0x5C0,
@@ -284353,6 +291421,8 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0xA5F,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA85,
        0xA8E,
        0xA8F,
@@ -284600,7 +291670,7 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x180A,
        0x180B,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -284641,7 +291711,9 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -284914,13 +291986,9 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -284973,6 +292041,10 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x2E3A,
        0x2E3F,
        0x2E40,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
        0x4DC0,
        0x4E00,
        0xA4D0,
@@ -284994,9 +292066,7 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0xA6F2,
        0xA6F3,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -285018,7 +292088,7 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -285184,9 +292254,9 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A58,
        0x10A59,
        0x10A60,
@@ -285214,9 +292284,15 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11003,
        0x11038,
        0x11049,
@@ -285227,10 +292303,14 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x110B0,
        0x110BB,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11174,
@@ -285243,8 +292323,6 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x111C5,
        0x111C7,
        0x111C8,
-       0x111C9,
-       0x111CA,
        0x111CD,
        0x111CE,
        0x111DA,
@@ -285315,6 +292393,10 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -285337,6 +292419,8 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -285357,6 +292441,18 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -285395,6 +292491,10 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E97,
+       0x16E99,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -285429,10 +292529,12 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -285491,6 +292593,12 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x1E8D0,
        0x1E900,
        0x1E944,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -285560,7 +292668,7 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
        0x1EEF0,
        0x1EEF2,
        0x1F12E,
-       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F39C,
@@ -285618,8 +292726,8 @@ static const UV PL_LB__AL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
-       1471,   /* Number of elements */
+static const UV UNI_LB__AL_invlist[] = {  /* for EBCDIC 1047 */
+       1509,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -285711,9 +292819,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
+       0x589,
        0x58D,
        0x58F,
        0x5C0,
@@ -285838,6 +292944,8 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0xA5F,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA85,
        0xA8E,
        0xA8F,
@@ -286085,7 +293193,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x180A,
        0x180B,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -286126,7 +293234,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -286399,13 +293509,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -286458,6 +293564,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x2E3A,
        0x2E3F,
        0x2E40,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
        0x4DC0,
        0x4E00,
        0xA4D0,
@@ -286479,9 +293589,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0xA6F2,
        0xA6F3,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -286503,7 +293611,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -286669,9 +293777,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A58,
        0x10A59,
        0x10A60,
@@ -286699,9 +293807,15 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11003,
        0x11038,
        0x11049,
@@ -286712,10 +293826,14 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x110B0,
        0x110BB,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11174,
@@ -286728,8 +293846,6 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x111C5,
        0x111C7,
        0x111C8,
-       0x111C9,
-       0x111CA,
        0x111CD,
        0x111CE,
        0x111DA,
@@ -286800,6 +293916,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -286822,6 +293942,8 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -286842,6 +293964,18 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -286880,6 +294014,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E97,
+       0x16E99,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -286914,10 +294052,12 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -286976,6 +294116,12 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x1E8D0,
        0x1E900,
        0x1E944,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -287045,7 +294191,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
        0x1EEF0,
        0x1EEF2,
        0x1F12E,
-       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F39C,
@@ -287103,8 +294249,8 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
-       1467,   /* Number of elements */
+static const UV UNI_LB__AL_invlist[] = {  /* for EBCDIC 037 */
+       1505,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -287192,9 +294338,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
+       0x589,
        0x58D,
        0x58F,
        0x5C0,
@@ -287319,6 +294463,8 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0xA5F,
        0xA72,
        0xA75,
+       0xA76,
+       0xA77,
        0xA85,
        0xA8E,
        0xA8F,
@@ -287566,7 +294712,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x180A,
        0x180B,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -287607,7 +294753,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD3,
        0x1CD4,
@@ -287880,13 +295028,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -287939,6 +295083,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x2E3A,
        0x2E3F,
        0x2E40,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
        0x4DC0,
        0x4E00,
        0xA4D0,
@@ -287960,9 +295108,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0xA6F2,
        0xA6F3,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -287984,7 +295130,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0xA8F2,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -288150,9 +295296,9 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A58,
        0x10A59,
        0x10A60,
@@ -288180,9 +295326,15 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D24,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F46,
+       0x10F51,
+       0x10F5A,
        0x11003,
        0x11038,
        0x11049,
@@ -288193,10 +295345,14 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x110B0,
        0x110BB,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11174,
@@ -288209,8 +295365,6 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x111C5,
        0x111C7,
        0x111C8,
-       0x111C9,
-       0x111CA,
        0x111CD,
        0x111CE,
        0x111DA,
@@ -288281,6 +295435,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
+       0x1183B,
+       0x1183C,
        0x118A0,
        0x118E0,
        0x118EA,
@@ -288303,6 +295461,8 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -288323,6 +295483,18 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
+       0x11EF7,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -288361,6 +295533,10 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E97,
+       0x16E99,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -288395,10 +295571,12 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x1D242,
        0x1D245,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -288457,6 +295635,12 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x1E8D0,
        0x1E900,
        0x1E944,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -288526,7 +295710,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
        0x1EEF0,
        0x1EEF2,
        0x1F12E,
-       0x1F12F,
+       0x1F130,
        0x1F16A,
        0x1F16C,
        0x1F39C,
@@ -288579,7 +295763,7 @@ static const UV PL_LB__AL_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__B2_invlist[] = { /* for all charsets */
+static const UV UNI_LB__B2_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -288593,8 +295777,8 @@ static const UV PL_LB__B2_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__BA_invlist[] = { /* for ASCII/Latin1 */
-       185,    /* Number of elements */
+static const UV UNI_LB__BA_invlist[] = {  /* for ASCII/Latin1 */
+       191,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -288692,7 +295876,11 @@ static const UV PL_LB__BA_invlist[] = { /* for ASCII/Latin1 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3000,
        0x3001,
        0xA4FE,
@@ -288779,6 +295967,8 @@ static const UV PL_LB__BA_invlist[] = { /* for ASCII/Latin1 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -288792,8 +295982,8 @@ static const UV PL_LB__BA_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 1047 */
-       185,    /* Number of elements */
+static const UV UNI_LB__BA_invlist[] = {  /* for EBCDIC 1047 */
+       191,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -288891,7 +296081,11 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 1047 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3000,
        0x3001,
        0xA4FE,
@@ -288978,6 +296172,8 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 1047 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -288991,8 +296187,8 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 037 */
-       185,    /* Number of elements */
+static const UV UNI_LB__BA_invlist[] = {  /* for EBCDIC 037 */
+       191,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -289090,7 +296286,11 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 037 */
        0x2E40,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4B,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3000,
        0x3001,
        0xA4FE,
@@ -289177,6 +296377,8 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 037 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -289187,8 +296389,8 @@ static const UV PL_LB__BA_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__BB_invlist[] = { /* for ASCII/Latin1 */
-       43,     /* Number of elements */
+static const UV UNI_LB__BB_invlist[] = {  /* for ASCII/Latin1 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -289201,6 +296403,8 @@ static const UV PL_LB__BB_invlist[] = { /* for ASCII/Latin1 */
        0x2CD,
        0x2DF,
        0x2E0,
+       0xC84,
+       0xC85,
        0xF01,
        0xF05,
        0xF06,
@@ -289244,8 +296448,8 @@ static const UV PL_LB__BB_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 1047 */
-       43,     /* Number of elements */
+static const UV UNI_LB__BB_invlist[] = {  /* for EBCDIC 1047 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -289258,6 +296462,8 @@ static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 1047 */
        0x2CD,
        0x2DF,
        0x2E0,
+       0xC84,
+       0xC85,
        0xF01,
        0xF05,
        0xF06,
@@ -289301,8 +296507,8 @@ static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 037 */
-       43,     /* Number of elements */
+static const UV UNI_LB__BB_invlist[] = {  /* for EBCDIC 037 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -289315,6 +296521,8 @@ static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 037 */
        0x2CD,
        0x2DF,
        0x2E0,
+       0xC84,
+       0xC85,
        0xF01,
        0xF05,
        0xF06,
@@ -289355,7 +296563,7 @@ static const UV PL_LB__BB_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__BK_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__BK_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289374,7 +296582,7 @@ static const UV PL_LB__BK_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BK_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__BK_invlist[] = {  /* for EBCDIC 1047 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289393,7 +296601,7 @@ static const UV PL_LB__BK_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__BK_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__BK_invlist[] = {  /* for EBCDIC 037 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289407,7 +296615,7 @@ static const UV PL_LB__BK_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__CB_invlist[] = { /* for all charsets */
+static const UV UNI_LB__CB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289417,7 +296625,7 @@ static const UV PL_LB__CB_invlist[] = { /* for all charsets */
        0xFFFD
 };
 
-static const UV PL_LB__CJ_invlist[] = { /* for all charsets */
+static const UV UNI_LB__CJ_invlist[] = {  /* for all charsets */
        51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289477,7 +296685,7 @@ static const UV PL_LB__CJ_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__CL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__CL_invlist[] = {  /* for ASCII/Latin1 */
        165,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289656,7 +296864,7 @@ static const UV PL_LB__CL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__CL_invlist[] = {  /* for EBCDIC 1047 */
        165,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -289835,7 +297043,7 @@ static const UV PL_LB__CL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__CL_invlist[] = {  /* for EBCDIC 037 */
        165,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -290011,8 +297219,8 @@ static const UV PL_LB__CL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
-       502,    /* Number of elements */
+static const UV UNI_LB__CM_invlist[] = {  /* for ASCII/Latin1 */
+       526,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -290066,6 +297274,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -290076,7 +297286,7 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -290102,6 +297312,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -290157,7 +297369,7 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -290328,6 +297540,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -290376,6 +297590,10 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -290388,13 +297606,15 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -290404,7 +297624,7 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -290422,6 +297642,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -290434,6 +297656,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x11641,
        0x116AB,
        0x116B8,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -290464,6 +297688,14 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -290527,8 +297759,8 @@ static const UV PL_LB__CM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
-       506,    /* Number of elements */
+static const UV UNI_LB__CM_invlist[] = {  /* for EBCDIC 1047 */
+       530,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -290586,6 +297818,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -290596,7 +297830,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -290622,6 +297856,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -290677,7 +297913,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -290848,6 +298084,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -290896,6 +298134,10 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -290908,13 +298150,15 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -290924,7 +298168,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -290942,6 +298186,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -290954,6 +298200,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x11641,
        0x116AB,
        0x116B8,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -290984,6 +298232,14 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -291047,8 +298303,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
-       506,    /* Number of elements */
+static const UV UNI_LB__CM_invlist[] = {  /* for EBCDIC 037 */
+       530,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -291106,6 +298362,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -291116,7 +298374,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -291142,6 +298400,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -291197,7 +298457,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -291368,6 +298628,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -291416,6 +298678,10 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -291428,13 +298694,15 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -291444,7 +298712,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -291462,6 +298730,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -291474,6 +298744,8 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x11641,
        0x116AB,
        0x116B8,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -291504,6 +298776,14 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -291564,7 +298844,7 @@ static const UV PL_LB__CM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__CP_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__CP_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291583,7 +298863,7 @@ static const UV PL_LB__CP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CP_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__CP_invlist[] = {  /* for EBCDIC 1047 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291602,7 +298882,7 @@ static const UV PL_LB__CP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CP_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__CP_invlist[] = {  /* for EBCDIC 037 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291618,7 +298898,7 @@ static const UV PL_LB__CP_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__CR_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__CR_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291635,7 +298915,7 @@ static const UV PL_LB__CR_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CR_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__CR_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291652,7 +298932,7 @@ static const UV PL_LB__CR_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__CR_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__CR_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291664,8 +298944,8 @@ static const UV PL_LB__CR_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__EB_invlist[] = { /* for all charsets */
-       65,     /* Number of elements */
+static const UV UNI_LB__EB_invlist[] = {  /* for all charsets */
+       69,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -291732,11 +299012,15 @@ static const UV PL_LB__EB_invlist[] = { /* for all charsets */
        0x1F93A,
        0x1F93D,
        0x1F93F,
+       0x1F9B5,
+       0x1F9B7,
+       0x1F9B8,
+       0x1F9BA,
        0x1F9D1,
        0x1F9DE
 };
 
-static const UV PL_LB__EM_invlist[] = { /* for all charsets */
+static const UV UNI_LB__EM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291748,7 +299032,7 @@ static const UV PL_LB__EM_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__EX_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__EX_invlist[] = {  /* for ASCII/Latin1 */
        49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291811,7 +299095,7 @@ static const UV PL_LB__EX_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__EX_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__EX_invlist[] = {  /* for EBCDIC 1047 */
        49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291874,7 +299158,7 @@ static const UV PL_LB__EX_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__EX_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__EX_invlist[] = {  /* for EBCDIC 037 */
        49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291934,7 +299218,7 @@ static const UV PL_LB__EX_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__GL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__GL_invlist[] = {  /* for ASCII/Latin1 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -291971,7 +299255,7 @@ static const UV PL_LB__GL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__GL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__GL_invlist[] = {  /* for EBCDIC 1047 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -292008,7 +299292,7 @@ static const UV PL_LB__GL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__GL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__GL_invlist[] = {  /* for EBCDIC 037 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -292040,7 +299324,7 @@ static const UV PL_LB__GL_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__H2_invlist[] = { /* for all charsets */
+static const UV UNI_LB__H2_invlist[] = {  /* for all charsets */
        799,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -292846,7 +300130,7 @@ static const UV PL_LB__H2_invlist[] = { /* for all charsets */
        0xD789
 };
 
-static const UV PL_LB__H3_invlist[] = { /* for all charsets */
+static const UV UNI_LB__H3_invlist[] = {  /* for all charsets */
        799,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -293652,7 +300936,7 @@ static const UV PL_LB__H3_invlist[] = { /* for all charsets */
        0xD7A4
 };
 
-static const UV PL_LB__HL_invlist[] = { /* for all charsets */
+static const UV UNI_LB__HL_invlist[] = {  /* for all charsets */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -293660,7 +300944,7 @@ static const UV PL_LB__HL_invlist[] = { /* for all charsets */
        0x0,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0xFB1D,
        0xFB1E,
@@ -293682,7 +300966,7 @@ static const UV PL_LB__HL_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__HY_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__HY_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -293699,7 +300983,7 @@ static const UV PL_LB__HY_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__HY_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__HY_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -293716,7 +301000,7 @@ static const UV PL_LB__HY_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__HY_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__HY_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -293728,8 +301012,8 @@ static const UV PL_LB__HY_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__ID_invlist[] = { /* for all charsets */
-       321,    /* Number of elements */
+static const UV UNI_LB__ID_invlist[] = {  /* for all charsets */
+       323,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -293851,7 +301135,7 @@ static const UV PL_LB__ID_invlist[] = { /* for all charsets */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -293929,7 +301213,7 @@ static const UV PL_LB__ID_invlist[] = { /* for all charsets */
        0xFFE2,
        0xFFE5,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -293940,8 +301224,6 @@ static const UV PL_LB__ID_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -294047,6 +301329,10 @@ static const UV PL_LB__ID_invlist[] = { /* for all charsets */
        0x1F93A,
        0x1F93D,
        0x1F93F,
+       0x1F9B5,
+       0x1F9B7,
+       0x1F9B8,
+       0x1F9BA,
        0x1F9D1,
        0x1F9DE,
        0x1FFFE,
@@ -294056,7 +301342,7 @@ static const UV PL_LB__ID_invlist[] = { /* for all charsets */
        0x3FFFE
 };
 
-static const UV PL_LB__IN_invlist[] = { /* for all charsets */
+static const UV UNI_LB__IN_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294074,7 +301360,7 @@ static const UV PL_LB__IN_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__IS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__IS_invlist[] = {  /* for ASCII/Latin1 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294109,7 +301395,7 @@ static const UV PL_LB__IS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__IS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__IS_invlist[] = {  /* for EBCDIC 1047 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294146,7 +301432,7 @@ static const UV PL_LB__IS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__IS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__IS_invlist[] = {  /* for EBCDIC 037 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294180,7 +301466,7 @@ static const UV PL_LB__IS_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__LF_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__LF_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294197,7 +301483,7 @@ static const UV PL_LB__LF_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__LF_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__LF_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294214,7 +301500,7 @@ static const UV PL_LB__LF_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__LF_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__LF_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294228,7 +301514,7 @@ static const UV PL_LB__LF_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__NL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__NL_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294245,7 +301531,7 @@ static const UV PL_LB__NL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__NL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__NL_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294262,7 +301548,7 @@ static const UV PL_LB__NL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__NL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__NL_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294274,7 +301560,7 @@ static const UV PL_LB__NL_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__NS_invlist[] = { /* for all charsets */
+static const UV UNI_LB__NS_invlist[] = {  /* for all charsets */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294318,8 +301604,8 @@ static const UV PL_LB__NS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__NU_invlist[] = { /* for ASCII/Latin1 */
-       111,    /* Number of elements */
+static const UV UNI_LB__NU_invlist[] = {  /* for ASCII/Latin1 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -294400,6 +301686,8 @@ static const UV PL_LB__NU_invlist[] = { /* for ASCII/Latin1 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -294426,6 +301714,8 @@ static const UV PL_LB__NU_invlist[] = { /* for ASCII/Latin1 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -294443,8 +301733,8 @@ static const UV PL_LB__NU_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 1047 */
-       111,    /* Number of elements */
+static const UV UNI_LB__NU_invlist[] = {  /* for EBCDIC 1047 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -294525,6 +301815,8 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 1047 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -294551,6 +301843,8 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 1047 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -294568,8 +301862,8 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 037 */
-       111,    /* Number of elements */
+static const UV UNI_LB__NU_invlist[] = {  /* for EBCDIC 037 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -294650,6 +301944,8 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 037 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -294676,6 +301972,8 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 037 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -294690,7 +301988,7 @@ static const UV PL_LB__NU_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__OP_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__OP_invlist[] = {  /* for ASCII/Latin1 */
        169,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -294873,7 +302171,7 @@ static const UV PL_LB__OP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__OP_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__OP_invlist[] = {  /* for EBCDIC 1047 */
        167,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295054,7 +302352,7 @@ static const UV PL_LB__OP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__OP_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__OP_invlist[] = {  /* for EBCDIC 037 */
        167,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295232,8 +302530,8 @@ static const UV PL_LB__OP_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__PO_invlist[] = { /* for ASCII/Latin1 */
-       41,     /* Number of elements */
+static const UV UNI_LB__PO_invlist[] = {  /* for ASCII/Latin1 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295277,7 +302575,11 @@ static const UV PL_LB__PO_invlist[] = { /* for ASCII/Latin1 */
        0xFF05,
        0xFF06,
        0xFFE0,
-       0xFFE1
+       0xFFE1,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -295287,8 +302589,8 @@ static const UV PL_LB__PO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__PO_invlist[] = { /* for EBCDIC 1047 */
-       41,     /* Number of elements */
+static const UV UNI_LB__PO_invlist[] = {  /* for EBCDIC 1047 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295332,7 +302634,11 @@ static const UV PL_LB__PO_invlist[] = { /* for EBCDIC 1047 */
        0xFF05,
        0xFF06,
        0xFFE0,
-       0xFFE1
+       0xFFE1,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -295342,8 +302648,8 @@ static const UV PL_LB__PO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__PO_invlist[] = { /* for EBCDIC 037 */
-       41,     /* Number of elements */
+static const UV UNI_LB__PO_invlist[] = {  /* for EBCDIC 037 */
+       45,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295387,15 +302693,19 @@ static const UV PL_LB__PO_invlist[] = { /* for EBCDIC 037 */
        0xFF05,
        0xFF06,
        0xFFE0,
-       0xFFE1
+       0xFFE1,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__PR_invlist[] = { /* for ASCII/Latin1 */
-       45,     /* Number of elements */
+static const UV UNI_LB__PR_invlist[] = {  /* for ASCII/Latin1 */
+       47,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295412,6 +302722,8 @@ static const UV PL_LB__PR_invlist[] = { /* for ASCII/Latin1 */
        0xB2,
        0x58F,
        0x590,
+       0x7FE,
+       0x800,
        0x9FB,
        0x9FC,
        0xAF1,
@@ -295453,8 +302765,8 @@ static const UV PL_LB__PR_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 1047 */
-       47,     /* Number of elements */
+static const UV UNI_LB__PR_invlist[] = {  /* for EBCDIC 1047 */
+       49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295473,6 +302785,8 @@ static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 1047 */
        0xE1,
        0x58F,
        0x590,
+       0x7FE,
+       0x800,
        0x9FB,
        0x9FC,
        0xAF1,
@@ -295514,8 +302828,8 @@ static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 037 */
-       47,     /* Number of elements */
+static const UV UNI_LB__PR_invlist[] = {  /* for EBCDIC 037 */
+       49,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295534,6 +302848,8 @@ static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 037 */
        0xE1,
        0x58F,
        0x590,
+       0x7FE,
+       0x800,
        0x9FB,
        0x9FC,
        0xAF1,
@@ -295572,7 +302888,7 @@ static const UV PL_LB__PR_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__QU_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__QU_invlist[] = {  /* for ASCII/Latin1 */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295613,7 +302929,7 @@ static const UV PL_LB__QU_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__QU_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__QU_invlist[] = {  /* for EBCDIC 1047 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295652,7 +302968,7 @@ static const UV PL_LB__QU_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__QU_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__QU_invlist[] = {  /* for EBCDIC 037 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295686,7 +303002,7 @@ static const UV PL_LB__QU_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__SA_invlist[] = { /* for all charsets */
+static const UV UNI_LB__SA_invlist[] = {  /* for all charsets */
        85,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295769,7 +303085,7 @@ static const UV PL_LB__SA_invlist[] = { /* for all charsets */
        0xAADB,
        0xAAE0,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x1173A,
@@ -295778,7 +303094,7 @@ static const UV PL_LB__SA_invlist[] = { /* for all charsets */
        0x11740
 };
 
-static const UV PL_LB__SG_invlist[] = { /* for all charsets */
+static const UV UNI_LB__SG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295790,7 +303106,7 @@ static const UV PL_LB__SG_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__SP_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__SP_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295807,7 +303123,7 @@ static const UV PL_LB__SP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__SP_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__SP_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295824,7 +303140,7 @@ static const UV PL_LB__SP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__SP_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__SP_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295838,7 +303154,7 @@ static const UV PL_LB__SP_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LB__SY_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_LB__SY_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295855,7 +303171,7 @@ static const UV PL_LB__SY_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__SY_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_LB__SY_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295872,7 +303188,7 @@ static const UV PL_LB__SY_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LB__SY_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_LB__SY_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295884,7 +303200,7 @@ static const UV PL_LB__SY_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LB__WJ_invlist[] = { /* for all charsets */
+static const UV UNI_LB__WJ_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -295896,8 +303212,8 @@ static const UV PL_LB__WJ_invlist[] = { /* for all charsets */
        0xFF00
 };
 
-static const UV PL_LB__XX_invlist[] = { /* for all charsets */
-       1216,   /* Number of elements */
+static const UV UNI_LB__XX_invlist[] = {  /* for all charsets */
+       1230,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -295916,10 +303232,6 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -295927,7 +303239,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -295939,7 +303251,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -295953,7 +303265,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -295980,7 +303292,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -296012,7 +303324,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -296102,8 +303414,6 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -296126,8 +303436,6 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -296320,7 +303628,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -296369,7 +303677,9 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -296428,13 +303738,9 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -296470,7 +303776,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -296486,7 +303792,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -296506,9 +303812,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -296520,8 +303824,6 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -296722,11 +304024,11 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -296754,15 +304056,23 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -296770,7 +304080,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -296811,7 +304121,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -296832,7 +304142,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -296852,11 +304162,13 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -296866,8 +304178,6 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -296899,6 +304209,20 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -296933,6 +304257,8 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -296942,7 +304268,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -296967,10 +304293,12 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -297037,6 +304365,8 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -297119,7 +304449,7 @@ static const UV PL_LB__XX_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_LB__ZW_invlist[] = { /* for all charsets */
+static const UV UNI_LB__ZW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297129,7 +304459,7 @@ static const UV PL_LB__ZW_invlist[] = { /* for all charsets */
        0x200C
 };
 
-static const UV PL_LB__ZWJ_invlist[] = { /* for all charsets */
+static const UV UNI_LB__ZWJ_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297139,7 +304469,7 @@ static const UV PL_LB__ZWJ_invlist[] = { /* for all charsets */
        0x200E
 };
 
-static const UV PL_LEPC_invlist[] = { /* for all charsets */
+static const UV UNI_LEPC_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297153,7 +304483,7 @@ static const UV PL_LEPC_invlist[] = { /* for all charsets */
        0x1C50
 };
 
-static const UV PL_LETTERLIKESYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_LETTERLIKESYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297163,7 +304493,7 @@ static const UV PL_LETTERLIKESYMBOLS_invlist[] = { /* for all charsets */
        0x2150
 };
 
-static const UV PL_LIMB_invlist[] = { /* for all charsets */
+static const UV UNI_LIMB_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297183,7 +304513,7 @@ static const UV PL_LIMB_invlist[] = { /* for all charsets */
        0x1950
 };
 
-static const UV PL_LINA_invlist[] = { /* for all charsets */
+static const UV UNI_LINA_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297199,7 +304529,7 @@ static const UV PL_LINA_invlist[] = { /* for all charsets */
        0x10768
 };
 
-static const UV PL_LINB_invlist[] = { /* for all charsets */
+static const UV UNI_LINB_invlist[] = {  /* for all charsets */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297227,7 +304557,7 @@ static const UV PL_LINB_invlist[] = { /* for all charsets */
        0x10140
 };
 
-static const UV PL_LINEARBIDEOGRAMS_invlist[] = { /* for all charsets */
+static const UV UNI_LINEARBIDEOGRAMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297237,7 +304567,7 @@ static const UV PL_LINEARBIDEOGRAMS_invlist[] = { /* for all charsets */
        0x10100
 };
 
-static const UV PL_LINEARBSYLLABARY_invlist[] = { /* for all charsets */
+static const UV UNI_LINEARBSYLLABARY_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297247,7 +304577,7 @@ static const UV PL_LINEARBSYLLABARY_invlist[] = { /* for all charsets */
        0x10080
 };
 
-static const UV PL_LISU_invlist[] = { /* for all charsets */
+static const UV UNI_LISU_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297257,7 +304587,7 @@ static const UV PL_LISU_invlist[] = { /* for all charsets */
        0xA500
 };
 
-static const UV PL_LM_invlist[] = { /* for all charsets */
+static const UV UNI_LM_invlist[] = {  /* for all charsets */
        115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -297381,8 +304711,8 @@ static const UV PL_LM_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
-       919,    /* Number of elements */
+static const UV UNI_LO_invlist[] = {  /* for ASCII/Latin1 */
+       941,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -297399,7 +304729,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x295,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x640,
@@ -297677,9 +305007,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x1082,
        0x108E,
        0x108F,
-       0x10D0,
-       0x10FB,
-       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -297742,7 +305070,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x1820,
        0x1843,
        0x1844,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -297822,7 +305150,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -297832,7 +305160,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA015,
        0xA016,
@@ -297870,7 +305198,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -298058,7 +305386,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -298077,6 +305405,14 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x10B92,
        0x10C00,
        0x10C49,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -298085,6 +305421,8 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -298152,7 +305490,9 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118FF,
        0x11900,
        0x11A00,
@@ -298167,6 +305507,8 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -298185,6 +305527,16 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -298210,7 +305562,7 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
        0x16F50,
        0x16F51,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -298314,8 +305666,8 @@ static const UV PL_LO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
-       917,    /* Number of elements */
+static const UV UNI_LO_invlist[] = {  /* for EBCDIC 1047 */
+       939,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -298330,7 +305682,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x295,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x640,
@@ -298608,9 +305960,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x1082,
        0x108E,
        0x108F,
-       0x10D0,
-       0x10FB,
-       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -298673,7 +306023,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x1820,
        0x1843,
        0x1844,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -298753,7 +306103,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -298763,7 +306113,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA015,
        0xA016,
@@ -298801,7 +306151,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -298989,7 +306339,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -299008,6 +306358,14 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x10B92,
        0x10C00,
        0x10C49,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -299016,6 +306374,8 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -299083,7 +306443,9 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118FF,
        0x11900,
        0x11A00,
@@ -299098,6 +306460,8 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -299116,6 +306480,16 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -299141,7 +306515,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
        0x16F50,
        0x16F51,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -299245,8 +306619,8 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
-       917,    /* Number of elements */
+static const UV UNI_LO_invlist[] = {  /* for EBCDIC 037 */
+       939,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -299261,7 +306635,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x295,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x640,
@@ -299539,9 +306913,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x1082,
        0x108E,
        0x108F,
-       0x10D0,
-       0x10FB,
-       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -299604,7 +306976,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x1820,
        0x1843,
        0x1844,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -299684,7 +307056,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x30FF,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -299694,7 +307066,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA015,
        0xA016,
@@ -299732,7 +307104,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -299920,7 +307292,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -299939,6 +307311,14 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x10B92,
        0x10C00,
        0x10C49,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -299947,6 +307327,8 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -300014,7 +307396,9 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118FF,
        0x11900,
        0x11A00,
@@ -300029,6 +307413,8 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -300047,6 +307433,16 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12480,
@@ -300072,7 +307468,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
        0x16F50,
        0x16F51,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -300171,7 +307567,7 @@ static const UV PL_LO_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_LOE_invlist[] = { /* for all charsets */
+static const UV UNI_LOE_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300193,7 +307589,7 @@ static const UV PL_LOE_invlist[] = { /* for all charsets */
        0xAABD
 };
 
-static const UV PL_LOWSURROGATES_invlist[] = { /* for all charsets */
+static const UV UNI_LOWSURROGATES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300203,7 +307599,7 @@ static const UV PL_LOWSURROGATES_invlist[] = { /* for all charsets */
        0xE000
 };
 
-static const UV PL_LYCI_invlist[] = { /* for all charsets */
+static const UV UNI_LYCI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300213,7 +307609,7 @@ static const UV PL_LYCI_invlist[] = { /* for all charsets */
        0x1029D
 };
 
-static const UV PL_LYDI_invlist[] = { /* for all charsets */
+static const UV UNI_LYDI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300225,8 +307621,8 @@ static const UV PL_LYDI_invlist[] = { /* for all charsets */
        0x10940
 };
 
-static const UV PL_M_invlist[] = { /* for all charsets */
-       527,    /* Number of elements */
+static const UV UNI_M_invlist[] = {  /* for all charsets */
+       551,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -300267,6 +307663,8 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -300277,7 +307675,7 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -300303,6 +307701,8 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -300358,7 +307758,7 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -300557,6 +307957,8 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -300617,6 +308019,10 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -300629,13 +308035,15 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -300645,7 +308053,7 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -300663,6 +308071,8 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -300677,6 +308087,8 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x116B8,
        0x1171D,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -300707,6 +308119,14 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -300759,7 +308179,7 @@ static const UV PL_M_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_MAHJ_invlist[] = { /* for all charsets */
+static const UV UNI_MAHJ_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300773,7 +308193,7 @@ static const UV PL_MAHJ_invlist[] = { /* for all charsets */
        0x11177
 };
 
-static const UV PL_MAHJONG_invlist[] = { /* for all charsets */
+static const UV UNI_MAHJONG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300783,7 +308203,17 @@ static const UV PL_MAHJONG_invlist[] = { /* for all charsets */
        0x1F030
 };
 
-static const UV PL_MAND_invlist[] = { /* for all charsets */
+static const UV UNI_MAKA_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11EE0,
+       0x11EF9
+};
+
+static const UV UNI_MAND_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300797,7 +308227,7 @@ static const UV PL_MAND_invlist[] = { /* for all charsets */
        0x85F
 };
 
-static const UV PL_MANI_invlist[] = { /* for all charsets */
+static const UV UNI_MANI_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300811,7 +308241,7 @@ static const UV PL_MANI_invlist[] = { /* for all charsets */
        0x10AF7
 };
 
-static const UV PL_MARC_invlist[] = { /* for all charsets */
+static const UV UNI_MARC_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -300827,7 +308257,7 @@ static const UV PL_MARC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_MATH_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_MATH_invlist[] = {  /* for ASCII/Latin1 */
        277,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -301118,7 +308548,7 @@ static const UV PL_MATH_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_MATH_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_MATH_invlist[] = {  /* for EBCDIC 1047 */
        279,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -301411,7 +308841,7 @@ static const UV PL_MATH_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_MATH_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_MATH_invlist[] = {  /* for EBCDIC 037 */
        279,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -301699,7 +309129,7 @@ static const UV PL_MATH_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_MATHALPHANUM_invlist[] = { /* for all charsets */
+static const UV UNI_MATHALPHANUM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -301709,7 +309139,7 @@ static const UV PL_MATHALPHANUM_invlist[] = { /* for all charsets */
        0x1D800
 };
 
-static const UV PL_MATHOPERATORS_invlist[] = { /* for all charsets */
+static const UV UNI_MATHOPERATORS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -301719,8 +309149,18 @@ static const UV PL_MATHOPERATORS_invlist[] = { /* for all charsets */
        0x2300
 };
 
-static const UV PL_MC_invlist[] = { /* for all charsets */
-       321,    /* Number of elements */
+static const UV UNI_MAYANNUMERALS_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1D2E0,
+       0x1D300
+};
+
+static const UV UNI_MC_invlist[] = {  /* for all charsets */
+       333,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -301957,6 +309397,8 @@ static const UV PL_MC_invlist[] = { /* for all charsets */
        0x110B9,
        0x1112C,
        0x1112D,
+       0x11145,
+       0x11147,
        0x11182,
        0x11183,
        0x111B3,
@@ -302021,8 +309463,10 @@ static const UV PL_MC_invlist[] = { /* for all charsets */
        0x11722,
        0x11726,
        0x11727,
-       0x11A07,
-       0x11A09,
+       0x1182C,
+       0x1182F,
+       0x11838,
+       0x11839,
        0x11A39,
        0x11A3A,
        0x11A57,
@@ -302039,6 +309483,14 @@ static const UV PL_MC_invlist[] = { /* for all charsets */
        0x11CB2,
        0x11CB4,
        0x11CB5,
+       0x11D8A,
+       0x11D8F,
+       0x11D93,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11EF5,
+       0x11EF7,
        0x16F51,
        0x16F7F,
        0x1D165,
@@ -302047,7 +309499,7 @@ static const UV PL_MC_invlist[] = { /* for all charsets */
        0x1D173
 };
 
-static const UV PL_ME_invlist[] = { /* for all charsets */
+static const UV UNI_ME_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302065,7 +309517,17 @@ static const UV PL_ME_invlist[] = { /* for all charsets */
        0xA673
 };
 
-static const UV PL_MEETEIMAYEKEXT_invlist[] = { /* for all charsets */
+static const UV UNI_MEDF_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x16E40,
+       0x16E9B
+};
+
+static const UV UNI_MEETEIMAYEKEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302075,7 +309537,7 @@ static const UV PL_MEETEIMAYEKEXT_invlist[] = { /* for all charsets */
        0xAB00
 };
 
-static const UV PL_MEND_invlist[] = { /* for all charsets */
+static const UV UNI_MEND_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302087,7 +309549,7 @@ static const UV PL_MEND_invlist[] = { /* for all charsets */
        0x1E8D7
 };
 
-static const UV PL_MERC_invlist[] = { /* for all charsets */
+static const UV UNI_MERC_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302101,7 +309563,7 @@ static const UV PL_MERC_invlist[] = { /* for all charsets */
        0x10A00
 };
 
-static const UV PL_MERO_invlist[] = { /* for all charsets */
+static const UV UNI_MERO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302111,7 +309573,7 @@ static const UV PL_MERO_invlist[] = { /* for all charsets */
        0x109A0
 };
 
-static const UV PL_MIAO_invlist[] = { /* for all charsets */
+static const UV UNI_MIAO_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302125,7 +309587,7 @@ static const UV PL_MIAO_invlist[] = { /* for all charsets */
        0x16FA0
 };
 
-static const UV PL_MISCARROWS_invlist[] = { /* for all charsets */
+static const UV UNI_MISCARROWS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302135,7 +309597,7 @@ static const UV PL_MISCARROWS_invlist[] = { /* for all charsets */
        0x2C00
 };
 
-static const UV PL_MISCMATHSYMBOLSA_invlist[] = { /* for all charsets */
+static const UV UNI_MISCMATHSYMBOLSA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302145,7 +309607,7 @@ static const UV PL_MISCMATHSYMBOLSA_invlist[] = { /* for all charsets */
        0x27F0
 };
 
-static const UV PL_MISCMATHSYMBOLSB_invlist[] = { /* for all charsets */
+static const UV UNI_MISCMATHSYMBOLSB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302155,7 +309617,7 @@ static const UV PL_MISCMATHSYMBOLSB_invlist[] = { /* for all charsets */
        0x2A00
 };
 
-static const UV PL_MISCPICTOGRAPHS_invlist[] = { /* for all charsets */
+static const UV UNI_MISCPICTOGRAPHS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302165,7 +309627,7 @@ static const UV PL_MISCPICTOGRAPHS_invlist[] = { /* for all charsets */
        0x1F600
 };
 
-static const UV PL_MISCSYMBOLS_invlist[] = { /* for all charsets */
+static const UV UNI_MISCSYMBOLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302175,7 +309637,7 @@ static const UV PL_MISCSYMBOLS_invlist[] = { /* for all charsets */
        0x2700
 };
 
-static const UV PL_MISCTECHNICAL_invlist[] = { /* for all charsets */
+static const UV UNI_MISCTECHNICAL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302185,8 +309647,8 @@ static const UV PL_MISCTECHNICAL_invlist[] = { /* for all charsets */
        0x2400
 };
 
-static const UV PL_MLYM_invlist[] = { /* for all charsets */
-       23,     /* Number of elements */
+static const UV UNI_MLYM_invlist[] = {  /* for all charsets */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -302212,11 +309674,13 @@ static const UV PL_MLYM_invlist[] = { /* for all charsets */
        0xD66,
        0xD80,
        0x1CDA,
-       0x1CDB
+       0x1CDB,
+       0xA830,
+       0xA833
 };
 
-static const UV PL_MN_invlist[] = { /* for all charsets */
-       603,    /* Number of elements */
+static const UV UNI_MN_invlist[] = {  /* for all charsets */
+       627,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -302257,6 +309721,8 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -302267,7 +309733,7 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x903,
@@ -302293,6 +309759,8 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x9CE,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA03,
        0xA3C,
@@ -302345,6 +309813,8 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0xBCE,
        0xC00,
        0xC01,
+       0xC04,
+       0xC05,
        0xC3E,
        0xC41,
        0xC46,
@@ -302577,6 +310047,8 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -302647,6 +310119,10 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11001,
        0x11002,
        0x11038,
@@ -302669,7 +310145,7 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x11182,
        0x111B6,
        0x111BF,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122F,
        0x11232,
@@ -302685,7 +310161,7 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11302,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x11340,
        0x11341,
@@ -302699,6 +310175,8 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x11445,
        0x11446,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B3,
        0x114B9,
        0x114BA,
@@ -302735,9 +310213,11 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x11726,
        0x11727,
        0x1172C,
+       0x1182F,
+       0x11838,
+       0x11839,
+       0x1183B,
        0x11A01,
-       0x11A07,
-       0x11A09,
        0x11A0B,
        0x11A33,
        0x11A39,
@@ -302777,6 +310257,14 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D90,
+       0x11D92,
+       0x11D95,
+       0x11D96,
+       0x11D97,
+       0x11D98,
+       0x11EF3,
+       0x11EF5,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -302825,7 +310313,7 @@ static const UV PL_MN_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_MODI_invlist[] = { /* for all charsets */
+static const UV UNI_MODI_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302839,7 +310327,7 @@ static const UV PL_MODI_invlist[] = { /* for all charsets */
        0x1165A
 };
 
-static const UV PL_MODIFIERLETTERS_invlist[] = { /* for all charsets */
+static const UV UNI_MODIFIERLETTERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302849,7 +310337,7 @@ static const UV PL_MODIFIERLETTERS_invlist[] = { /* for all charsets */
        0x300
 };
 
-static const UV PL_MODIFIERTONELETTERS_invlist[] = { /* for all charsets */
+static const UV UNI_MODIFIERTONELETTERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302859,7 +310347,7 @@ static const UV PL_MODIFIERTONELETTERS_invlist[] = { /* for all charsets */
        0xA720
 };
 
-static const UV PL_MONG_invlist[] = { /* for all charsets */
+static const UV UNI_MONG_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302870,14 +310358,14 @@ static const UV PL_MONG_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x11660,
        0x1166D
 };
 
-static const UV PL_MONGOLIANSUP_invlist[] = { /* for all charsets */
+static const UV UNI_MONGOLIANSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302887,7 +310375,7 @@ static const UV PL_MONGOLIANSUP_invlist[] = { /* for all charsets */
        0x11680
 };
 
-static const UV PL_MRO_invlist[] = { /* for all charsets */
+static const UV UNI_MRO_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302901,7 +310389,7 @@ static const UV PL_MRO_invlist[] = { /* for all charsets */
        0x16A70
 };
 
-static const UV PL_MTEI_invlist[] = { /* for all charsets */
+static const UV UNI_MTEI_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302915,7 +310403,7 @@ static const UV PL_MTEI_invlist[] = { /* for all charsets */
        0xABFA
 };
 
-static const UV PL_MULT_invlist[] = { /* for all charsets */
+static const UV UNI_MULT_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302935,7 +310423,7 @@ static const UV PL_MULT_invlist[] = { /* for all charsets */
        0x112AA
 };
 
-static const UV PL_MUSIC_invlist[] = { /* for all charsets */
+static const UV UNI_MUSIC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302945,7 +310433,7 @@ static const UV PL_MUSIC_invlist[] = { /* for all charsets */
        0x1D200
 };
 
-static const UV PL_MYANMAREXTA_invlist[] = { /* for all charsets */
+static const UV UNI_MYANMAREXTA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302955,7 +310443,7 @@ static const UV PL_MYANMAREXTA_invlist[] = { /* for all charsets */
        0xAA80
 };
 
-static const UV PL_MYANMAREXTB_invlist[] = { /* for all charsets */
+static const UV UNI_MYANMAREXTB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302965,7 +310453,7 @@ static const UV PL_MYANMAREXTB_invlist[] = { /* for all charsets */
        0xAA00
 };
 
-static const UV PL_MYMR_invlist[] = { /* for all charsets */
+static const UV UNI_MYMR_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -302983,8 +310471,8 @@ static const UV PL_MYMR_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
-       233,    /* Number of elements */
+static const UV UNI_N_invlist[] = {  /* for ASCII/Latin1 */
+       251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -303158,7 +310646,7 @@ static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -303173,8 +310661,14 @@ static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -303203,6 +310697,8 @@ static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -303211,14 +310707,24 @@ static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
@@ -303230,8 +310736,8 @@ static const UV PL_N_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
-       233,    /* Number of elements */
+static const UV UNI_N_invlist[] = {  /* for EBCDIC 1047 */
+       251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -303405,7 +310911,7 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -303420,8 +310926,14 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -303450,6 +310962,8 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -303458,14 +310972,24 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
@@ -303477,8 +311001,8 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_N_invlist[] = { /* for EBCDIC 037 */
-       233,    /* Number of elements */
+static const UV UNI_N_invlist[] = {  /* for EBCDIC 037 */
+       251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -303652,7 +311176,7 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 037 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -303667,8 +311191,14 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 037 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -303697,6 +311227,8 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 037 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -303705,21 +311237,31 @@ static const UV PL_N_invlist[] = { /* for EBCDIC 037 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NARB_invlist[] = { /* for all charsets */
+static const UV UNI_NARB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -303729,16 +311271,14 @@ static const UV PL_NARB_invlist[] = { /* for all charsets */
        0x10AA0
 };
 
-static const UV PL_NB_invlist[] = { /* for all charsets */
-       96,     /* Number of elements */
+static const UV UNI_NB_invlist[] = {  /* for all charsets */
+       104,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x870,
        0x8A0,
-       0x1C90,
-       0x1CC0,
        0x2FE0,
        0x2FF0,
        0x10200,
@@ -303759,9 +311299,11 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x10C00,
        0x10C50,
        0x10C80,
-       0x10D00,
+       0x10D40,
        0x10E60,
        0x10E80,
+       0x10F00,
+       0x10F70,
        0x11000,
        0x11250,
        0x11280,
@@ -303772,6 +311314,8 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x116D0,
        0x11700,
        0x11740,
+       0x11800,
+       0x11850,
        0x118A0,
        0x11900,
        0x11A00,
@@ -303781,7 +311325,9 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x11C00,
        0x11CC0,
        0x11D00,
-       0x11D60,
+       0x11DB0,
+       0x11EE0,
+       0x11F00,
        0x12000,
        0x12550,
        0x13000,
@@ -303792,6 +311338,8 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x16A70,
        0x16AD0,
        0x16B90,
+       0x16E40,
+       0x16EA0,
        0x16F00,
        0x16FA0,
        0x16FE0,
@@ -303804,7 +311352,7 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x1BCB0,
        0x1D000,
        0x1D250,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D400,
        0x1DAB0,
@@ -303814,10 +311362,12 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x1E8E0,
        0x1E900,
        0x1E960,
+       0x1EC70,
+       0x1ECC0,
        0x1EE00,
        0x1EF00,
        0x1F000,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2A6E0,
        0x2A700,
@@ -303832,7 +311382,7 @@ static const UV PL_NB_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_NBAT_invlist[] = { /* for all charsets */
+static const UV UNI_NBAT_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -303844,7 +311394,7 @@ static const UV PL_NBAT_invlist[] = { /* for all charsets */
        0x108B0
 };
 
-static const UV PL_NEWA_invlist[] = { /* for all charsets */
+static const UV UNI_NEWA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -303855,10 +311405,10 @@ static const UV PL_NEWA_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E
+       0x1145F
 };
 
-static const UV PL_NFCQC__M_invlist[] = { /* for all charsets */
+static const UV UNI_NFCQC__M_invlist[] = {  /* for all charsets */
        83,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -303948,7 +311498,7 @@ static const UV PL_NFCQC__M_invlist[] = { /* for all charsets */
        0x115B0
 };
 
-static const UV PL_NFCQC__Y_invlist[] = { /* for all charsets */
+static const UV UNI_NFCQC__Y_invlist[] = {  /* for all charsets */
        223,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -304180,7 +311730,7 @@ static const UV PL_NFCQC__Y_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NFDQC__Y_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_NFDQC__Y_invlist[] = {  /* for ASCII/Latin1 */
        463,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -304657,7 +312207,7 @@ static const UV PL_NFDQC__Y_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFDQC__Y_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_NFDQC__Y_invlist[] = {  /* for EBCDIC 1047 */
        467,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -305138,7 +312688,7 @@ static const UV PL_NFDQC__Y_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFDQC__Y_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_NFDQC__Y_invlist[] = {  /* for EBCDIC 037 */
        467,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -305616,7 +313166,7 @@ static const UV PL_NFDQC__Y_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NFKCQC__N_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_NFKCQC__N_invlist[] = {  /* for ASCII/Latin1 */
        499,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -306129,7 +313679,7 @@ static const UV PL_NFKCQC__N_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKCQC__N_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_NFKCQC__N_invlist[] = {  /* for EBCDIC 1047 */
        505,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -306648,7 +314198,7 @@ static const UV PL_NFKCQC__N_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKCQC__N_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_NFKCQC__N_invlist[] = {  /* for EBCDIC 037 */
        503,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -307162,7 +314712,7 @@ static const UV PL_NFKCQC__N_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NFKCQC__Y_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_NFKCQC__Y_invlist[] = {  /* for ASCII/Latin1 */
        573,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -307749,7 +315299,7 @@ static const UV PL_NFKCQC__Y_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKCQC__Y_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_NFKCQC__Y_invlist[] = {  /* for EBCDIC 1047 */
        579,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -308342,7 +315892,7 @@ static const UV PL_NFKCQC__Y_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKCQC__Y_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_NFKCQC__Y_invlist[] = {  /* for EBCDIC 037 */
        577,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -308930,7 +316480,7 @@ static const UV PL_NFKCQC__Y_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NFKDQC__N_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_NFKDQC__N_invlist[] = {  /* for ASCII/Latin1 */
        781,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -309725,7 +317275,7 @@ static const UV PL_NFKDQC__N_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKDQC__N_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_NFKDQC__N_invlist[] = {  /* for EBCDIC 1047 */
        779,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -310518,7 +318068,7 @@ static const UV PL_NFKDQC__N_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NFKDQC__N_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_NFKDQC__N_invlist[] = {  /* for EBCDIC 037 */
        781,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311308,17 +318858,19 @@ static const UV PL_NFKDQC__N_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NKO_invlist[] = { /* for all charsets */
-       3,      /* Number of elements */
+static const UV UNI_NKO_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x7C0,
-       0x7FB
+       0x7FB,
+       0x7FD,
+       0x800
 };
 
-static const UV PL_NL_invlist[] = { /* for all charsets */
+static const UV UNI_NL_invlist[] = {  /* for all charsets */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311352,8 +318904,8 @@ static const UV PL_NL_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NO_invlist[] = { /* for ASCII/Latin1 */
-       121,    /* Number of elements */
+static const UV UNI_NO_invlist[] = {  /* for ASCII/Latin1 */
+       135,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -311443,7 +318995,7 @@ static const UV PL_NO_invlist[] = { /* for ASCII/Latin1 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -311460,6 +319012,10 @@ static const UV PL_NO_invlist[] = { /* for ASCII/Latin1 */
        0x10D00,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11066,
        0x111E1,
@@ -311472,10 +319028,20 @@ static const UV PL_NO_invlist[] = { /* for ASCII/Latin1 */
        0x11C6D,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
@@ -311487,8 +319053,8 @@ static const UV PL_NO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NO_invlist[] = { /* for EBCDIC 1047 */
-       123,    /* Number of elements */
+static const UV UNI_NO_invlist[] = {  /* for EBCDIC 1047 */
+       137,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -311580,7 +319146,7 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 1047 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -311597,6 +319163,10 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 1047 */
        0x10D00,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11066,
        0x111E1,
@@ -311609,10 +319179,20 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 1047 */
        0x11C6D,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
@@ -311624,8 +319204,8 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NO_invlist[] = { /* for EBCDIC 037 */
-       123,    /* Number of elements */
+static const UV UNI_NO_invlist[] = {  /* for EBCDIC 037 */
+       137,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -311717,7 +319297,7 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 037 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -311734,6 +319314,10 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 037 */
        0x10D00,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11066,
        0x111E1,
@@ -311746,17 +319330,27 @@ static const UV PL_NO_invlist[] = { /* for EBCDIC 037 */
        0x11C6D,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NSHU_invlist[] = { /* for all charsets */
+static const UV UNI_NSHU_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311770,7 +319364,7 @@ static const UV PL_NSHU_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NT__DI_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_NT__DI_invlist[] = {  /* for ASCII/Latin1 */
        41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311825,7 +319419,7 @@ static const UV PL_NT__DI_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NT__DI_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_NT__DI_invlist[] = {  /* for EBCDIC 1047 */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311882,7 +319476,7 @@ static const UV PL_NT__DI_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NT__DI_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_NT__DI_invlist[] = {  /* for EBCDIC 037 */
        43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -311936,8 +319530,8 @@ static const UV PL_NT__DI_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NT__NU_invlist[] = { /* for ASCII/Latin1 */
-       281,    /* Number of elements */
+static const UV UNI_NT__NU_invlist[] = {  /* for ASCII/Latin1 */
+       295,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -312153,7 +319747,7 @@ static const UV PL_NT__NU_invlist[] = { /* for ASCII/Latin1 */
        0x109D2,
        0x10A00,
        0x10A44,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -312170,6 +319764,10 @@ static const UV PL_NT__NU_invlist[] = { /* for ASCII/Latin1 */
        0x10D00,
        0x10E69,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x1105B,
        0x11066,
        0x111E1,
@@ -312184,10 +319782,20 @@ static const UV PL_NT__NU_invlist[] = { /* for ASCII/Latin1 */
        0x1246F,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F10B,
        0x1F10D,
        0x20001,
@@ -312231,8 +319839,8 @@ static const UV PL_NT__NU_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 1047 */
-       281,    /* Number of elements */
+static const UV UNI_NT__NU_invlist[] = {  /* for EBCDIC 1047 */
+       295,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -312448,7 +320056,7 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 1047 */
        0x109D2,
        0x10A00,
        0x10A44,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -312465,6 +320073,10 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 1047 */
        0x10D00,
        0x10E69,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x1105B,
        0x11066,
        0x111E1,
@@ -312479,10 +320091,20 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 1047 */
        0x1246F,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F10B,
        0x1F10D,
        0x20001,
@@ -312526,8 +320148,8 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 037 */
-       281,    /* Number of elements */
+static const UV UNI_NT__NU_invlist[] = {  /* for EBCDIC 037 */
+       295,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -312743,7 +320365,7 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 037 */
        0x109D2,
        0x10A00,
        0x10A44,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -312760,6 +320382,10 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 037 */
        0x10D00,
        0x10E69,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x1105B,
        0x11066,
        0x111E1,
@@ -312774,10 +320400,20 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 037 */
        0x1246F,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1E8C7,
        0x1E8D0,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F10B,
        0x1F10D,
        0x20001,
@@ -312816,7 +320452,7 @@ static const UV PL_NT__NU_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NUMBERFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_NUMBERFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -312826,7 +320462,7 @@ static const UV PL_NUMBERFORMS_invlist[] = { /* for all charsets */
        0x2190
 };
 
-static const UV PL_NV___MINUS_1_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV___MINUS_1_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -312838,8 +320474,8 @@ static const UV PL_NV___MINUS_1_SLASH_2_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__0_invlist[] = { /* for ASCII/Latin1 */
-       147,    /* Number of elements */
+static const UV UNI_NV__0_invlist[] = {  /* for ASCII/Latin1 */
+       155,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -312944,6 +320580,8 @@ static const UV PL_NV__0_invlist[] = { /* for ASCII/Latin1 */
        0x1018B,
        0x104A0,
        0x104A1,
+       0x10D30,
+       0x10D31,
        0x11066,
        0x11067,
        0x110F0,
@@ -312970,10 +320608,16 @@ static const UV PL_NV__0_invlist[] = { /* for ASCII/Latin1 */
        0x11C51,
        0x11D50,
        0x11D51,
+       0x11DA0,
+       0x11DA1,
        0x16A60,
        0x16A61,
        0x16B50,
        0x16B51,
+       0x16E80,
+       0x16E81,
+       0x1D2E0,
+       0x1D2E1,
        0x1D7CE,
        0x1D7CF,
        0x1D7D8,
@@ -312999,8 +320643,8 @@ static const UV PL_NV__0_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__0_invlist[] = { /* for EBCDIC 1047 */
-       147,    /* Number of elements */
+static const UV UNI_NV__0_invlist[] = {  /* for EBCDIC 1047 */
+       155,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -313105,6 +320749,8 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 1047 */
        0x1018B,
        0x104A0,
        0x104A1,
+       0x10D30,
+       0x10D31,
        0x11066,
        0x11067,
        0x110F0,
@@ -313131,10 +320777,16 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 1047 */
        0x11C51,
        0x11D50,
        0x11D51,
+       0x11DA0,
+       0x11DA1,
        0x16A60,
        0x16A61,
        0x16B50,
        0x16B51,
+       0x16E80,
+       0x16E81,
+       0x1D2E0,
+       0x1D2E1,
        0x1D7CE,
        0x1D7CF,
        0x1D7D8,
@@ -313160,8 +320812,8 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__0_invlist[] = { /* for EBCDIC 037 */
-       147,    /* Number of elements */
+static const UV UNI_NV__0_invlist[] = {  /* for EBCDIC 037 */
+       155,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -313266,6 +320918,8 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 037 */
        0x1018B,
        0x104A0,
        0x104A1,
+       0x10D30,
+       0x10D31,
        0x11066,
        0x11067,
        0x110F0,
@@ -313292,10 +320946,16 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 037 */
        0x11C51,
        0x11D50,
        0x11D51,
+       0x11DA0,
+       0x11DA1,
        0x16A60,
        0x16A61,
        0x16B50,
        0x16B51,
+       0x16E80,
+       0x16E81,
+       0x1D2E0,
+       0x1D2E1,
        0x1D7CE,
        0x1D7CF,
        0x1D7D8,
@@ -313318,8 +320978,8 @@ static const UV PL_NV__0_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
-       239,    /* Number of elements */
+static const UV UNI_NV__1_invlist[] = {  /* for ASCII/Latin1 */
+       263,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -313492,8 +321152,14 @@ static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
        0x10BAA,
        0x10CFA,
        0x10CFB,
+       0x10D31,
+       0x10D32,
        0x10E60,
        0x10E61,
+       0x10F1D,
+       0x10F1E,
+       0x10F51,
+       0x10F52,
        0x11052,
        0x11053,
        0x11067,
@@ -313526,6 +321192,8 @@ static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
        0x11C5B,
        0x11D51,
        0x11D52,
+       0x11DA1,
+       0x11DA2,
        0x12415,
        0x12416,
        0x1241E,
@@ -313542,8 +321210,18 @@ static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
        0x16A62,
        0x16B51,
        0x16B52,
+       0x16E81,
+       0x16E82,
+       0x16E94,
+       0x16E95,
+       0x1D2E1,
+       0x1D2E2,
        0x1D360,
        0x1D361,
+       0x1D372,
+       0x1D373,
+       0x1D377,
+       0x1D378,
        0x1D7CF,
        0x1D7D0,
        0x1D7D9,
@@ -313558,6 +321236,12 @@ static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
        0x1E8C8,
        0x1E951,
        0x1E952,
+       0x1EC71,
+       0x1EC72,
+       0x1ECA3,
+       0x1ECA4,
+       0x1ECB1,
+       0x1ECB2,
        0x1F102,
        0x1F103,
        0x2092A,
@@ -313571,8 +321255,8 @@ static const UV PL_NV__1_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
-       239,    /* Number of elements */
+static const UV UNI_NV__1_invlist[] = {  /* for EBCDIC 1047 */
+       263,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -313745,8 +321429,14 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
        0x10BAA,
        0x10CFA,
        0x10CFB,
+       0x10D31,
+       0x10D32,
        0x10E60,
        0x10E61,
+       0x10F1D,
+       0x10F1E,
+       0x10F51,
+       0x10F52,
        0x11052,
        0x11053,
        0x11067,
@@ -313779,6 +321469,8 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
        0x11C5B,
        0x11D51,
        0x11D52,
+       0x11DA1,
+       0x11DA2,
        0x12415,
        0x12416,
        0x1241E,
@@ -313795,8 +321487,18 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
        0x16A62,
        0x16B51,
        0x16B52,
+       0x16E81,
+       0x16E82,
+       0x16E94,
+       0x16E95,
+       0x1D2E1,
+       0x1D2E2,
        0x1D360,
        0x1D361,
+       0x1D372,
+       0x1D373,
+       0x1D377,
+       0x1D378,
        0x1D7CF,
        0x1D7D0,
        0x1D7D9,
@@ -313811,6 +321513,12 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
        0x1E8C8,
        0x1E951,
        0x1E952,
+       0x1EC71,
+       0x1EC72,
+       0x1ECA3,
+       0x1ECA4,
+       0x1ECB1,
+       0x1ECB2,
        0x1F102,
        0x1F103,
        0x2092A,
@@ -313824,8 +321532,8 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
-       239,    /* Number of elements */
+static const UV UNI_NV__1_invlist[] = {  /* for EBCDIC 037 */
+       263,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -313998,8 +321706,14 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
        0x10BAA,
        0x10CFA,
        0x10CFB,
+       0x10D31,
+       0x10D32,
        0x10E60,
        0x10E61,
+       0x10F1D,
+       0x10F1E,
+       0x10F51,
+       0x10F52,
        0x11052,
        0x11053,
        0x11067,
@@ -314032,6 +321746,8 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
        0x11C5B,
        0x11D51,
        0x11D52,
+       0x11DA1,
+       0x11DA2,
        0x12415,
        0x12416,
        0x1241E,
@@ -314048,8 +321764,18 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
        0x16A62,
        0x16B51,
        0x16B52,
+       0x16E81,
+       0x16E82,
+       0x16E94,
+       0x16E95,
+       0x1D2E1,
+       0x1D2E2,
        0x1D360,
        0x1D361,
+       0x1D372,
+       0x1D373,
+       0x1D377,
+       0x1D378,
        0x1D7CF,
        0x1D7D0,
        0x1D7D9,
@@ -314064,6 +321790,12 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
        0x1E8C8,
        0x1E951,
        0x1E952,
+       0x1EC71,
+       0x1EC72,
+       0x1ECA3,
+       0x1ECA4,
+       0x1ECB1,
+       0x1ECB2,
        0x1F102,
        0x1F103,
        0x2092A,
@@ -314072,7 +321804,7 @@ static const UV PL_NV__1_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__1_SLASH_10_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_10_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314084,7 +321816,7 @@ static const UV PL_NV__1_SLASH_10_invlist[] = { /* for all charsets */
        0x2153
 };
 
-static const UV PL_NV__1_SLASH_12_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_12_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314094,7 +321826,7 @@ static const UV PL_NV__1_SLASH_12_invlist[] = { /* for all charsets */
        0x109F7
 };
 
-static const UV PL_NV__1_SLASH_16_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_16_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314110,7 +321842,7 @@ static const UV PL_NV__1_SLASH_16_invlist[] = { /* for all charsets */
        0xA834
 };
 
-static const UV PL_NV__1_SLASH_160_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_160_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314122,8 +321854,8 @@ static const UV PL_NV__1_SLASH_160_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__1_SLASH_2_invlist[] = { /* for ASCII/Latin1 */
-       25,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_2_invlist[] = {  /* for ASCII/Latin1 */
+       31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314148,10 +321880,16 @@ static const UV PL_NV__1_SLASH_2_invlist[] = { /* for ASCII/Latin1 */
        0x109BE,
        0x109FB,
        0x109FC,
+       0x10A48,
+       0x10A49,
        0x10E7B,
        0x10E7C,
+       0x10F26,
+       0x10F27,
        0x12464,
-       0x12465
+       0x12465,
+       0x1ECAE,
+       0x1ECAF
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -314161,8 +321899,8 @@ static const UV PL_NV__1_SLASH_2_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 1047 */
-       25,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_2_invlist[] = {  /* for EBCDIC 1047 */
+       31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314187,10 +321925,16 @@ static const UV PL_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 1047 */
        0x109BE,
        0x109FB,
        0x109FC,
+       0x10A48,
+       0x10A49,
        0x10E7B,
        0x10E7C,
+       0x10F26,
+       0x10F27,
        0x12464,
-       0x12465
+       0x12465,
+       0x1ECAE,
+       0x1ECAF
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -314200,8 +321944,8 @@ static const UV PL_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 037 */
-       25,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_2_invlist[] = {  /* for EBCDIC 037 */
+       31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314226,15 +321970,21 @@ static const UV PL_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 037 */
        0x109BE,
        0x109FB,
        0x109FC,
+       0x10A48,
+       0x10A49,
        0x10E7B,
        0x10E7C,
+       0x10F26,
+       0x10F27,
        0x12464,
-       0x12465
+       0x12465,
+       0x1ECAE,
+       0x1ECAF
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__1_SLASH_20_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_20_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314244,7 +321994,7 @@ static const UV PL_NV__1_SLASH_20_invlist[] = { /* for all charsets */
        0xD5C
 };
 
-static const UV PL_NV__1_SLASH_3_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_3_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314266,8 +322016,8 @@ static const UV PL_NV__1_SLASH_3_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__1_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
-       23,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_4_invlist[] = {  /* for ASCII/Latin1 */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314293,7 +322043,9 @@ static const UV PL_NV__1_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
        0x12460,
        0x12461,
        0x12462,
-       0x12464
+       0x12464,
+       0x1ECAD,
+       0x1ECAE
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -314303,8 +322055,8 @@ static const UV PL_NV__1_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
-       23,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_4_invlist[] = {  /* for EBCDIC 1047 */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314330,7 +322082,9 @@ static const UV PL_NV__1_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
        0x12460,
        0x12461,
        0x12462,
-       0x12464
+       0x12464,
+       0x1ECAD,
+       0x1ECAE
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -314340,8 +322094,8 @@ static const UV PL_NV__1_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__1_SLASH_4_invlist[] = { /* for EBCDIC 037 */
-       23,     /* Number of elements */
+static const UV UNI_NV__1_SLASH_4_invlist[] = {  /* for EBCDIC 037 */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314367,12 +322121,14 @@ static const UV PL_NV__1_SLASH_4_invlist[] = { /* for EBCDIC 037 */
        0x12460,
        0x12461,
        0x12462,
-       0x12464
+       0x12464,
+       0x1ECAD,
+       0x1ECAE
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__1_SLASH_40_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_40_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314382,7 +322138,7 @@ static const UV PL_NV__1_SLASH_40_invlist[] = { /* for all charsets */
        0xD5A
 };
 
-static const UV PL_NV__1_SLASH_5_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_5_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314394,7 +322150,7 @@ static const UV PL_NV__1_SLASH_5_invlist[] = { /* for all charsets */
        0x2156
 };
 
-static const UV PL_NV__1_SLASH_6_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_6_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314408,7 +322164,7 @@ static const UV PL_NV__1_SLASH_6_invlist[] = { /* for all charsets */
        0x12462
 };
 
-static const UV PL_NV__1_SLASH_7_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_7_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314418,7 +322174,7 @@ static const UV PL_NV__1_SLASH_7_invlist[] = { /* for all charsets */
        0x2151
 };
 
-static const UV PL_NV__1_SLASH_8_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_8_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314438,7 +322194,7 @@ static const UV PL_NV__1_SLASH_8_invlist[] = { /* for all charsets */
        0x12460
 };
 
-static const UV PL_NV__1_SLASH_9_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1_SLASH_9_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314448,8 +322204,8 @@ static const UV PL_NV__1_SLASH_9_invlist[] = { /* for all charsets */
        0x2152
 };
 
-static const UV PL_NV__10_invlist[] = { /* for all charsets */
-       101,    /* Number of elements */
+static const UV UNI_NV__10_invlist[] = {  /* for all charsets */
+       111,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314540,6 +322296,10 @@ static const UV PL_NV__10_invlist[] = { /* for all charsets */
        0x10CFD,
        0x10E69,
        0x10E6A,
+       0x10F22,
+       0x10F23,
+       0x10F52,
+       0x10F53,
        0x1105B,
        0x1105C,
        0x111EA,
@@ -314552,12 +322312,18 @@ static const UV PL_NV__10_invlist[] = { /* for all charsets */
        0x11C64,
        0x16B5B,
        0x16B5C,
+       0x16E8A,
+       0x16E8B,
+       0x1D2EA,
+       0x1D2EB,
        0x1D369,
-       0x1D36A
+       0x1D36A,
+       0x1EC7A,
+       0x1EC7B
 };
 
-static const UV PL_NV__100_invlist[] = { /* for all charsets */
-       61,     /* Number of elements */
+static const UV UNI_NV__100_invlist[] = {  /* for all charsets */
+       67,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314614,6 +322380,10 @@ static const UV PL_NV__100_invlist[] = { /* for all charsets */
        0x10CFF,
        0x10E72,
        0x10E73,
+       0x10F25,
+       0x10F26,
+       0x10F54,
+       0x10F55,
        0x11064,
        0x11065,
        0x111F3,
@@ -314621,11 +322391,13 @@ static const UV PL_NV__100_invlist[] = { /* for all charsets */
        0x11C6C,
        0x11C6D,
        0x16B5C,
-       0x16B5D
+       0x16B5D,
+       0x1EC83,
+       0x1EC84
 };
 
-static const UV PL_NV__1000_invlist[] = { /* for all charsets */
-       39,     /* Number of elements */
+static const UV UNI_NV__1000_invlist[] = {  /* for all charsets */
+       41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314667,11 +322439,13 @@ static const UV PL_NV__1000_invlist[] = { /* for all charsets */
        0x11065,
        0x11066,
        0x111F4,
-       0x111F5
+       0x111F5,
+       0x1EC8C,
+       0x1EC8D
 };
 
-static const UV PL_NV__10000_invlist[] = { /* for all charsets */
-       19,     /* Number of elements */
+static const UV UNI_NV__10000_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314693,11 +322467,15 @@ static const UV PL_NV__10000_invlist[] = { /* for all charsets */
        0x109E4,
        0x109E5,
        0x16B5D,
-       0x16B5E
+       0x16B5E,
+       0x1EC95,
+       0x1EC96,
+       0x1ECB3,
+       0x1ECB4
 };
 
-static const UV PL_NV__100000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__100000_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314705,10 +322483,16 @@ static const UV PL_NV__100000_invlist[] = { /* for all charsets */
        0x2188,
        0x2189,
        0x109ED,
-       0x109EE
+       0x109EE,
+       0x1EC9E,
+       0x1EC9F,
+       0x1ECA0,
+       0x1ECA1,
+       0x1ECB4,
+       0x1ECB5
 };
 
-static const UV PL_NV__1000000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1000000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314718,7 +322502,17 @@ static const UV PL_NV__1000000_invlist[] = { /* for all charsets */
        0x16B5F
 };
 
-static const UV PL_NV__100000000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__10000000_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1ECA1,
+       0x1ECA2
+};
+
+static const UV UNI_NV__100000000_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314732,7 +322526,7 @@ static const UV PL_NV__100000000_invlist[] = { /* for all charsets */
        0x16B60
 };
 
-static const UV PL_NV__10000000000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__10000000000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314742,7 +322536,7 @@ static const UV PL_NV__10000000000_invlist[] = { /* for all charsets */
        0x16B61
 };
 
-static const UV PL_NV__1000000000000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__1000000000000_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314754,8 +322548,8 @@ static const UV PL_NV__1000000000000_invlist[] = { /* for all charsets */
        0x16B62
 };
 
-static const UV PL_NV__11_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_NV__11_invlist[] = {  /* for all charsets */
+       17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314771,10 +322565,14 @@ static const UV PL_NV__11_invlist[] = { /* for all charsets */
        0x2492,
        0x2493,
        0x24EB,
-       0x24EC
+       0x24EC,
+       0x16E8B,
+       0x16E8C,
+       0x1D2EB,
+       0x1D2EC
 };
 
-static const UV PL_NV__11_SLASH_12_invlist[] = { /* for all charsets */
+static const UV UNI_NV__11_SLASH_12_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314784,7 +322582,7 @@ static const UV PL_NV__11_SLASH_12_invlist[] = { /* for all charsets */
        0x109BD
 };
 
-static const UV PL_NV__11_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__11_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314794,8 +322592,8 @@ static const UV PL_NV__11_SLASH_2_invlist[] = { /* for all charsets */
        0xF30
 };
 
-static const UV PL_NV__12_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_NV__12_invlist[] = {  /* for all charsets */
+       17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314811,11 +322609,15 @@ static const UV PL_NV__12_invlist[] = { /* for all charsets */
        0x2493,
        0x2494,
        0x24EC,
-       0x24ED
+       0x24ED,
+       0x16E8C,
+       0x16E8D,
+       0x1D2EC,
+       0x1D2ED
 };
 
-static const UV PL_NV__13_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__13_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314827,10 +322629,14 @@ static const UV PL_NV__13_invlist[] = { /* for all charsets */
        0x2494,
        0x2495,
        0x24ED,
-       0x24EE
+       0x24EE,
+       0x16E8D,
+       0x16E8E,
+       0x1D2ED,
+       0x1D2EE
 };
 
-static const UV PL_NV__13_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__13_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314840,8 +322646,8 @@ static const UV PL_NV__13_SLASH_2_invlist[] = { /* for all charsets */
        0xF31
 };
 
-static const UV PL_NV__14_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__14_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314853,11 +322659,15 @@ static const UV PL_NV__14_invlist[] = { /* for all charsets */
        0x2495,
        0x2496,
        0x24EE,
-       0x24EF
+       0x24EF,
+       0x16E8E,
+       0x16E8F,
+       0x1D2EE,
+       0x1D2EF
 };
 
-static const UV PL_NV__15_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__15_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314869,10 +322679,14 @@ static const UV PL_NV__15_invlist[] = { /* for all charsets */
        0x2496,
        0x2497,
        0x24EF,
-       0x24F0
+       0x24F0,
+       0x16E8F,
+       0x16E90,
+       0x1D2EF,
+       0x1D2F0
 };
 
-static const UV PL_NV__15_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__15_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314882,8 +322696,8 @@ static const UV PL_NV__15_SLASH_2_invlist[] = { /* for all charsets */
        0xF32
 };
 
-static const UV PL_NV__16_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__16_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314897,11 +322711,15 @@ static const UV PL_NV__16_invlist[] = { /* for all charsets */
        0x2497,
        0x2498,
        0x24F0,
-       0x24F1
+       0x24F1,
+       0x16E90,
+       0x16E91,
+       0x1D2F0,
+       0x1D2F1
 };
 
-static const UV PL_NV__17_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__17_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314915,10 +322733,14 @@ static const UV PL_NV__17_invlist[] = { /* for all charsets */
        0x2498,
        0x2499,
        0x24F1,
-       0x24F2
+       0x24F2,
+       0x16E91,
+       0x16E92,
+       0x1D2F1,
+       0x1D2F2
 };
 
-static const UV PL_NV__17_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__17_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -314928,8 +322750,8 @@ static const UV PL_NV__17_SLASH_2_invlist[] = { /* for all charsets */
        0xF33
 };
 
-static const UV PL_NV__18_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__18_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314943,11 +322765,15 @@ static const UV PL_NV__18_invlist[] = { /* for all charsets */
        0x2499,
        0x249A,
        0x24F2,
-       0x24F3
+       0x24F3,
+       0x16E92,
+       0x16E93,
+       0x1D2F2,
+       0x1D2F3
 };
 
-static const UV PL_NV__19_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__19_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -314961,13 +322787,17 @@ static const UV PL_NV__19_invlist[] = { /* for all charsets */
        0x249A,
        0x249B,
        0x24F3,
-       0x24F4
+       0x24F4,
+       0x16E93,
+       0x16E94,
+       0x1D2F3,
+       0x1D2F4
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
-       239,    /* Number of elements */
+static const UV UNI_NV__2_invlist[] = {  /* for ASCII/Latin1 */
+       259,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315132,8 +322962,12 @@ static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
        0x10B7A,
        0x10BAA,
        0x10BAB,
+       0x10D32,
+       0x10D33,
        0x10E61,
        0x10E62,
+       0x10F1E,
+       0x10F1F,
        0x11053,
        0x11054,
        0x11068,
@@ -315166,6 +323000,8 @@ static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
        0x11C5C,
        0x11D52,
        0x11D53,
+       0x11DA2,
+       0x11DA3,
        0x12400,
        0x12401,
        0x12416,
@@ -315190,8 +323026,16 @@ static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
        0x16A63,
        0x16B52,
        0x16B53,
+       0x16E82,
+       0x16E83,
+       0x16E95,
+       0x16E96,
+       0x1D2E2,
+       0x1D2E3,
        0x1D361,
        0x1D362,
+       0x1D373,
+       0x1D374,
        0x1D7D0,
        0x1D7D1,
        0x1D7DA,
@@ -315206,6 +323050,12 @@ static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
        0x1E8C9,
        0x1E952,
        0x1E953,
+       0x1EC72,
+       0x1EC73,
+       0x1ECA4,
+       0x1ECA5,
+       0x1ECB2,
+       0x1ECB3,
        0x1F103,
        0x1F104,
        0x22390,
@@ -315219,8 +323069,8 @@ static const UV PL_NV__2_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
-       239,    /* Number of elements */
+static const UV UNI_NV__2_invlist[] = {  /* for EBCDIC 1047 */
+       259,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315385,8 +323235,12 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
        0x10B7A,
        0x10BAA,
        0x10BAB,
+       0x10D32,
+       0x10D33,
        0x10E61,
        0x10E62,
+       0x10F1E,
+       0x10F1F,
        0x11053,
        0x11054,
        0x11068,
@@ -315419,6 +323273,8 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
        0x11C5C,
        0x11D52,
        0x11D53,
+       0x11DA2,
+       0x11DA3,
        0x12400,
        0x12401,
        0x12416,
@@ -315443,8 +323299,16 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
        0x16A63,
        0x16B52,
        0x16B53,
+       0x16E82,
+       0x16E83,
+       0x16E95,
+       0x16E96,
+       0x1D2E2,
+       0x1D2E3,
        0x1D361,
        0x1D362,
+       0x1D373,
+       0x1D374,
        0x1D7D0,
        0x1D7D1,
        0x1D7DA,
@@ -315459,6 +323323,12 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
        0x1E8C9,
        0x1E952,
        0x1E953,
+       0x1EC72,
+       0x1EC73,
+       0x1ECA4,
+       0x1ECA5,
+       0x1ECB2,
+       0x1ECB3,
        0x1F103,
        0x1F104,
        0x22390,
@@ -315472,8 +323342,8 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
-       239,    /* Number of elements */
+static const UV UNI_NV__2_invlist[] = {  /* for EBCDIC 037 */
+       259,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315638,8 +323508,12 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
        0x10B7A,
        0x10BAA,
        0x10BAB,
+       0x10D32,
+       0x10D33,
        0x10E61,
        0x10E62,
+       0x10F1E,
+       0x10F1F,
        0x11053,
        0x11054,
        0x11068,
@@ -315672,6 +323546,8 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
        0x11C5C,
        0x11D52,
        0x11D53,
+       0x11DA2,
+       0x11DA3,
        0x12400,
        0x12401,
        0x12416,
@@ -315696,8 +323572,16 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
        0x16A63,
        0x16B52,
        0x16B53,
+       0x16E82,
+       0x16E83,
+       0x16E95,
+       0x16E96,
+       0x1D2E2,
+       0x1D2E3,
        0x1D361,
        0x1D362,
+       0x1D373,
+       0x1D374,
        0x1D7D0,
        0x1D7D1,
        0x1D7DA,
@@ -315712,6 +323596,12 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
        0x1E8C9,
        0x1E952,
        0x1E953,
+       0x1EC72,
+       0x1EC73,
+       0x1ECA4,
+       0x1ECA5,
+       0x1ECB2,
+       0x1ECB3,
        0x1F103,
        0x1F104,
        0x22390,
@@ -315720,7 +323610,7 @@ static const UV PL_NV__2_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__2_SLASH_3_invlist[] = { /* for all charsets */
+static const UV UNI_NV__2_SLASH_3_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315742,7 +323632,7 @@ static const UV PL_NV__2_SLASH_3_invlist[] = { /* for all charsets */
        0x12467
 };
 
-static const UV PL_NV__2_SLASH_5_invlist[] = { /* for all charsets */
+static const UV UNI_NV__2_SLASH_5_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315752,8 +323642,8 @@ static const UV PL_NV__2_SLASH_5_invlist[] = { /* for all charsets */
        0x2157
 };
 
-static const UV PL_NV__20_invlist[] = { /* for all charsets */
-       63,     /* Number of elements */
+static const UV UNI_NV__20_invlist[] = {  /* for all charsets */
+       69,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315808,6 +323698,10 @@ static const UV PL_NV__20_invlist[] = { /* for all charsets */
        0x10BAF,
        0x10E6A,
        0x10E6B,
+       0x10F23,
+       0x10F24,
+       0x10F53,
+       0x10F54,
        0x1105C,
        0x1105D,
        0x111EB,
@@ -315819,11 +323713,13 @@ static const UV PL_NV__20_invlist[] = { /* for all charsets */
        0x11C64,
        0x11C65,
        0x1D36A,
-       0x1D36B
+       0x1D36B,
+       0x1EC7B,
+       0x1EC7C
 };
 
-static const UV PL_NV__200_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__200_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315835,11 +323731,13 @@ static const UV PL_NV__200_invlist[] = { /* for all charsets */
        0x109D3,
        0x109D4,
        0x10E73,
-       0x10E74
+       0x10E74,
+       0x1EC84,
+       0x1EC85
 };
 
-static const UV PL_NV__2000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__2000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315847,11 +323745,13 @@ static const UV PL_NV__2000_invlist[] = { /* for all charsets */
        0x10123,
        0x10124,
        0x109DC,
-       0x109DD
+       0x109DD,
+       0x1EC8D,
+       0x1EC8E
 };
 
-static const UV PL_NV__20000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__20000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -315859,20 +323759,34 @@ static const UV PL_NV__20000_invlist[] = { /* for all charsets */
        0x1012C,
        0x1012D,
        0x109E5,
-       0x109E6
+       0x109E6,
+       0x1EC96,
+       0x1EC97
 };
 
-static const UV PL_NV__200000_invlist[] = { /* for all charsets */
-       3,      /* Number of elements */
+static const UV UNI_NV__200000_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x109EE,
-       0x109EF
+       0x109EF,
+       0x1EC9F,
+       0x1ECA0
+};
+
+static const UV UNI_NV__20000000_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x1ECA2,
+       0x1ECA3
 };
 
-static const UV PL_NV__21_invlist[] = { /* for all charsets */
+static const UV UNI_NV__21_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315882,7 +323796,7 @@ static const UV PL_NV__21_invlist[] = { /* for all charsets */
        0x3252
 };
 
-static const UV PL_NV__216000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__216000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315892,7 +323806,7 @@ static const UV PL_NV__216000_invlist[] = { /* for all charsets */
        0x12433
 };
 
-static const UV PL_NV__22_invlist[] = { /* for all charsets */
+static const UV UNI_NV__22_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315902,7 +323816,7 @@ static const UV PL_NV__22_invlist[] = { /* for all charsets */
        0x3253
 };
 
-static const UV PL_NV__23_invlist[] = { /* for all charsets */
+static const UV UNI_NV__23_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315912,7 +323826,7 @@ static const UV PL_NV__23_invlist[] = { /* for all charsets */
        0x3254
 };
 
-static const UV PL_NV__24_invlist[] = { /* for all charsets */
+static const UV UNI_NV__24_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315922,7 +323836,7 @@ static const UV PL_NV__24_invlist[] = { /* for all charsets */
        0x3255
 };
 
-static const UV PL_NV__25_invlist[] = { /* for all charsets */
+static const UV UNI_NV__25_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315932,7 +323846,7 @@ static const UV PL_NV__25_invlist[] = { /* for all charsets */
        0x3256
 };
 
-static const UV PL_NV__26_invlist[] = { /* for all charsets */
+static const UV UNI_NV__26_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315942,7 +323856,7 @@ static const UV PL_NV__26_invlist[] = { /* for all charsets */
        0x3257
 };
 
-static const UV PL_NV__27_invlist[] = { /* for all charsets */
+static const UV UNI_NV__27_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315952,7 +323866,7 @@ static const UV PL_NV__27_invlist[] = { /* for all charsets */
        0x3258
 };
 
-static const UV PL_NV__28_invlist[] = { /* for all charsets */
+static const UV UNI_NV__28_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315962,7 +323876,7 @@ static const UV PL_NV__28_invlist[] = { /* for all charsets */
        0x3259
 };
 
-static const UV PL_NV__29_invlist[] = { /* for all charsets */
+static const UV UNI_NV__29_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -315974,8 +323888,8 @@ static const UV PL_NV__29_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
-       235,    /* Number of elements */
+static const UV UNI_NV__3_invlist[] = {  /* for ASCII/Latin1 */
+       253,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316128,8 +324042,12 @@ static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
        0x10B7B,
        0x10BAB,
        0x10BAC,
+       0x10D33,
+       0x10D34,
        0x10E62,
        0x10E63,
+       0x10F1F,
+       0x10F20,
        0x11054,
        0x11055,
        0x11069,
@@ -316162,6 +324080,8 @@ static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
        0x11C5D,
        0x11D53,
        0x11D54,
+       0x11DA3,
+       0x11DA4,
        0x12401,
        0x12402,
        0x12408,
@@ -316188,8 +324108,16 @@ static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
        0x16A64,
        0x16B53,
        0x16B54,
+       0x16E83,
+       0x16E84,
+       0x16E96,
+       0x16E97,
+       0x1D2E3,
+       0x1D2E4,
        0x1D362,
        0x1D363,
+       0x1D374,
+       0x1D375,
        0x1D7D1,
        0x1D7D2,
        0x1D7DB,
@@ -316204,6 +324132,10 @@ static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CA,
        0x1E953,
        0x1E954,
+       0x1EC73,
+       0x1EC74,
+       0x1ECA5,
+       0x1ECA6,
        0x1F104,
        0x1F105,
        0x20AFD,
@@ -316223,8 +324155,8 @@ static const UV PL_NV__3_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
-       235,    /* Number of elements */
+static const UV UNI_NV__3_invlist[] = {  /* for EBCDIC 1047 */
+       253,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316377,8 +324309,12 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
        0x10B7B,
        0x10BAB,
        0x10BAC,
+       0x10D33,
+       0x10D34,
        0x10E62,
        0x10E63,
+       0x10F1F,
+       0x10F20,
        0x11054,
        0x11055,
        0x11069,
@@ -316411,6 +324347,8 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
        0x11C5D,
        0x11D53,
        0x11D54,
+       0x11DA3,
+       0x11DA4,
        0x12401,
        0x12402,
        0x12408,
@@ -316437,8 +324375,16 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
        0x16A64,
        0x16B53,
        0x16B54,
+       0x16E83,
+       0x16E84,
+       0x16E96,
+       0x16E97,
+       0x1D2E3,
+       0x1D2E4,
        0x1D362,
        0x1D363,
+       0x1D374,
+       0x1D375,
        0x1D7D1,
        0x1D7D2,
        0x1D7DB,
@@ -316453,6 +324399,10 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CA,
        0x1E953,
        0x1E954,
+       0x1EC73,
+       0x1EC74,
+       0x1ECA5,
+       0x1ECA6,
        0x1F104,
        0x1F105,
        0x20AFD,
@@ -316472,8 +324422,8 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
-       235,    /* Number of elements */
+static const UV UNI_NV__3_invlist[] = {  /* for EBCDIC 037 */
+       253,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316626,8 +324576,12 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
        0x10B7B,
        0x10BAB,
        0x10BAC,
+       0x10D33,
+       0x10D34,
        0x10E62,
        0x10E63,
+       0x10F1F,
+       0x10F20,
        0x11054,
        0x11055,
        0x11069,
@@ -316660,6 +324614,8 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
        0x11C5D,
        0x11D53,
        0x11D54,
+       0x11DA3,
+       0x11DA4,
        0x12401,
        0x12402,
        0x12408,
@@ -316686,8 +324642,16 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
        0x16A64,
        0x16B53,
        0x16B54,
+       0x16E83,
+       0x16E84,
+       0x16E96,
+       0x16E97,
+       0x1D2E3,
+       0x1D2E4,
        0x1D362,
        0x1D363,
+       0x1D374,
+       0x1D375,
        0x1D7D1,
        0x1D7D2,
        0x1D7DB,
@@ -316702,6 +324666,10 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
        0x1E8CA,
        0x1E953,
        0x1E954,
+       0x1EC73,
+       0x1EC74,
+       0x1ECA5,
+       0x1ECA6,
        0x1F104,
        0x1F105,
        0x20AFD,
@@ -316716,7 +324684,7 @@ static const UV PL_NV__3_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__3_SLASH_16_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_16_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316732,7 +324700,7 @@ static const UV PL_NV__3_SLASH_16_invlist[] = { /* for all charsets */
        0xA836
 };
 
-static const UV PL_NV__3_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316742,7 +324710,7 @@ static const UV PL_NV__3_SLASH_2_invlist[] = { /* for all charsets */
        0xF2C
 };
 
-static const UV PL_NV__3_SLASH_20_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_20_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316754,8 +324722,8 @@ static const UV PL_NV__3_SLASH_20_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__3_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
-       15,     /* Number of elements */
+static const UV UNI_NV__3_SLASH_4_invlist[] = {  /* for ASCII/Latin1 */
+       17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316773,7 +324741,9 @@ static const UV PL_NV__3_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
        0x10178,
        0x10179,
        0x109FE,
-       0x109FF
+       0x109FF,
+       0x1ECAF,
+       0x1ECB0
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -316783,8 +324753,8 @@ static const UV PL_NV__3_SLASH_4_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__3_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
-       15,     /* Number of elements */
+static const UV UNI_NV__3_SLASH_4_invlist[] = {  /* for EBCDIC 1047 */
+       17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316802,7 +324772,9 @@ static const UV PL_NV__3_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
        0x10178,
        0x10179,
        0x109FE,
-       0x109FF
+       0x109FF,
+       0x1ECAF,
+       0x1ECB0
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -316812,8 +324784,8 @@ static const UV PL_NV__3_SLASH_4_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__3_SLASH_4_invlist[] = { /* for EBCDIC 037 */
-       15,     /* Number of elements */
+static const UV UNI_NV__3_SLASH_4_invlist[] = {  /* for EBCDIC 037 */
+       17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316831,12 +324803,14 @@ static const UV PL_NV__3_SLASH_4_invlist[] = { /* for EBCDIC 037 */
        0x10178,
        0x10179,
        0x109FE,
-       0x109FF
+       0x109FF,
+       0x1ECAF,
+       0x1ECB0
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__3_SLASH_5_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_5_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316846,7 +324820,7 @@ static const UV PL_NV__3_SLASH_5_invlist[] = { /* for all charsets */
        0x2158
 };
 
-static const UV PL_NV__3_SLASH_8_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_8_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316856,7 +324830,7 @@ static const UV PL_NV__3_SLASH_8_invlist[] = { /* for all charsets */
        0x215D
 };
 
-static const UV PL_NV__3_SLASH_80_invlist[] = { /* for all charsets */
+static const UV UNI_NV__3_SLASH_80_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316866,8 +324840,8 @@ static const UV PL_NV__3_SLASH_80_invlist[] = { /* for all charsets */
        0xD5B
 };
 
-static const UV PL_NV__30_invlist[] = { /* for all charsets */
-       33,     /* Number of elements */
+static const UV UNI_NV__30_invlist[] = {  /* for all charsets */
+       37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316892,6 +324866,8 @@ static const UV PL_NV__30_invlist[] = { /* for all charsets */
        0x109CC,
        0x10E6B,
        0x10E6C,
+       0x10F24,
+       0x10F25,
        0x1105D,
        0x1105E,
        0x111EC,
@@ -316902,12 +324878,14 @@ static const UV PL_NV__30_invlist[] = { /* for all charsets */
        0x11C66,
        0x1D36B,
        0x1D36C,
+       0x1EC7C,
+       0x1EC7D,
        0x20983,
        0x20984
 };
 
-static const UV PL_NV__300_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__300_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316921,11 +324899,13 @@ static const UV PL_NV__300_invlist[] = { /* for all charsets */
        0x109D4,
        0x109D5,
        0x10E74,
-       0x10E75
+       0x10E75,
+       0x1EC85,
+       0x1EC86
 };
 
-static const UV PL_NV__3000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__3000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316933,11 +324913,13 @@ static const UV PL_NV__3000_invlist[] = { /* for all charsets */
        0x10124,
        0x10125,
        0x109DD,
-       0x109DE
+       0x109DE,
+       0x1EC8E,
+       0x1EC8F
 };
 
-static const UV PL_NV__30000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__30000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -316945,10 +324927,12 @@ static const UV PL_NV__30000_invlist[] = { /* for all charsets */
        0x1012D,
        0x1012E,
        0x109E6,
-       0x109E7
+       0x109E7,
+       0x1EC97,
+       0x1EC98
 };
 
-static const UV PL_NV__300000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__300000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316958,7 +324942,7 @@ static const UV PL_NV__300000_invlist[] = { /* for all charsets */
        0x109F0
 };
 
-static const UV PL_NV__31_invlist[] = { /* for all charsets */
+static const UV UNI_NV__31_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316968,7 +324952,7 @@ static const UV PL_NV__31_invlist[] = { /* for all charsets */
        0x325C
 };
 
-static const UV PL_NV__32_invlist[] = { /* for all charsets */
+static const UV UNI_NV__32_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316978,7 +324962,7 @@ static const UV PL_NV__32_invlist[] = { /* for all charsets */
        0x325D
 };
 
-static const UV PL_NV__33_invlist[] = { /* for all charsets */
+static const UV UNI_NV__33_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316988,7 +324972,7 @@ static const UV PL_NV__33_invlist[] = { /* for all charsets */
        0x325E
 };
 
-static const UV PL_NV__34_invlist[] = { /* for all charsets */
+static const UV UNI_NV__34_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -316998,7 +324982,7 @@ static const UV PL_NV__34_invlist[] = { /* for all charsets */
        0x325F
 };
 
-static const UV PL_NV__35_invlist[] = { /* for all charsets */
+static const UV UNI_NV__35_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317008,7 +324992,7 @@ static const UV PL_NV__35_invlist[] = { /* for all charsets */
        0x3260
 };
 
-static const UV PL_NV__36_invlist[] = { /* for all charsets */
+static const UV UNI_NV__36_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317018,7 +325002,7 @@ static const UV PL_NV__36_invlist[] = { /* for all charsets */
        0x32B2
 };
 
-static const UV PL_NV__37_invlist[] = { /* for all charsets */
+static const UV UNI_NV__37_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317028,7 +325012,7 @@ static const UV PL_NV__37_invlist[] = { /* for all charsets */
        0x32B3
 };
 
-static const UV PL_NV__38_invlist[] = { /* for all charsets */
+static const UV UNI_NV__38_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317038,7 +325022,7 @@ static const UV PL_NV__38_invlist[] = { /* for all charsets */
        0x32B4
 };
 
-static const UV PL_NV__39_invlist[] = { /* for all charsets */
+static const UV UNI_NV__39_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317050,8 +325034,8 @@ static const UV PL_NV__39_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
-       223,    /* Number of elements */
+static const UV UNI_NV__4_invlist[] = {  /* for ASCII/Latin1 */
+       239,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317192,8 +325176,12 @@ static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
        0x10B7C,
        0x10BAC,
        0x10BAD,
+       0x10D34,
+       0x10D35,
        0x10E63,
        0x10E64,
+       0x10F20,
+       0x10F21,
        0x11055,
        0x11056,
        0x1106A,
@@ -317226,6 +325214,8 @@ static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
        0x11C5E,
        0x11D54,
        0x11D55,
+       0x11DA4,
+       0x11DA5,
        0x12402,
        0x12403,
        0x12409,
@@ -317254,8 +325244,14 @@ static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
        0x16A65,
        0x16B54,
        0x16B55,
+       0x16E84,
+       0x16E85,
+       0x1D2E4,
+       0x1D2E5,
        0x1D363,
        0x1D364,
+       0x1D375,
+       0x1D376,
        0x1D7D2,
        0x1D7D3,
        0x1D7DC,
@@ -317270,6 +325266,10 @@ static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CB,
        0x1E954,
        0x1E955,
+       0x1EC74,
+       0x1EC75,
+       0x1ECA6,
+       0x1ECA7,
        0x1F105,
        0x1F106,
        0x20064,
@@ -317287,8 +325287,8 @@ static const UV PL_NV__4_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
-       223,    /* Number of elements */
+static const UV UNI_NV__4_invlist[] = {  /* for EBCDIC 1047 */
+       239,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317429,8 +325429,12 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
        0x10B7C,
        0x10BAC,
        0x10BAD,
+       0x10D34,
+       0x10D35,
        0x10E63,
        0x10E64,
+       0x10F20,
+       0x10F21,
        0x11055,
        0x11056,
        0x1106A,
@@ -317463,6 +325467,8 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
        0x11C5E,
        0x11D54,
        0x11D55,
+       0x11DA4,
+       0x11DA5,
        0x12402,
        0x12403,
        0x12409,
@@ -317491,8 +325497,14 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
        0x16A65,
        0x16B54,
        0x16B55,
+       0x16E84,
+       0x16E85,
+       0x1D2E4,
+       0x1D2E5,
        0x1D363,
        0x1D364,
+       0x1D375,
+       0x1D376,
        0x1D7D2,
        0x1D7D3,
        0x1D7DC,
@@ -317507,6 +325519,10 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CB,
        0x1E954,
        0x1E955,
+       0x1EC74,
+       0x1EC75,
+       0x1ECA6,
+       0x1ECA7,
        0x1F105,
        0x1F106,
        0x20064,
@@ -317524,8 +325540,8 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
-       223,    /* Number of elements */
+static const UV UNI_NV__4_invlist[] = {  /* for EBCDIC 037 */
+       239,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317666,8 +325682,12 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
        0x10B7C,
        0x10BAC,
        0x10BAD,
+       0x10D34,
+       0x10D35,
        0x10E63,
        0x10E64,
+       0x10F20,
+       0x10F21,
        0x11055,
        0x11056,
        0x1106A,
@@ -317700,6 +325720,8 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
        0x11C5E,
        0x11D54,
        0x11D55,
+       0x11DA4,
+       0x11DA5,
        0x12402,
        0x12403,
        0x12409,
@@ -317728,8 +325750,14 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
        0x16A65,
        0x16B54,
        0x16B55,
+       0x16E84,
+       0x16E85,
+       0x1D2E4,
+       0x1D2E5,
        0x1D363,
        0x1D364,
+       0x1D375,
+       0x1D376,
        0x1D7D2,
        0x1D7D3,
        0x1D7DC,
@@ -317744,6 +325772,10 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
        0x1E8CB,
        0x1E954,
        0x1E955,
+       0x1EC74,
+       0x1EC75,
+       0x1ECA6,
+       0x1ECA7,
        0x1F105,
        0x1F106,
        0x20064,
@@ -317756,7 +325788,7 @@ static const UV PL_NV__4_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__4_SLASH_5_invlist[] = { /* for all charsets */
+static const UV UNI_NV__4_SLASH_5_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317766,8 +325798,8 @@ static const UV PL_NV__4_SLASH_5_invlist[] = { /* for all charsets */
        0x2159
 };
 
-static const UV PL_NV__40_invlist[] = { /* for all charsets */
-       33,     /* Number of elements */
+static const UV UNI_NV__40_invlist[] = {  /* for all charsets */
+       35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317800,14 +325832,16 @@ static const UV PL_NV__40_invlist[] = { /* for all charsets */
        0x12468,
        0x1D36C,
        0x1D36D,
+       0x1EC7D,
+       0x1EC7E,
        0x2098C,
        0x2098D,
        0x2099C,
        0x2099D
 };
 
-static const UV PL_NV__400_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__400_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317819,11 +325853,13 @@ static const UV PL_NV__400_invlist[] = { /* for all charsets */
        0x109D5,
        0x109D6,
        0x10E75,
-       0x10E76
+       0x10E76,
+       0x1EC86,
+       0x1EC87
 };
 
-static const UV PL_NV__4000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__4000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317831,11 +325867,13 @@ static const UV PL_NV__4000_invlist[] = { /* for all charsets */
        0x10125,
        0x10126,
        0x109DE,
-       0x109DF
+       0x109DF,
+       0x1EC8F,
+       0x1EC90
 };
 
-static const UV PL_NV__40000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__40000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -317843,10 +325881,12 @@ static const UV PL_NV__40000_invlist[] = { /* for all charsets */
        0x1012E,
        0x1012F,
        0x109E7,
-       0x109E8
+       0x109E8,
+       0x1EC98,
+       0x1EC99
 };
 
-static const UV PL_NV__400000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__400000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317856,7 +325896,7 @@ static const UV PL_NV__400000_invlist[] = { /* for all charsets */
        0x109F1
 };
 
-static const UV PL_NV__41_invlist[] = { /* for all charsets */
+static const UV UNI_NV__41_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317866,7 +325906,7 @@ static const UV PL_NV__41_invlist[] = { /* for all charsets */
        0x32B7
 };
 
-static const UV PL_NV__42_invlist[] = { /* for all charsets */
+static const UV UNI_NV__42_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317876,7 +325916,7 @@ static const UV PL_NV__42_invlist[] = { /* for all charsets */
        0x32B8
 };
 
-static const UV PL_NV__43_invlist[] = { /* for all charsets */
+static const UV UNI_NV__43_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317886,7 +325926,7 @@ static const UV PL_NV__43_invlist[] = { /* for all charsets */
        0x32B9
 };
 
-static const UV PL_NV__432000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__432000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317896,7 +325936,7 @@ static const UV PL_NV__432000_invlist[] = { /* for all charsets */
        0x12434
 };
 
-static const UV PL_NV__44_invlist[] = { /* for all charsets */
+static const UV UNI_NV__44_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317906,7 +325946,7 @@ static const UV PL_NV__44_invlist[] = { /* for all charsets */
        0x32BA
 };
 
-static const UV PL_NV__45_invlist[] = { /* for all charsets */
+static const UV UNI_NV__45_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317916,7 +325956,7 @@ static const UV PL_NV__45_invlist[] = { /* for all charsets */
        0x32BB
 };
 
-static const UV PL_NV__46_invlist[] = { /* for all charsets */
+static const UV UNI_NV__46_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317926,7 +325966,7 @@ static const UV PL_NV__46_invlist[] = { /* for all charsets */
        0x32BC
 };
 
-static const UV PL_NV__47_invlist[] = { /* for all charsets */
+static const UV UNI_NV__47_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317936,7 +325976,7 @@ static const UV PL_NV__47_invlist[] = { /* for all charsets */
        0x32BD
 };
 
-static const UV PL_NV__48_invlist[] = { /* for all charsets */
+static const UV UNI_NV__48_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317946,7 +325986,7 @@ static const UV PL_NV__48_invlist[] = { /* for all charsets */
        0x32BE
 };
 
-static const UV PL_NV__49_invlist[] = { /* for all charsets */
+static const UV UNI_NV__49_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -317958,8 +325998,8 @@ static const UV PL_NV__49_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
-       227,    /* Number of elements */
+static const UV UNI_NV__5_invlist[] = {  /* for ASCII/Latin1 */
+       245,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318110,8 +326150,12 @@ static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
        0x10AED,
        0x10CFB,
        0x10CFC,
+       0x10D35,
+       0x10D36,
        0x10E64,
        0x10E65,
+       0x10F21,
+       0x10F22,
        0x11056,
        0x11057,
        0x1106B,
@@ -318144,6 +326188,8 @@ static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
        0x11C5F,
        0x11D55,
        0x11D56,
+       0x11DA5,
+       0x11DA6,
        0x12403,
        0x12404,
        0x1240A,
@@ -318170,8 +326216,16 @@ static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
        0x16A66,
        0x16B55,
        0x16B56,
+       0x16E85,
+       0x16E86,
+       0x1D2E5,
+       0x1D2E6,
        0x1D364,
        0x1D365,
+       0x1D376,
+       0x1D377,
+       0x1D378,
+       0x1D379,
        0x1D7D3,
        0x1D7D4,
        0x1D7DD,
@@ -318186,6 +326240,10 @@ static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CC,
        0x1E955,
        0x1E956,
+       0x1EC75,
+       0x1EC76,
+       0x1ECA7,
+       0x1ECA8,
        0x1F106,
        0x1F107,
        0x20121,
@@ -318199,8 +326257,8 @@ static const UV PL_NV__5_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
-       227,    /* Number of elements */
+static const UV UNI_NV__5_invlist[] = {  /* for EBCDIC 1047 */
+       245,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318351,8 +326409,12 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
        0x10AED,
        0x10CFB,
        0x10CFC,
+       0x10D35,
+       0x10D36,
        0x10E64,
        0x10E65,
+       0x10F21,
+       0x10F22,
        0x11056,
        0x11057,
        0x1106B,
@@ -318385,6 +326447,8 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
        0x11C5F,
        0x11D55,
        0x11D56,
+       0x11DA5,
+       0x11DA6,
        0x12403,
        0x12404,
        0x1240A,
@@ -318411,8 +326475,16 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
        0x16A66,
        0x16B55,
        0x16B56,
+       0x16E85,
+       0x16E86,
+       0x1D2E5,
+       0x1D2E6,
        0x1D364,
        0x1D365,
+       0x1D376,
+       0x1D377,
+       0x1D378,
+       0x1D379,
        0x1D7D3,
        0x1D7D4,
        0x1D7DD,
@@ -318427,6 +326499,10 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CC,
        0x1E955,
        0x1E956,
+       0x1EC75,
+       0x1EC76,
+       0x1ECA7,
+       0x1ECA8,
        0x1F106,
        0x1F107,
        0x20121,
@@ -318440,8 +326516,8 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
-       227,    /* Number of elements */
+static const UV UNI_NV__5_invlist[] = {  /* for EBCDIC 037 */
+       245,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318592,8 +326668,12 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
        0x10AED,
        0x10CFB,
        0x10CFC,
+       0x10D35,
+       0x10D36,
        0x10E64,
        0x10E65,
+       0x10F21,
+       0x10F22,
        0x11056,
        0x11057,
        0x1106B,
@@ -318626,6 +326706,8 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
        0x11C5F,
        0x11D55,
        0x11D56,
+       0x11DA5,
+       0x11DA6,
        0x12403,
        0x12404,
        0x1240A,
@@ -318652,8 +326734,16 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
        0x16A66,
        0x16B55,
        0x16B56,
+       0x16E85,
+       0x16E86,
+       0x1D2E5,
+       0x1D2E6,
        0x1D364,
        0x1D365,
+       0x1D376,
+       0x1D377,
+       0x1D378,
+       0x1D379,
        0x1D7D3,
        0x1D7D4,
        0x1D7DD,
@@ -318668,6 +326758,10 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
        0x1E8CC,
        0x1E955,
        0x1E956,
+       0x1EC75,
+       0x1EC76,
+       0x1ECA7,
+       0x1ECA8,
        0x1F106,
        0x1F107,
        0x20121,
@@ -318676,7 +326770,7 @@ static const UV PL_NV__5_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__5_SLASH_12_invlist[] = { /* for all charsets */
+static const UV UNI_NV__5_SLASH_12_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -318686,7 +326780,7 @@ static const UV PL_NV__5_SLASH_12_invlist[] = { /* for all charsets */
        0x109FB
 };
 
-static const UV PL_NV__5_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__5_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -318696,7 +326790,7 @@ static const UV PL_NV__5_SLASH_2_invlist[] = { /* for all charsets */
        0xF2D
 };
 
-static const UV PL_NV__5_SLASH_6_invlist[] = { /* for all charsets */
+static const UV UNI_NV__5_SLASH_6_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -318710,7 +326804,7 @@ static const UV PL_NV__5_SLASH_6_invlist[] = { /* for all charsets */
        0x1245D
 };
 
-static const UV PL_NV__5_SLASH_8_invlist[] = { /* for all charsets */
+static const UV UNI_NV__5_SLASH_8_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -318720,8 +326814,8 @@ static const UV PL_NV__5_SLASH_8_invlist[] = { /* for all charsets */
        0x215E
 };
 
-static const UV PL_NV__50_invlist[] = { /* for all charsets */
-       49,     /* Number of elements */
+static const UV UNI_NV__50_invlist[] = {  /* for all charsets */
+       51,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318773,11 +326867,13 @@ static const UV PL_NV__50_invlist[] = { /* for all charsets */
        0x12468,
        0x12469,
        0x1D36D,
-       0x1D36E
+       0x1D36E,
+       0x1EC7E,
+       0x1EC7F
 };
 
-static const UV PL_NV__500_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
+static const UV UNI_NV__500_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318801,11 +326897,13 @@ static const UV PL_NV__500_invlist[] = { /* for all charsets */
        0x109D6,
        0x109D7,
        0x10E76,
-       0x10E77
+       0x10E77,
+       0x1EC87,
+       0x1EC88
 };
 
-static const UV PL_NV__5000_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_NV__5000_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318821,11 +326919,13 @@ static const UV PL_NV__5000_invlist[] = { /* for all charsets */
        0x10172,
        0x10173,
        0x109DF,
-       0x109E0
+       0x109E0,
+       0x1EC90,
+       0x1EC91
 };
 
-static const UV PL_NV__50000_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__50000_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318839,10 +326939,12 @@ static const UV PL_NV__50000_invlist[] = { /* for all charsets */
        0x10156,
        0x10157,
        0x109E8,
-       0x109E9
+       0x109E9,
+       0x1EC99,
+       0x1EC9A
 };
 
-static const UV PL_NV__500000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__500000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -318854,8 +326956,8 @@ static const UV PL_NV__500000_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
-       203,    /* Number of elements */
+static const UV UNI_NV__6_invlist[] = {  /* for ASCII/Latin1 */
+       215,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -318988,6 +327090,8 @@ static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
        0x104A7,
        0x109C5,
        0x109C6,
+       0x10D36,
+       0x10D37,
        0x10E65,
        0x10E66,
        0x11057,
@@ -319022,6 +327126,8 @@ static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
        0x11C60,
        0x11D56,
        0x11D57,
+       0x11DA6,
+       0x11DA7,
        0x12404,
        0x12405,
        0x1240B,
@@ -319042,6 +327148,10 @@ static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
        0x16A67,
        0x16B56,
        0x16B57,
+       0x16E86,
+       0x16E87,
+       0x1D2E6,
+       0x1D2E7,
        0x1D365,
        0x1D366,
        0x1D7D4,
@@ -319058,6 +327168,10 @@ static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CD,
        0x1E956,
        0x1E957,
+       0x1EC76,
+       0x1EC77,
+       0x1ECA8,
+       0x1ECA9,
        0x1F107,
        0x1F108,
        0x20AEA,
@@ -319071,8 +327185,8 @@ static const UV PL_NV__6_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
-       203,    /* Number of elements */
+static const UV UNI_NV__6_invlist[] = {  /* for EBCDIC 1047 */
+       215,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319205,6 +327319,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
        0x104A7,
        0x109C5,
        0x109C6,
+       0x10D36,
+       0x10D37,
        0x10E65,
        0x10E66,
        0x11057,
@@ -319239,6 +327355,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
        0x11C60,
        0x11D56,
        0x11D57,
+       0x11DA6,
+       0x11DA7,
        0x12404,
        0x12405,
        0x1240B,
@@ -319259,6 +327377,10 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
        0x16A67,
        0x16B56,
        0x16B57,
+       0x16E86,
+       0x16E87,
+       0x1D2E6,
+       0x1D2E7,
        0x1D365,
        0x1D366,
        0x1D7D4,
@@ -319275,6 +327397,10 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CD,
        0x1E956,
        0x1E957,
+       0x1EC76,
+       0x1EC77,
+       0x1ECA8,
+       0x1ECA9,
        0x1F107,
        0x1F108,
        0x20AEA,
@@ -319288,8 +327414,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
-       203,    /* Number of elements */
+static const UV UNI_NV__6_invlist[] = {  /* for EBCDIC 037 */
+       215,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319422,6 +327548,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
        0x104A7,
        0x109C5,
        0x109C6,
+       0x10D36,
+       0x10D37,
        0x10E65,
        0x10E66,
        0x11057,
@@ -319456,6 +327584,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
        0x11C60,
        0x11D56,
        0x11D57,
+       0x11DA6,
+       0x11DA7,
        0x12404,
        0x12405,
        0x1240B,
@@ -319476,6 +327606,10 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
        0x16A67,
        0x16B56,
        0x16B57,
+       0x16E86,
+       0x16E87,
+       0x1D2E6,
+       0x1D2E7,
        0x1D365,
        0x1D366,
        0x1D7D4,
@@ -319492,6 +327626,10 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
        0x1E8CD,
        0x1E956,
        0x1E957,
+       0x1EC76,
+       0x1EC77,
+       0x1ECA8,
+       0x1ECA9,
        0x1F107,
        0x1F108,
        0x20AEA,
@@ -319500,8 +327638,8 @@ static const UV PL_NV__6_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__60_invlist[] = { /* for all charsets */
-       23,     /* Number of elements */
+static const UV UNI_NV__60_invlist[] = {  /* for all charsets */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319527,11 +327665,13 @@ static const UV PL_NV__60_invlist[] = { /* for all charsets */
        0x11C68,
        0x11C69,
        0x1D36E,
-       0x1D36F
+       0x1D36F,
+       0x1EC7F,
+       0x1EC80
 };
 
-static const UV PL_NV__600_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__600_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319543,11 +327683,13 @@ static const UV PL_NV__600_invlist[] = { /* for all charsets */
        0x109D7,
        0x109D8,
        0x10E77,
-       0x10E78
+       0x10E78,
+       0x1EC88,
+       0x1EC89
 };
 
-static const UV PL_NV__6000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__6000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319555,11 +327697,13 @@ static const UV PL_NV__6000_invlist[] = { /* for all charsets */
        0x10127,
        0x10128,
        0x109E0,
-       0x109E1
+       0x109E1,
+       0x1EC91,
+       0x1EC92
 };
 
-static const UV PL_NV__60000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__60000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319567,10 +327711,12 @@ static const UV PL_NV__60000_invlist[] = { /* for all charsets */
        0x10130,
        0x10131,
        0x109E9,
-       0x109EA
+       0x109EA,
+       0x1EC9A,
+       0x1EC9B
 };
 
-static const UV PL_NV__600000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__600000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -319582,8 +327728,8 @@ static const UV PL_NV__600000_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
-       197,    /* Number of elements */
+static const UV UNI_NV__7_invlist[] = {  /* for ASCII/Latin1 */
+       209,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319712,6 +327858,8 @@ static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
        0x104A8,
        0x109C6,
        0x109C7,
+       0x10D37,
+       0x10D38,
        0x10E66,
        0x10E67,
        0x11058,
@@ -319746,6 +327894,8 @@ static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
        0x11C61,
        0x11D57,
        0x11D58,
+       0x11DA7,
+       0x11DA8,
        0x12405,
        0x12406,
        0x1240C,
@@ -319764,6 +327914,10 @@ static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
        0x16A68,
        0x16B57,
        0x16B58,
+       0x16E87,
+       0x16E88,
+       0x1D2E7,
+       0x1D2E8,
        0x1D366,
        0x1D367,
        0x1D7D5,
@@ -319780,6 +327934,10 @@ static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CE,
        0x1E957,
        0x1E958,
+       0x1EC77,
+       0x1EC78,
+       0x1ECA9,
+       0x1ECAA,
        0x1F108,
        0x1F109,
        0x20001,
@@ -319793,8 +327951,8 @@ static const UV PL_NV__7_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
-       197,    /* Number of elements */
+static const UV UNI_NV__7_invlist[] = {  /* for EBCDIC 1047 */
+       209,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -319923,6 +328081,8 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
        0x104A8,
        0x109C6,
        0x109C7,
+       0x10D37,
+       0x10D38,
        0x10E66,
        0x10E67,
        0x11058,
@@ -319957,6 +328117,8 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
        0x11C61,
        0x11D57,
        0x11D58,
+       0x11DA7,
+       0x11DA8,
        0x12405,
        0x12406,
        0x1240C,
@@ -319975,6 +328137,10 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
        0x16A68,
        0x16B57,
        0x16B58,
+       0x16E87,
+       0x16E88,
+       0x1D2E7,
+       0x1D2E8,
        0x1D366,
        0x1D367,
        0x1D7D5,
@@ -319991,6 +328157,10 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CE,
        0x1E957,
        0x1E958,
+       0x1EC77,
+       0x1EC78,
+       0x1ECA9,
+       0x1ECAA,
        0x1F108,
        0x1F109,
        0x20001,
@@ -320004,8 +328174,8 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
-       197,    /* Number of elements */
+static const UV UNI_NV__7_invlist[] = {  /* for EBCDIC 037 */
+       209,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320134,6 +328304,8 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
        0x104A8,
        0x109C6,
        0x109C7,
+       0x10D37,
+       0x10D38,
        0x10E66,
        0x10E67,
        0x11058,
@@ -320168,6 +328340,8 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
        0x11C61,
        0x11D57,
        0x11D58,
+       0x11DA7,
+       0x11DA8,
        0x12405,
        0x12406,
        0x1240C,
@@ -320186,6 +328360,10 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
        0x16A68,
        0x16B57,
        0x16B58,
+       0x16E87,
+       0x16E88,
+       0x1D2E7,
+       0x1D2E8,
        0x1D366,
        0x1D367,
        0x1D7D5,
@@ -320202,6 +328380,10 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
        0x1E8CE,
        0x1E957,
        0x1E958,
+       0x1EC77,
+       0x1EC78,
+       0x1ECA9,
+       0x1ECAA,
        0x1F108,
        0x1F109,
        0x20001,
@@ -320210,7 +328392,7 @@ static const UV PL_NV__7_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__7_SLASH_12_invlist[] = { /* for all charsets */
+static const UV UNI_NV__7_SLASH_12_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -320220,7 +328402,7 @@ static const UV PL_NV__7_SLASH_12_invlist[] = { /* for all charsets */
        0x109FD
 };
 
-static const UV PL_NV__7_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__7_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -320230,7 +328412,7 @@ static const UV PL_NV__7_SLASH_2_invlist[] = { /* for all charsets */
        0xF2E
 };
 
-static const UV PL_NV__7_SLASH_8_invlist[] = { /* for all charsets */
+static const UV UNI_NV__7_SLASH_8_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -320240,8 +328422,8 @@ static const UV PL_NV__7_SLASH_8_invlist[] = { /* for all charsets */
        0x215F
 };
 
-static const UV PL_NV__70_invlist[] = { /* for all charsets */
-       23,     /* Number of elements */
+static const UV UNI_NV__70_invlist[] = {  /* for all charsets */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320267,11 +328449,13 @@ static const UV PL_NV__70_invlist[] = { /* for all charsets */
        0x11C69,
        0x11C6A,
        0x1D36F,
-       0x1D370
+       0x1D370,
+       0x1EC80,
+       0x1EC81
 };
 
-static const UV PL_NV__700_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__700_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320283,11 +328467,13 @@ static const UV PL_NV__700_invlist[] = { /* for all charsets */
        0x109D8,
        0x109D9,
        0x10E78,
-       0x10E79
+       0x10E79,
+       0x1EC89,
+       0x1EC8A
 };
 
-static const UV PL_NV__7000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__7000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320295,11 +328481,13 @@ static const UV PL_NV__7000_invlist[] = { /* for all charsets */
        0x10128,
        0x10129,
        0x109E1,
-       0x109E2
+       0x109E2,
+       0x1EC92,
+       0x1EC93
 };
 
-static const UV PL_NV__70000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__70000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320307,10 +328495,12 @@ static const UV PL_NV__70000_invlist[] = { /* for all charsets */
        0x10131,
        0x10132,
        0x109EA,
-       0x109EB
+       0x109EB,
+       0x1EC9B,
+       0x1EC9C
 };
 
-static const UV PL_NV__700000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__700000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -320322,8 +328512,8 @@ static const UV PL_NV__700000_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
-       191,    /* Number of elements */
+static const UV UNI_NV__8_invlist[] = {  /* for ASCII/Latin1 */
+       203,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320448,6 +328638,8 @@ static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
        0x104A9,
        0x109C7,
        0x109C8,
+       0x10D38,
+       0x10D39,
        0x10E67,
        0x10E68,
        0x11059,
@@ -320482,6 +328674,8 @@ static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
        0x11C62,
        0x11D58,
        0x11D59,
+       0x11DA8,
+       0x11DA9,
        0x12406,
        0x12407,
        0x1240D,
@@ -320500,6 +328694,10 @@ static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
        0x16A69,
        0x16B58,
        0x16B59,
+       0x16E88,
+       0x16E89,
+       0x1D2E8,
+       0x1D2E9,
        0x1D367,
        0x1D368,
        0x1D7D6,
@@ -320516,6 +328714,10 @@ static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
        0x1E8CF,
        0x1E958,
        0x1E959,
+       0x1EC78,
+       0x1EC79,
+       0x1ECAA,
+       0x1ECAB,
        0x1F109,
        0x1F10A
 };
@@ -320527,8 +328729,8 @@ static const UV PL_NV__8_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
-       191,    /* Number of elements */
+static const UV UNI_NV__8_invlist[] = {  /* for EBCDIC 1047 */
+       203,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320653,6 +328855,8 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
        0x104A9,
        0x109C7,
        0x109C8,
+       0x10D38,
+       0x10D39,
        0x10E67,
        0x10E68,
        0x11059,
@@ -320687,6 +328891,8 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
        0x11C62,
        0x11D58,
        0x11D59,
+       0x11DA8,
+       0x11DA9,
        0x12406,
        0x12407,
        0x1240D,
@@ -320705,6 +328911,10 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
        0x16A69,
        0x16B58,
        0x16B59,
+       0x16E88,
+       0x16E89,
+       0x1D2E8,
+       0x1D2E9,
        0x1D367,
        0x1D368,
        0x1D7D6,
@@ -320721,6 +328931,10 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
        0x1E8CF,
        0x1E958,
        0x1E959,
+       0x1EC78,
+       0x1EC79,
+       0x1ECAA,
+       0x1ECAB,
        0x1F109,
        0x1F10A
 };
@@ -320732,8 +328946,8 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__8_invlist[] = { /* for EBCDIC 037 */
-       191,    /* Number of elements */
+static const UV UNI_NV__8_invlist[] = {  /* for EBCDIC 037 */
+       203,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320858,6 +329072,8 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 037 */
        0x104A9,
        0x109C7,
        0x109C8,
+       0x10D38,
+       0x10D39,
        0x10E67,
        0x10E68,
        0x11059,
@@ -320892,6 +329108,8 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 037 */
        0x11C62,
        0x11D58,
        0x11D59,
+       0x11DA8,
+       0x11DA9,
        0x12406,
        0x12407,
        0x1240D,
@@ -320910,6 +329128,10 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 037 */
        0x16A69,
        0x16B58,
        0x16B59,
+       0x16E88,
+       0x16E89,
+       0x1D2E8,
+       0x1D2E9,
        0x1D367,
        0x1D368,
        0x1D7D6,
@@ -320926,14 +329148,18 @@ static const UV PL_NV__8_invlist[] = { /* for EBCDIC 037 */
        0x1E8CF,
        0x1E958,
        0x1E959,
+       0x1EC78,
+       0x1EC79,
+       0x1ECAA,
+       0x1ECAB,
        0x1F109,
        0x1F10A
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__80_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
+static const UV UNI_NV__80_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320957,11 +329183,13 @@ static const UV PL_NV__80_invlist[] = { /* for all charsets */
        0x11C6A,
        0x11C6B,
        0x1D370,
-       0x1D371
+       0x1D371,
+       0x1EC81,
+       0x1EC82
 };
 
-static const UV PL_NV__800_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_NV__800_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320973,11 +329201,13 @@ static const UV PL_NV__800_invlist[] = { /* for all charsets */
        0x109D9,
        0x109DA,
        0x10E79,
-       0x10E7A
+       0x10E7A,
+       0x1EC8A,
+       0x1EC8B
 };
 
-static const UV PL_NV__8000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__8000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320985,11 +329215,13 @@ static const UV PL_NV__8000_invlist[] = { /* for all charsets */
        0x10129,
        0x1012A,
        0x109E2,
-       0x109E3
+       0x109E3,
+       0x1EC93,
+       0x1EC94
 };
 
-static const UV PL_NV__80000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__80000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -320997,10 +329229,12 @@ static const UV PL_NV__80000_invlist[] = { /* for all charsets */
        0x10132,
        0x10133,
        0x109EB,
-       0x109EC
+       0x109EC,
+       0x1EC9C,
+       0x1EC9D
 };
 
-static const UV PL_NV__800000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__800000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -321012,8 +329246,8 @@ static const UV PL_NV__800000_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
-       195,    /* Number of elements */
+static const UV UNI_NV__9_invlist[] = {  /* for ASCII/Latin1 */
+       207,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321140,6 +329374,8 @@ static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
        0x104AA,
        0x109C8,
        0x109C9,
+       0x10D39,
+       0x10D3A,
        0x10E68,
        0x10E69,
        0x1105A,
@@ -321174,6 +329410,8 @@ static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
        0x11C63,
        0x11D59,
        0x11D5A,
+       0x11DA9,
+       0x11DAA,
        0x12407,
        0x12408,
        0x1240E,
@@ -321192,6 +329430,10 @@ static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
        0x16A6A,
        0x16B59,
        0x16B5A,
+       0x16E89,
+       0x16E8A,
+       0x1D2E9,
+       0x1D2EA,
        0x1D368,
        0x1D369,
        0x1D7D7,
@@ -321208,6 +329450,10 @@ static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
        0x1E8D0,
        0x1E959,
        0x1E95A,
+       0x1EC79,
+       0x1EC7A,
+       0x1ECAB,
+       0x1ECAC,
        0x1F10A,
        0x1F10B,
        0x2F890,
@@ -321221,8 +329467,8 @@ static const UV PL_NV__9_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
-       195,    /* Number of elements */
+static const UV UNI_NV__9_invlist[] = {  /* for EBCDIC 1047 */
+       207,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321349,6 +329595,8 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
        0x104AA,
        0x109C8,
        0x109C9,
+       0x10D39,
+       0x10D3A,
        0x10E68,
        0x10E69,
        0x1105A,
@@ -321383,6 +329631,8 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
        0x11C63,
        0x11D59,
        0x11D5A,
+       0x11DA9,
+       0x11DAA,
        0x12407,
        0x12408,
        0x1240E,
@@ -321401,6 +329651,10 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
        0x16A6A,
        0x16B59,
        0x16B5A,
+       0x16E89,
+       0x16E8A,
+       0x1D2E9,
+       0x1D2EA,
        0x1D368,
        0x1D369,
        0x1D7D7,
@@ -321417,6 +329671,10 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
        0x1E8D0,
        0x1E959,
        0x1E95A,
+       0x1EC79,
+       0x1EC7A,
+       0x1ECAB,
+       0x1ECAC,
        0x1F10A,
        0x1F10B,
        0x2F890,
@@ -321430,8 +329688,8 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
-       195,    /* Number of elements */
+static const UV UNI_NV__9_invlist[] = {  /* for EBCDIC 037 */
+       207,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321558,6 +329816,8 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
        0x104AA,
        0x109C8,
        0x109C9,
+       0x10D39,
+       0x10D3A,
        0x10E68,
        0x10E69,
        0x1105A,
@@ -321592,6 +329852,8 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
        0x11C63,
        0x11D59,
        0x11D5A,
+       0x11DA9,
+       0x11DAA,
        0x12407,
        0x12408,
        0x1240E,
@@ -321610,6 +329872,10 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
        0x16A6A,
        0x16B59,
        0x16B5A,
+       0x16E89,
+       0x16E8A,
+       0x1D2E9,
+       0x1D2EA,
        0x1D368,
        0x1D369,
        0x1D7D7,
@@ -321626,6 +329892,10 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
        0x1E8D0,
        0x1E959,
        0x1E95A,
+       0x1EC79,
+       0x1EC7A,
+       0x1ECAB,
+       0x1ECAC,
        0x1F10A,
        0x1F10B,
        0x2F890,
@@ -321634,7 +329904,7 @@ static const UV PL_NV__9_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_NV__9_SLASH_2_invlist[] = { /* for all charsets */
+static const UV UNI_NV__9_SLASH_2_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -321644,8 +329914,8 @@ static const UV PL_NV__9_SLASH_2_invlist[] = { /* for all charsets */
        0xF2F
 };
 
-static const UV PL_NV__90_invlist[] = { /* for all charsets */
-       21,     /* Number of elements */
+static const UV UNI_NV__90_invlist[] = {  /* for all charsets */
+       23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321669,11 +329939,13 @@ static const UV PL_NV__90_invlist[] = { /* for all charsets */
        0x11C6B,
        0x11C6C,
        0x1D371,
-       0x1D372
+       0x1D372,
+       0x1EC82,
+       0x1EC83
 };
 
-static const UV PL_NV__900_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_NV__900_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321687,11 +329959,13 @@ static const UV PL_NV__900_invlist[] = { /* for all charsets */
        0x109DA,
        0x109DB,
        0x10E7A,
-       0x10E7B
+       0x10E7B,
+       0x1EC8B,
+       0x1EC8C
 };
 
-static const UV PL_NV__9000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__9000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321699,11 +329973,13 @@ static const UV PL_NV__9000_invlist[] = { /* for all charsets */
        0x1012A,
        0x1012B,
        0x109E3,
-       0x109E4
+       0x109E4,
+       0x1EC94,
+       0x1EC95
 };
 
-static const UV PL_NV__90000_invlist[] = { /* for all charsets */
-       5,      /* Number of elements */
+static const UV UNI_NV__90000_invlist[] = {  /* for all charsets */
+       7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -321711,10 +329987,12 @@ static const UV PL_NV__90000_invlist[] = { /* for all charsets */
        0x10133,
        0x10134,
        0x109EC,
-       0x109ED
+       0x109ED,
+       0x1EC9D,
+       0x1EC9E
 };
 
-static const UV PL_NV__900000_invlist[] = { /* for all charsets */
+static const UV UNI_NV__900000_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -321726,8 +330004,8 @@ static const UV PL_NV__900000_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
-       377,    /* Number of elements */
+static const UV UNI_NV__NAN_invlist[] = {  /* for ASCII/Latin1 */
+       395,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -322013,7 +330291,7 @@ static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -322028,8 +330306,14 @@ static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -322058,6 +330342,8 @@ static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -322066,14 +330352,24 @@ static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D,
        0x20001,
@@ -322117,8 +330413,8 @@ static const UV PL_NV__NAN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
-       377,    /* Number of elements */
+static const UV UNI_NV__NAN_invlist[] = {  /* for EBCDIC 1047 */
+       395,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -322404,7 +330700,7 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -322419,8 +330715,14 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -322449,6 +330751,8 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -322457,14 +330761,24 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D,
        0x20001,
@@ -322508,8 +330822,8 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
-       377,    /* Number of elements */
+static const UV UNI_NV__NAN_invlist[] = {  /* for EBCDIC 037 */
+       395,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -322795,7 +331109,7 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
        0x109D2,
        0x10A00,
        0x10A40,
-       0x10A48,
+       0x10A49,
        0x10A7D,
        0x10A7F,
        0x10A9D,
@@ -322810,8 +331124,14 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
        0x10BB0,
        0x10CFA,
        0x10D00,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F1D,
+       0x10F27,
+       0x10F51,
+       0x10F55,
        0x11052,
        0x11070,
        0x110F0,
@@ -322840,6 +331160,8 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
        0x11C6D,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x12400,
        0x1246F,
        0x16A60,
@@ -322848,14 +331170,24 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
        0x16B5A,
        0x16B5B,
        0x16B62,
+       0x16E80,
+       0x16E97,
+       0x1D2E0,
+       0x1D2F4,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D7CE,
        0x1D800,
        0x1E8C7,
        0x1E8D0,
        0x1E950,
        0x1E95A,
+       0x1EC71,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
+       0x1ECB5,
        0x1F100,
        0x1F10D,
        0x20001,
@@ -322894,7 +331226,7 @@ static const UV PL_NV__NAN_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_OCR_invlist[] = { /* for all charsets */
+static const UV UNI_OCR_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322904,7 +331236,7 @@ static const UV PL_OCR_invlist[] = { /* for all charsets */
        0x2460
 };
 
-static const UV PL_OGAM_invlist[] = { /* for all charsets */
+static const UV UNI_OGAM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322914,7 +331246,7 @@ static const UV PL_OGAM_invlist[] = { /* for all charsets */
        0x169D
 };
 
-static const UV PL_OLCK_invlist[] = { /* for all charsets */
+static const UV UNI_OLCK_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322924,7 +331256,7 @@ static const UV PL_OLCK_invlist[] = { /* for all charsets */
        0x1C80
 };
 
-static const UV PL_ORKH_invlist[] = { /* for all charsets */
+static const UV UNI_ORKH_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322934,7 +331266,7 @@ static const UV PL_ORKH_invlist[] = { /* for all charsets */
        0x10C49
 };
 
-static const UV PL_ORNAMENTALDINGBATS_invlist[] = { /* for all charsets */
+static const UV UNI_ORNAMENTALDINGBATS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322944,8 +331276,8 @@ static const UV PL_ORNAMENTALDINGBATS_invlist[] = { /* for all charsets */
        0x1F680
 };
 
-static const UV PL_ORYA_invlist[] = { /* for all charsets */
-       33,     /* Number of elements */
+static const UV UNI_ORYA_invlist[] = {  /* for all charsets */
+       35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -322981,10 +331313,12 @@ static const UV PL_ORYA_invlist[] = { /* for all charsets */
        0xB5F,
        0xB64,
        0xB66,
-       0xB78
+       0xB78,
+       0x1CDA,
+       0x1CDB
 };
 
-static const UV PL_OSGE_invlist[] = { /* for all charsets */
+static const UV UNI_OSGE_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -322996,7 +331330,7 @@ static const UV PL_OSGE_invlist[] = { /* for all charsets */
        0x104FC
 };
 
-static const UV PL_OSMA_invlist[] = { /* for all charsets */
+static const UV UNI_OSMA_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -323010,8 +331344,8 @@ static const UV PL_OSMA_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
-       345,    /* Number of elements */
+static const UV UNI_P_invlist[] = {  /* for ASCII/Latin1 */
+       357,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -323090,8 +331424,12 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -323189,7 +331527,7 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -323296,6 +331634,8 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -323307,7 +331647,7 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -323334,6 +331674,8 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -323344,6 +331686,8 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -323354,6 +331698,8 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -323369,8 +331715,8 @@ static const UV PL_P_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
-       353,    /* Number of elements */
+static const UV UNI_P_invlist[] = {  /* for EBCDIC 1047 */
+       365,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -323457,8 +331803,12 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -323556,7 +331906,7 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -323663,6 +332013,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -323674,7 +332026,7 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -323701,6 +332053,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -323711,6 +332065,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -323721,6 +332077,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -323736,8 +332094,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
-       351,    /* Number of elements */
+static const UV UNI_P_invlist[] = {  /* for EBCDIC 037 */
+       363,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -323822,8 +332180,12 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -323921,7 +332283,7 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x2E00,
        0x2E2F,
        0x2E30,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x3008,
@@ -324028,6 +332390,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -324039,7 +332403,7 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -324066,6 +332430,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -324076,6 +332442,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -324086,6 +332454,8 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -324096,7 +332466,7 @@ static const UV PL_P_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PALM_invlist[] = { /* for all charsets */
+static const UV UNI_PALM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324108,7 +332478,7 @@ static const UV PL_PALM_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PATSYN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PATSYN_invlist[] = {  /* for ASCII/Latin1 */
        57,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324179,7 +332549,7 @@ static const UV PL_PATSYN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PATSYN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PATSYN_invlist[] = {  /* for EBCDIC 1047 */
        61,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324254,7 +332624,7 @@ static const UV PL_PATSYN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PATSYN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PATSYN_invlist[] = {  /* for EBCDIC 037 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324322,7 +332692,7 @@ static const UV PL_PATSYN_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PAUC_invlist[] = { /* for all charsets */
+static const UV UNI_PAUC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324334,7 +332704,7 @@ static const UV PL_PAUC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PC_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PC_invlist[] = {  /* for ASCII/Latin1 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324361,7 +332731,7 @@ static const UV PL_PC_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PC_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PC_invlist[] = {  /* for EBCDIC 1047 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324388,7 +332758,7 @@ static const UV PL_PC_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PC_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PC_invlist[] = {  /* for EBCDIC 037 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324410,8 +332780,8 @@ static const UV PL_PC_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PCM_invlist[] = { /* for all charsets */
-       11,     /* Number of elements */
+static const UV UNI_PCM_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -324425,12 +332795,14 @@ static const UV PL_PCM_invlist[] = { /* for all charsets */
        0x8E2,
        0x8E3,
        0x110BD,
-       0x110BE
+       0x110BE,
+       0x110CD,
+       0x110CE
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PD_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PD_invlist[] = {  /* for ASCII/Latin1 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324479,7 +332851,7 @@ static const UV PL_PD_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PD_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PD_invlist[] = {  /* for EBCDIC 1047 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324528,7 +332900,7 @@ static const UV PL_PD_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PD_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PD_invlist[] = {  /* for EBCDIC 037 */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324574,7 +332946,7 @@ static const UV PL_PD_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PE_invlist[] = {  /* for ASCII/Latin1 */
        145,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324733,7 +333105,7 @@ static const UV PL_PE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PE_invlist[] = {  /* for EBCDIC 1047 */
        145,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -324892,7 +333264,7 @@ static const UV PL_PE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PE_invlist[] = {  /* for EBCDIC 037 */
        145,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325046,7 +333418,7 @@ static const UV PL_PE_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PERM_invlist[] = { /* for all charsets */
+static const UV UNI_PERM_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325060,7 +333432,7 @@ static const UV PL_PERM_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PF_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PF_invlist[] = {  /* for ASCII/Latin1 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325095,7 +333467,7 @@ static const UV PL_PF_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PF_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PF_invlist[] = {  /* for EBCDIC 1047 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325130,7 +333502,7 @@ static const UV PL_PF_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PF_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PF_invlist[] = {  /* for EBCDIC 037 */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325160,7 +333532,7 @@ static const UV PL_PF_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PHAG_invlist[] = { /* for all charsets */
+static const UV UNI_PHAG_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325174,7 +333546,7 @@ static const UV PL_PHAG_invlist[] = { /* for all charsets */
        0xA878
 };
 
-static const UV PL_PHAISTOS_invlist[] = { /* for all charsets */
+static const UV UNI_PHAISTOS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325184,7 +333556,7 @@ static const UV PL_PHAISTOS_invlist[] = { /* for all charsets */
        0x10200
 };
 
-static const UV PL_PHLI_invlist[] = { /* for all charsets */
+static const UV UNI_PHLI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325196,7 +333568,7 @@ static const UV PL_PHLI_invlist[] = { /* for all charsets */
        0x10B80
 };
 
-static const UV PL_PHLP_invlist[] = { /* for all charsets */
+static const UV UNI_PHLP_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325212,7 +333584,7 @@ static const UV PL_PHLP_invlist[] = { /* for all charsets */
        0x10BB0
 };
 
-static const UV PL_PHNX_invlist[] = { /* for all charsets */
+static const UV UNI_PHNX_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325224,7 +333596,7 @@ static const UV PL_PHNX_invlist[] = { /* for all charsets */
        0x10920
 };
 
-static const UV PL_PHONETICEXT_invlist[] = { /* for all charsets */
+static const UV UNI_PHONETICEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325234,7 +333606,7 @@ static const UV PL_PHONETICEXT_invlist[] = { /* for all charsets */
        0x1D80
 };
 
-static const UV PL_PHONETICEXTSUP_invlist[] = { /* for all charsets */
+static const UV UNI_PHONETICEXTSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325246,7 +333618,7 @@ static const UV PL_PHONETICEXTSUP_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PI_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PI_invlist[] = {  /* for ASCII/Latin1 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325283,7 +333655,7 @@ static const UV PL_PI_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PI_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PI_invlist[] = {  /* for EBCDIC 1047 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325320,7 +333692,7 @@ static const UV PL_PI_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PI_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PI_invlist[] = {  /* for EBCDIC 037 */
        23,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325352,7 +333724,7 @@ static const UV PL_PI_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PLAYINGCARDS_invlist[] = { /* for all charsets */
+static const UV UNI_PLAYINGCARDS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -325364,8 +333736,8 @@ static const UV PL_PLAYINGCARDS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
-       339,    /* Number of elements */
+static const UV UNI_PO_invlist[] = {  /* for ASCII/Latin1 */
+       351,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -325436,8 +333808,12 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -325539,7 +333915,7 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x2E41,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x303D,
@@ -325644,6 +334020,8 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -325655,7 +334033,7 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -325682,6 +334060,8 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -325692,6 +334072,8 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -325702,6 +334084,8 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -325717,8 +334101,8 @@ static const UV PL_PO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
-       343,    /* Number of elements */
+static const UV UNI_PO_invlist[] = {  /* for EBCDIC 1047 */
+       355,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -325793,8 +334177,12 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -325896,7 +334284,7 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x2E41,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x303D,
@@ -326001,6 +334389,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -326012,7 +334402,7 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -326039,6 +334429,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -326049,6 +334441,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -326059,6 +334453,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -326074,8 +334470,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
-       343,    /* Number of elements */
+static const UV UNI_PO_invlist[] = {  /* for EBCDIC 037 */
+       355,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -326150,8 +334546,12 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x971,
        0x9FD,
        0x9FE,
+       0xA76,
+       0xA77,
        0xAF0,
        0xAF1,
+       0xC84,
+       0xC85,
        0xDF4,
        0xDF5,
        0xE4F,
@@ -326253,7 +334653,7 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x2E41,
        0x2E42,
        0x2E43,
-       0x2E4A,
+       0x2E4F,
        0x3001,
        0x3004,
        0x303D,
@@ -326358,6 +334758,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BB,
@@ -326369,7 +334771,7 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x11174,
        0x11176,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111CE,
        0x111DB,
@@ -326396,6 +334798,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x1166D,
        0x1173C,
        0x1173F,
+       0x1183B,
+       0x1183C,
        0x11A3F,
        0x11A47,
        0x11A9A,
@@ -326406,6 +334810,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x11C46,
        0x11C70,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -326416,6 +334822,8 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
        0x16B3C,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E9B,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -326426,7 +334834,7 @@ static const UV PL_PO_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PRTI_invlist[] = { /* for all charsets */
+static const UV UNI_PRTI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326440,7 +334848,7 @@ static const UV PL_PRTI_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_PS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_PS_invlist[] = {  /* for ASCII/Latin1 */
        151,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326605,7 +335013,7 @@ static const UV PL_PS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_PS_invlist[] = {  /* for EBCDIC 1047 */
        151,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326770,7 +335178,7 @@ static const UV PL_PS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_PS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_PS_invlist[] = {  /* for EBCDIC 037 */
        151,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326930,7 +335338,7 @@ static const UV PL_PS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_PUA_invlist[] = { /* for all charsets */
+static const UV UNI_PUA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326940,7 +335348,7 @@ static const UV PL_PUA_invlist[] = { /* for all charsets */
        0xF900
 };
 
-static const UV PL_QAAI_invlist[] = { /* for all charsets */
+static const UV UNI_QAAI_invlist[] = {  /* for all charsets */
        33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -326982,7 +335390,7 @@ static const UV PL_QAAI_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_QMARK_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_QMARK_invlist[] = {  /* for ASCII/Latin1 */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327023,7 +335431,7 @@ static const UV PL_QMARK_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_QMARK_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_QMARK_invlist[] = {  /* for EBCDIC 1047 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327062,7 +335470,7 @@ static const UV PL_QMARK_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_QMARK_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_QMARK_invlist[] = {  /* for EBCDIC 037 */
        25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327096,7 +335504,7 @@ static const UV PL_QMARK_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_RADICAL_invlist[] = { /* for all charsets */
+static const UV UNI_RADICAL_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327110,7 +335518,7 @@ static const UV PL_RADICAL_invlist[] = { /* for all charsets */
        0x2FD6
 };
 
-static const UV PL_RI_invlist[] = { /* for all charsets */
+static const UV UNI_RI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327120,7 +335528,7 @@ static const UV PL_RI_invlist[] = { /* for all charsets */
        0x1F200
 };
 
-static const UV PL_RJNG_invlist[] = { /* for all charsets */
+static const UV UNI_RJNG_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327132,7 +335540,29 @@ static const UV PL_RJNG_invlist[] = { /* for all charsets */
        0xA960
 };
 
-static const UV PL_RUMI_invlist[] = { /* for all charsets */
+static const UV UNI_ROHG_invlist[] = {  /* for all charsets */
+       15,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x60C,
+       0x60D,
+       0x61B,
+       0x61C,
+       0x61F,
+       0x620,
+       0x640,
+       0x641,
+       0x6D4,
+       0x6D5,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A
+};
+
+static const UV UNI_RUMI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327142,7 +335572,7 @@ static const UV PL_RUMI_invlist[] = { /* for all charsets */
        0x10E80
 };
 
-static const UV PL_RUNR_invlist[] = { /* for all charsets */
+static const UV UNI_RUNR_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -327156,8 +335586,8 @@ static const UV PL_RUNR_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
-       435,    /* Number of elements */
+static const UV UNI_S_invlist[] = {  /* for ASCII/Latin1 */
+       441,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -327226,6 +335656,8 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x6FF,
        0x7F6,
        0x7F7,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FA,
@@ -327359,13 +335791,9 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -327532,6 +335960,10 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1EEF0,
        0x1EEF2,
        0x1F000,
@@ -327547,8 +335979,6 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -327567,11 +335997,11 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -327587,15 +336017,21 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -327605,8 +336041,8 @@ static const UV PL_S_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
-       441,    /* Number of elements */
+static const UV UNI_S_invlist[] = {  /* for EBCDIC 1047 */
+       447,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -327681,6 +336117,8 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x6FF,
        0x7F6,
        0x7F7,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FA,
@@ -327814,13 +336252,9 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -327987,6 +336421,10 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1EEF0,
        0x1EEF2,
        0x1F000,
@@ -328002,8 +336440,6 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -328022,11 +336458,11 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -328042,15 +336478,21 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -328060,8 +336502,8 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
-       439,    /* Number of elements */
+static const UV UNI_S_invlist[] = {  /* for EBCDIC 037 */
+       445,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -328134,6 +336576,8 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x6FF,
        0x7F6,
        0x7F7,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FA,
@@ -328267,13 +336711,9 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -328440,6 +336880,10 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
+       0x1ECB0,
+       0x1ECB1,
        0x1EEF0,
        0x1EEF2,
        0x1F000,
@@ -328455,8 +336899,6 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -328475,11 +336917,11 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -328495,20 +336937,26 @@ static const UV PL_S_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SAMR_invlist[] = { /* for all charsets */
+static const UV UNI_SAMR_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328520,7 +336968,7 @@ static const UV PL_SAMR_invlist[] = { /* for all charsets */
        0x83F
 };
 
-static const UV PL_SARB_invlist[] = { /* for all charsets */
+static const UV UNI_SARB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328530,7 +336978,7 @@ static const UV PL_SARB_invlist[] = { /* for all charsets */
        0x10A80
 };
 
-static const UV PL_SAUR_invlist[] = { /* for all charsets */
+static const UV UNI_SAUR_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328544,7 +336992,7 @@ static const UV PL_SAUR_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__AT_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SB__AT_invlist[] = {  /* for ASCII/Latin1 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328567,7 +337015,7 @@ static const UV PL_SB__AT_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__AT_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SB__AT_invlist[] = {  /* for EBCDIC 1047 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328590,7 +337038,7 @@ static const UV PL_SB__AT_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__AT_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SB__AT_invlist[] = {  /* for EBCDIC 037 */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328610,7 +337058,7 @@ static const UV PL_SB__AT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__CL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SB__CL_invlist[] = {  /* for ASCII/Latin1 */
        89,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328713,7 +337161,7 @@ static const UV PL_SB__CL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__CL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SB__CL_invlist[] = {  /* for EBCDIC 1047 */
        91,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328818,7 +337266,7 @@ static const UV PL_SB__CL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__CL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SB__CL_invlist[] = {  /* for EBCDIC 037 */
        89,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -328916,8 +337364,8 @@ static const UV PL_SB__CL_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SB__EX_invlist[] = { /* for all charsets */
-       533,    /* Number of elements */
+static const UV UNI_SB__EX_invlist[] = {  /* for all charsets */
+       557,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -328958,6 +337406,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -328968,7 +337418,7 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -328994,6 +337444,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -329049,7 +337501,7 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -329250,6 +337702,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -329312,6 +337766,10 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -329324,13 +337782,15 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -329340,7 +337800,7 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -329358,6 +337818,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -329372,6 +337834,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x116B8,
        0x1171D,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -329402,6 +337866,14 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -329458,8 +337930,8 @@ static const UV PL_SB__EX_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__FO_invlist[] = { /* for ASCII/Latin1 */
-       37,     /* Number of elements */
+static const UV UNI_SB__FO_invlist[] = {  /* for ASCII/Latin1 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -329494,6 +337966,8 @@ static const UV PL_SB__FO_invlist[] = { /* for ASCII/Latin1 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -329509,8 +337983,8 @@ static const UV PL_SB__FO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 1047 */
-       37,     /* Number of elements */
+static const UV UNI_SB__FO_invlist[] = {  /* for EBCDIC 1047 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -329545,6 +338019,8 @@ static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 1047 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -329560,8 +338036,8 @@ static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 037 */
-       37,     /* Number of elements */
+static const UV UNI_SB__FO_invlist[] = {  /* for EBCDIC 037 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -329596,6 +338072,8 @@ static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 037 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -329606,8 +338084,8 @@ static const UV PL_SB__FO_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SB__LE_invlist[] = { /* for all charsets */
-       965,    /* Number of elements */
+static const UV UNI_SB__LE_invlist[] = {  /* for all charsets */
+       989,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -329632,7 +338110,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x55A,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x620,
        0x64B,
@@ -329922,9 +338400,9 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x1082,
        0x108E,
        0x108F,
-       0x10D0,
-       0x10FB,
        0x10FC,
+       0x10FD,
+       0x1100,
        0x1249,
        0x124A,
        0x124E,
@@ -329987,7 +338465,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -330081,7 +338559,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -330091,7 +338569,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -330133,7 +338611,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -330321,7 +338799,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -330340,6 +338818,14 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x10B92,
        0x10C00,
        0x10C49,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -330348,6 +338834,8 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -330415,7 +338903,9 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118FF,
        0x11900,
        0x11A00,
@@ -330430,6 +338920,8 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -330448,6 +338940,16 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -330481,7 +338983,7 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -330580,8 +339082,8 @@ static const UV PL_SB__LE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__LO_invlist[] = { /* for ASCII/Latin1 */
-       1279,   /* Number of elements */
+static const UV UNI_SB__LO_invlist[] = {  /* for ASCII/Latin1 */
+       1289,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -331132,8 +339634,12 @@ static const UV PL_SB__LO_invlist[] = { /* for ASCII/Latin1 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -331780,10 +340286,14 @@ static const UV PL_SB__LO_invlist[] = { /* for ASCII/Latin1 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -331806,6 +340316,8 @@ static const UV PL_SB__LO_invlist[] = { /* for ASCII/Latin1 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -331873,8 +340385,8 @@ static const UV PL_SB__LO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 1047 */
-       1287,   /* Number of elements */
+static const UV UNI_SB__LO_invlist[] = {  /* for EBCDIC 1047 */
+       1297,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -332433,8 +340945,12 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 1047 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -333081,10 +341597,14 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 1047 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -333107,6 +341627,8 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 1047 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -333174,8 +341696,8 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 037 */
-       1287,   /* Number of elements */
+static const UV UNI_SB__LO_invlist[] = {  /* for EBCDIC 037 */
+       1297,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -333734,8 +342256,12 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 037 */
        0x52E,
        0x52F,
        0x530,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
+       0x10D0,
+       0x10FB,
+       0x10FD,
+       0x1100,
        0x13F8,
        0x13FE,
        0x1C80,
@@ -334382,10 +342908,14 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 037 */
        0xA7A8,
        0xA7A9,
        0xA7AA,
+       0xA7AF,
+       0xA7B0,
        0xA7B5,
        0xA7B6,
        0xA7B7,
        0xA7B8,
+       0xA7B9,
+       0xA7BA,
        0xA7F8,
        0xA7FB,
        0xAB30,
@@ -334408,6 +342938,8 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 037 */
        0x10CF3,
        0x118C0,
        0x118E0,
+       0x16E60,
+       0x16E80,
        0x1D41A,
        0x1D434,
        0x1D44E,
@@ -334472,7 +343004,7 @@ static const UV PL_SB__LO_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__SC_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SB__SC_invlist[] = {  /* for ASCII/Latin1 */
        39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334525,7 +343057,7 @@ static const UV PL_SB__SC_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SC_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SB__SC_invlist[] = {  /* for EBCDIC 1047 */
        41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334580,7 +343112,7 @@ static const UV PL_SB__SC_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SC_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SB__SC_invlist[] = {  /* for EBCDIC 037 */
        41,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334632,7 +343164,7 @@ static const UV PL_SB__SC_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__SE_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SB__SE_invlist[] = {  /* for ASCII/Latin1 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334651,7 +343183,7 @@ static const UV PL_SB__SE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SE_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SB__SE_invlist[] = {  /* for EBCDIC 1047 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334670,7 +343202,7 @@ static const UV PL_SB__SE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SE_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SB__SE_invlist[] = {  /* for EBCDIC 037 */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334686,7 +343218,7 @@ static const UV PL_SB__SE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__SP_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SB__SP_invlist[] = {  /* for ASCII/Latin1 */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334719,7 +343251,7 @@ static const UV PL_SB__SP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SP_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SB__SP_invlist[] = {  /* for EBCDIC 1047 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334750,7 +343282,7 @@ static const UV PL_SB__SP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__SP_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SB__SP_invlist[] = {  /* for EBCDIC 037 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -334778,8 +343310,8 @@ static const UV PL_SB__SP_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
-       131,    /* Number of elements */
+static const UV UNI_SB__ST_invlist[] = {  /* for ASCII/Latin1 */
+       143,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -334790,7 +343322,7 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
        0x40,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -334798,6 +343330,12 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -334868,6 +343406,8 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -334902,6 +343442,8 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -334910,6 +343452,8 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -334923,8 +343467,8 @@ static const UV PL_SB__ST_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
-       131,    /* Number of elements */
+static const UV UNI_SB__ST_invlist[] = {  /* for EBCDIC 1047 */
+       143,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -334935,7 +343479,7 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
        0x70,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -334943,6 +343487,12 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -335013,6 +343563,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -335047,6 +343599,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -335055,6 +343609,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -335068,8 +343624,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
-       131,    /* Number of elements */
+static const UV UNI_SB__ST_invlist[] = {  /* for EBCDIC 037 */
+       143,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -335080,7 +343636,7 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
        0x70,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -335088,6 +343644,12 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -335158,6 +343720,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -335192,6 +343756,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -335200,6 +343766,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -335210,8 +343778,8 @@ static const UV PL_SB__ST_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__UP_invlist[] = { /* for ASCII/Latin1 */
-       1271,   /* Number of elements */
+static const UV UNI_SB__UP_invlist[] = {  /* for ASCII/Latin1 */
+       1279,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -335768,6 +344336,10 @@ static const UV PL_SB__UP_invlist[] = { /* for ASCII/Latin1 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -336406,6 +344978,8 @@ static const UV PL_SB__UP_invlist[] = { /* for ASCII/Latin1 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -336416,6 +344990,8 @@ static const UV PL_SB__UP_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -336495,8 +345071,8 @@ static const UV PL_SB__UP_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 1047 */
-       1289,   /* Number of elements */
+static const UV UNI_SB__UP_invlist[] = {  /* for EBCDIC 1047 */
+       1297,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -337071,6 +345647,10 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 1047 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -337709,6 +346289,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 1047 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -337719,6 +346301,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -337798,8 +346382,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 037 */
-       1285,   /* Number of elements */
+static const UV UNI_SB__UP_invlist[] = {  /* for EBCDIC 037 */
+       1293,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -338370,6 +346954,10 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 037 */
        0x10CE,
        0x13A0,
        0x13F6,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1E00,
        0x1E01,
        0x1E02,
@@ -339008,6 +347596,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 037 */
        0xA7B5,
        0xA7B6,
        0xA7B7,
+       0xA7B8,
+       0xA7B9,
        0xFF21,
        0xFF3B,
        0x10400,
@@ -339018,6 +347608,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x118A0,
        0x118C0,
+       0x16E40,
+       0x16E60,
        0x1D400,
        0x1D41A,
        0x1D434,
@@ -339094,8 +347686,8 @@ static const UV PL_SB__UP_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
-       1523,   /* Number of elements */
+static const UV UNI_SB__XX_invlist[] = {  /* for ASCII/Latin1 */
+       1565,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -339174,9 +347766,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
-       0x589,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -339190,7 +347780,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -339200,7 +347790,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x66A,
        0x66B,
        0x66D,
@@ -339220,8 +347810,16 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7F8,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x85C,
        0x860,
@@ -339230,7 +347828,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x970,
        0x971,
        0x984,
@@ -339262,6 +347860,8 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -339385,8 +347985,6 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -339639,7 +348237,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -339692,6 +348290,10 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1C4A,
        0x1C4D,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -339887,7 +348489,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -339897,7 +348499,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -339921,9 +348523,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -339939,8 +348539,6 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA92F,
        0xA954,
@@ -340173,7 +348771,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -340202,6 +348800,18 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11049,
        0x11066,
@@ -340210,6 +348820,8 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x110BB,
        0x110BD,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -340219,14 +348831,14 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11136,
        0x11140,
        0x11141,
-       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CE,
        0x111D0,
        0x111DB,
@@ -340270,7 +348882,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -340290,6 +348902,8 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -340315,13 +348929,15 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -340337,7 +348953,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11A86,
        0x11A9A,
        0x11A9B,
-       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -340368,6 +348984,20 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -340400,6 +349030,10 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -340409,7 +349043,7 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -340631,8 +349265,8 @@ static const UV PL_SB__XX_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
-       1543,   /* Number of elements */
+static const UV UNI_SB__XX_invlist[] = {  /* for EBCDIC 1047 */
+       1585,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -340731,9 +349365,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
-       0x589,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -340747,7 +349379,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -340757,7 +349389,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x66A,
        0x66B,
        0x66D,
@@ -340777,8 +349409,16 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7F8,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x85C,
        0x860,
@@ -340787,7 +349427,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x970,
        0x971,
        0x984,
@@ -340819,6 +349459,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -340942,8 +349584,6 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -341196,7 +349836,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -341249,6 +349889,10 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1C4A,
        0x1C4D,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -341444,7 +350088,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -341454,7 +350098,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -341478,9 +350122,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -341496,8 +350138,6 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA92F,
        0xA954,
@@ -341730,7 +350370,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -341759,6 +350399,18 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11049,
        0x11066,
@@ -341767,6 +350419,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -341776,14 +350430,14 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11136,
        0x11140,
        0x11141,
-       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CE,
        0x111D0,
        0x111DB,
@@ -341827,7 +350481,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -341847,6 +350501,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -341872,13 +350528,15 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -341894,7 +350552,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11A86,
        0x11A9A,
        0x11A9B,
-       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -341925,6 +350583,20 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -341957,6 +350629,10 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -341966,7 +350642,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -342188,8 +350864,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
-       1541,   /* Number of elements */
+static const UV UNI_SB__XX_invlist[] = {  /* for EBCDIC 037 */
+       1583,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -342286,9 +350962,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x55A,
        0x55D,
        0x55E,
-       0x561,
-       0x588,
-       0x589,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -342302,7 +350976,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F4,
        0x600,
        0x606,
@@ -342312,7 +350986,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x61B,
        0x61C,
        0x61D,
-       0x61F,
+       0x61E,
        0x66A,
        0x66B,
        0x66D,
@@ -342332,8 +351006,16 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7F8,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x840,
        0x85C,
        0x860,
@@ -342342,7 +351024,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x970,
        0x971,
        0x984,
@@ -342374,6 +351056,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -342497,8 +351181,6 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -342751,7 +351433,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -342804,6 +351486,10 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1C4A,
        0x1C4D,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -342999,7 +351685,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -343009,7 +351695,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -343033,9 +351719,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -343051,8 +351735,6 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA92F,
        0xA954,
@@ -343285,7 +351967,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -343314,6 +351996,18 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
+       0x10F55,
+       0x10F5A,
        0x11000,
        0x11049,
        0x11066,
@@ -343322,6 +352016,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -343331,14 +352027,14 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11136,
        0x11140,
        0x11141,
-       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C7,
-       0x111CA,
+       0x111C9,
        0x111CE,
        0x111D0,
        0x111DB,
@@ -343382,7 +352078,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -343402,6 +352098,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1144D,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -343427,13 +352125,15 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
        0x1173C,
        0x1173F,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -343449,7 +352149,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11A86,
        0x11A9A,
        0x11A9B,
-       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -343480,6 +352180,20 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -343512,6 +352226,10 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
+       0x16E98,
+       0x16E99,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -343521,7 +352239,7 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -343740,8 +352458,8 @@ static const UV PL_SB__XX_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SC_invlist[] = { /* for ASCII/Latin1 */
-       35,     /* Number of elements */
+static const UV UNI_SC_invlist[] = {  /* for ASCII/Latin1 */
+       39,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -343754,6 +352472,8 @@ static const UV PL_SC_invlist[] = { /* for ASCII/Latin1 */
        0x590,
        0x60B,
        0x60C,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FB,
@@ -343779,7 +352499,9 @@ static const UV PL_SC_invlist[] = { /* for ASCII/Latin1 */
        0xFFE0,
        0xFFE2,
        0xFFE5,
-       0xFFE7
+       0xFFE7,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -343789,8 +352511,8 @@ static const UV PL_SC_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC_invlist[] = { /* for EBCDIC 1047 */
-       39,     /* Number of elements */
+static const UV UNI_SC_invlist[] = {  /* for EBCDIC 1047 */
+       43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -343807,6 +352529,8 @@ static const UV PL_SC_invlist[] = { /* for EBCDIC 1047 */
        0x590,
        0x60B,
        0x60C,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FB,
@@ -343832,7 +352556,9 @@ static const UV PL_SC_invlist[] = { /* for EBCDIC 1047 */
        0xFFE0,
        0xFFE2,
        0xFFE5,
-       0xFFE7
+       0xFFE7,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -343842,8 +352568,8 @@ static const UV PL_SC_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC_invlist[] = { /* for EBCDIC 037 */
-       39,     /* Number of elements */
+static const UV UNI_SC_invlist[] = {  /* for EBCDIC 037 */
+       43,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -343860,6 +352586,8 @@ static const UV PL_SC_invlist[] = { /* for EBCDIC 037 */
        0x590,
        0x60B,
        0x60C,
+       0x7FE,
+       0x800,
        0x9F2,
        0x9F4,
        0x9FB,
@@ -343885,12 +352613,14 @@ static const UV PL_SC_invlist[] = { /* for EBCDIC 037 */
        0xFFE0,
        0xFFE2,
        0xFFE5,
-       0xFFE7
+       0xFFE7,
+       0x1ECB0,
+       0x1ECB1
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SC__ADLM_invlist[] = { /* for all charsets */
+static const UV UNI_SC__ADLM_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -343904,7 +352634,7 @@ static const UV PL_SC__ADLM_invlist[] = { /* for all charsets */
        0x1E960
 };
 
-static const UV PL_SC__ARAB_invlist[] = { /* for all charsets */
+static const UV UNI_SC__ARAB_invlist[] = {  /* for all charsets */
        115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -343936,7 +352666,7 @@ static const UV PL_SC__ARAB_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x900,
@@ -344026,8 +352756,8 @@ static const UV PL_SC__ARAB_invlist[] = { /* for all charsets */
        0x1EEF2
 };
 
-static const UV PL_SC__ARMN_invlist[] = { /* for all charsets */
-       13,     /* Number of elements */
+static const UV UNI_SC__ARMN_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -344035,9 +352765,7 @@ static const UV PL_SC__ARMN_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
+       0x589,
        0x58A,
        0x58B,
        0x58D,
@@ -344046,7 +352774,7 @@ static const UV PL_SC__ARMN_invlist[] = { /* for all charsets */
        0xFB18
 };
 
-static const UV PL_SC__BENG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__BENG_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344079,10 +352807,10 @@ static const UV PL_SC__BENG_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE
+       0x9FF
 };
 
-static const UV PL_SC__BOPO_invlist[] = { /* for all charsets */
+static const UV UNI_SC__BOPO_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344091,12 +352819,12 @@ static const UV PL_SC__BOPO_invlist[] = { /* for all charsets */
        0x2EA,
        0x2EC,
        0x3105,
-       0x312F,
+       0x3130,
        0x31A0,
        0x31BB
 };
 
-static const UV PL_SC__BUGI_invlist[] = { /* for all charsets */
+static const UV UNI_SC__BUGI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344108,7 +352836,7 @@ static const UV PL_SC__BUGI_invlist[] = { /* for all charsets */
        0x1A20
 };
 
-static const UV PL_SC__BUHD_invlist[] = { /* for all charsets */
+static const UV UNI_SC__BUHD_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344118,7 +352846,7 @@ static const UV PL_SC__BUHD_invlist[] = { /* for all charsets */
        0x1754
 };
 
-static const UV PL_SC__CAKM_invlist[] = { /* for all charsets */
+static const UV UNI_SC__CAKM_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344127,10 +352855,10 @@ static const UV PL_SC__CAKM_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144
+       0x11147
 };
 
-static const UV PL_SC__COPT_invlist[] = { /* for all charsets */
+static const UV UNI_SC__COPT_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344144,7 +352872,7 @@ static const UV PL_SC__COPT_invlist[] = { /* for all charsets */
        0x2D00
 };
 
-static const UV PL_SC__CPRT_invlist[] = { /* for all charsets */
+static const UV UNI_SC__CPRT_invlist[] = {  /* for all charsets */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344164,7 +352892,7 @@ static const UV PL_SC__CPRT_invlist[] = { /* for all charsets */
        0x10840
 };
 
-static const UV PL_SC__CYRL_invlist[] = { /* for all charsets */
+static const UV UNI_SC__CYRL_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344188,7 +352916,7 @@ static const UV PL_SC__CYRL_invlist[] = { /* for all charsets */
        0xFE30
 };
 
-static const UV PL_SC__DEVA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__DEVA_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344201,10 +352929,20 @@ static const UV PL_SC__DEVA_invlist[] = { /* for all charsets */
        0x966,
        0x980,
        0xA8E0,
-       0xA8FE
+       0xA900
+};
+
+static const UV UNI_SC__DOGR_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11800,
+       0x1183C
 };
 
-static const UV PL_SC__DUPL_invlist[] = { /* for all charsets */
+static const UV UNI_SC__DUPL_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344222,8 +352960,8 @@ static const UV PL_SC__DUPL_invlist[] = { /* for all charsets */
        0x1BCA0
 };
 
-static const UV PL_SC__GEOR_invlist[] = { /* for all charsets */
-       17,     /* Number of elements */
+static const UV UNI_SC__GEOR_invlist[] = {  /* for all charsets */
+       21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -344238,6 +352976,10 @@ static const UV PL_SC__GEOR_invlist[] = { /* for all charsets */
        0x10FB,
        0x10FC,
        0x1100,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x2D00,
        0x2D26,
        0x2D27,
@@ -344246,7 +352988,7 @@ static const UV PL_SC__GEOR_invlist[] = { /* for all charsets */
        0x2D2E
 };
 
-static const UV PL_SC__GLAG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__GLAG_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344268,7 +353010,27 @@ static const UV PL_SC__GLAG_invlist[] = { /* for all charsets */
        0x1E02B
 };
 
-static const UV PL_SC__GRAN_invlist[] = { /* for all charsets */
+static const UV UNI_SC__GONG_invlist[] = {  /* for all charsets */
+       13,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA
+};
+
+static const UV UNI_SC__GRAN_invlist[] = {  /* for all charsets */
        31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344306,7 +353068,7 @@ static const UV PL_SC__GRAN_invlist[] = { /* for all charsets */
        0x11375
 };
 
-static const UV PL_SC__GREK_invlist[] = { /* for all charsets */
+static const UV UNI_SC__GREK_invlist[] = {  /* for all charsets */
        73,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344386,7 +353148,7 @@ static const UV PL_SC__GREK_invlist[] = { /* for all charsets */
        0x1D246
 };
 
-static const UV PL_SC__GUJR_invlist[] = { /* for all charsets */
+static const UV UNI_SC__GUJR_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344422,7 +353184,7 @@ static const UV PL_SC__GUJR_invlist[] = { /* for all charsets */
        0xB00
 };
 
-static const UV PL_SC__GURU_invlist[] = { /* for all charsets */
+static const UV UNI_SC__GURU_invlist[] = {  /* for all charsets */
        33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344459,10 +353221,10 @@ static const UV PL_SC__GURU_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76
+       0xA77
 };
 
-static const UV PL_SC__HAN_invlist[] = { /* for all charsets */
+static const UV UNI_SC__HAN_invlist[] = {  /* for all charsets */
        35,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344485,7 +353247,7 @@ static const UV PL_SC__HAN_invlist[] = { /* for all charsets */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xF900,
        0xFA6E,
        0xFA70,
@@ -344504,7 +353266,7 @@ static const UV PL_SC__HAN_invlist[] = { /* for all charsets */
        0x2FA1E
 };
 
-static const UV PL_SC__HANG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__HANG_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344540,7 +353302,7 @@ static const UV PL_SC__HANG_invlist[] = { /* for all charsets */
        0xFFDD
 };
 
-static const UV PL_SC__HANO_invlist[] = { /* for all charsets */
+static const UV UNI_SC__HANO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344550,7 +353312,7 @@ static const UV PL_SC__HANO_invlist[] = { /* for all charsets */
        0x1735
 };
 
-static const UV PL_SC__HIRA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__HIRA_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344566,7 +353328,7 @@ static const UV PL_SC__HIRA_invlist[] = { /* for all charsets */
        0x1F201
 };
 
-static const UV PL_SC__JAVA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__JAVA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344580,7 +353342,7 @@ static const UV PL_SC__JAVA_invlist[] = { /* for all charsets */
        0xA9E0
 };
 
-static const UV PL_SC__KALI_invlist[] = { /* for all charsets */
+static const UV UNI_SC__KALI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344592,7 +353354,7 @@ static const UV PL_SC__KALI_invlist[] = { /* for all charsets */
        0xA930
 };
 
-static const UV PL_SC__KANA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__KANA_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344616,7 +353378,7 @@ static const UV PL_SC__KANA_invlist[] = { /* for all charsets */
        0x1B001
 };
 
-static const UV PL_SC__KHOJ_invlist[] = { /* for all charsets */
+static const UV UNI_SC__KHOJ_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344628,15 +353390,13 @@ static const UV PL_SC__KHOJ_invlist[] = { /* for all charsets */
        0x1123F
 };
 
-static const UV PL_SC__KNDA_invlist[] = { /* for all charsets */
-       29,     /* Number of elements */
+static const UV UNI_SC__KNDA_invlist[] = {  /* for all charsets */
+       27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xC80,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -344664,20 +353424,22 @@ static const UV PL_SC__KNDA_invlist[] = { /* for all charsets */
        0xCF3
 };
 
-static const UV PL_SC__KTHI_invlist[] = { /* for all charsets */
-       3,      /* Number of elements */
+static const UV UNI_SC__KTHI_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0x11080,
-       0x110C2
+       0x110C2,
+       0x110CD,
+       0x110CE
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SC__LATN_invlist[] = { /* for ASCII/Latin1 */
-       63,     /* Number of elements */
+static const UV UNI_SC__LATN_invlist[] = {  /* for ASCII/Latin1 */
+       61,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -344729,9 +353491,7 @@ static const UV PL_SC__LATN_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xAB30,
@@ -344753,8 +353513,8 @@ static const UV PL_SC__LATN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 1047 */
-       89,     /* Number of elements */
+static const UV UNI_SC__LATN_invlist[] = {  /* for EBCDIC 1047 */
+       87,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -344832,9 +353592,7 @@ static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xAB30,
@@ -344856,8 +353614,8 @@ static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 037 */
-       85,     /* Number of elements */
+static const UV UNI_SC__LATN_invlist[] = {  /* for EBCDIC 037 */
+       83,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -344931,9 +353689,7 @@ static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA788,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA800,
        0xAB30,
@@ -344950,7 +353706,7 @@ static const UV PL_SC__LATN_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SC__LIMB_invlist[] = { /* for all charsets */
+static const UV UNI_SC__LIMB_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344968,7 +353724,7 @@ static const UV PL_SC__LIMB_invlist[] = { /* for all charsets */
        0x1950
 };
 
-static const UV PL_SC__LINA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__LINA_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -344982,7 +353738,7 @@ static const UV PL_SC__LINA_invlist[] = { /* for all charsets */
        0x10768
 };
 
-static const UV PL_SC__LINB_invlist[] = { /* for all charsets */
+static const UV UNI_SC__LINB_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345004,7 +353760,7 @@ static const UV PL_SC__LINB_invlist[] = { /* for all charsets */
        0x100FB
 };
 
-static const UV PL_SC__MAHJ_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MAHJ_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345014,7 +353770,7 @@ static const UV PL_SC__MAHJ_invlist[] = { /* for all charsets */
        0x11177
 };
 
-static const UV PL_SC__MAND_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MAND_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345026,7 +353782,7 @@ static const UV PL_SC__MAND_invlist[] = { /* for all charsets */
        0x85F
 };
 
-static const UV PL_SC__MANI_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MANI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345038,7 +353794,7 @@ static const UV PL_SC__MANI_invlist[] = { /* for all charsets */
        0x10AF7
 };
 
-static const UV PL_SC__MLYM_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MLYM_invlist[] = {  /* for all charsets */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345062,7 +353818,7 @@ static const UV PL_SC__MLYM_invlist[] = { /* for all charsets */
        0xD80
 };
 
-static const UV PL_SC__MODI_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MODI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345074,7 +353830,7 @@ static const UV PL_SC__MODI_invlist[] = { /* for all charsets */
        0x1165A
 };
 
-static const UV PL_SC__MONG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MONG_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345089,14 +353845,14 @@ static const UV PL_SC__MONG_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x11660,
        0x1166D
 };
 
-static const UV PL_SC__MULT_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MULT_invlist[] = {  /* for all charsets */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345114,7 +353870,7 @@ static const UV PL_SC__MULT_invlist[] = { /* for all charsets */
        0x112AA
 };
 
-static const UV PL_SC__MYMR_invlist[] = { /* for all charsets */
+static const UV UNI_SC__MYMR_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345128,7 +353884,7 @@ static const UV PL_SC__MYMR_invlist[] = { /* for all charsets */
        0xAA80
 };
 
-static const UV PL_SC__ORYA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__ORYA_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345164,7 +353920,7 @@ static const UV PL_SC__ORYA_invlist[] = { /* for all charsets */
        0xB78
 };
 
-static const UV PL_SC__PERM_invlist[] = { /* for all charsets */
+static const UV UNI_SC__PERM_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345174,7 +353930,7 @@ static const UV PL_SC__PERM_invlist[] = { /* for all charsets */
        0x1037B
 };
 
-static const UV PL_SC__PHAG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__PHAG_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345184,7 +353940,7 @@ static const UV PL_SC__PHAG_invlist[] = { /* for all charsets */
        0xA878
 };
 
-static const UV PL_SC__PHLP_invlist[] = { /* for all charsets */
+static const UV UNI_SC__PHLP_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345198,8 +353954,8 @@ static const UV PL_SC__PHLP_invlist[] = { /* for all charsets */
        0x10BB0
 };
 
-static const UV PL_SC__QAAI_invlist[] = { /* for all charsets */
-       55,     /* Number of elements */
+static const UV UNI_SC__QAAI_invlist[] = {  /* for all charsets */
+       57,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -345248,6 +354004,8 @@ static const UV PL_SC__QAAI_invlist[] = { /* for all charsets */
        0x101FE,
        0x102E0,
        0x102E1,
+       0x1133B,
+       0x1133C,
        0x1D167,
        0x1D16A,
        0x1D17B,
@@ -345260,7 +354018,19 @@ static const UV PL_SC__QAAI_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_SC__SHRD_invlist[] = { /* for all charsets */
+static const UV UNI_SC__ROHG_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A
+};
+
+static const UV UNI_SC__SHRD_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345272,7 +354042,7 @@ static const UV PL_SC__SHRD_invlist[] = { /* for all charsets */
        0x111E0
 };
 
-static const UV PL_SC__SIND_invlist[] = { /* for all charsets */
+static const UV UNI_SC__SIND_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345284,7 +354054,7 @@ static const UV PL_SC__SIND_invlist[] = { /* for all charsets */
        0x112FA
 };
 
-static const UV PL_SC__SINH_invlist[] = { /* for all charsets */
+static const UV UNI_SC__SINH_invlist[] = {  /* for all charsets */
        27,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345318,7 +354088,17 @@ static const UV PL_SC__SINH_invlist[] = { /* for all charsets */
        0x111F5
 };
 
-static const UV PL_SC__SYLO_invlist[] = { /* for all charsets */
+static const UV UNI_SC__SOGD_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10F30,
+       0x10F5A
+};
+
+static const UV UNI_SC__SYLO_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345328,7 +354108,7 @@ static const UV PL_SC__SYLO_invlist[] = { /* for all charsets */
        0xA82C
 };
 
-static const UV PL_SC__SYRC_invlist[] = { /* for all charsets */
+static const UV UNI_SC__SYRC_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345344,7 +354124,7 @@ static const UV PL_SC__SYRC_invlist[] = { /* for all charsets */
        0x86B
 };
 
-static const UV PL_SC__TAGB_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TAGB_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345358,7 +354138,7 @@ static const UV PL_SC__TAGB_invlist[] = { /* for all charsets */
        0x1774
 };
 
-static const UV PL_SC__TAKR_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TAKR_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345370,7 +354150,7 @@ static const UV PL_SC__TAKR_invlist[] = { /* for all charsets */
        0x116CA
 };
 
-static const UV PL_SC__TALE_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TALE_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345382,7 +354162,7 @@ static const UV PL_SC__TALE_invlist[] = { /* for all charsets */
        0x1975
 };
 
-static const UV PL_SC__TAML_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TAML_invlist[] = {  /* for all charsets */
        33,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345422,15 +354202,13 @@ static const UV PL_SC__TAML_invlist[] = { /* for all charsets */
        0xBFB
 };
 
-static const UV PL_SC__TELU_invlist[] = { /* for all charsets */
-       27,     /* Number of elements */
+static const UV UNI_SC__TELU_invlist[] = {  /* for all charsets */
+       25,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -345456,7 +354234,7 @@ static const UV PL_SC__TELU_invlist[] = { /* for all charsets */
        0xC80
 };
 
-static const UV PL_SC__TGLG_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TGLG_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345468,7 +354246,7 @@ static const UV PL_SC__TGLG_invlist[] = { /* for all charsets */
        0x1715
 };
 
-static const UV PL_SC__THAA_invlist[] = { /* for all charsets */
+static const UV UNI_SC__THAA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345478,7 +354256,7 @@ static const UV PL_SC__THAA_invlist[] = { /* for all charsets */
        0x7B2
 };
 
-static const UV PL_SC__TIRH_invlist[] = { /* for all charsets */
+static const UV UNI_SC__TIRH_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345490,7 +354268,7 @@ static const UV PL_SC__TIRH_invlist[] = { /* for all charsets */
        0x114DA
 };
 
-static const UV PL_SC__YI_invlist[] = { /* for all charsets */
+static const UV UNI_SC__YI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -345504,8 +354282,8 @@ static const UV PL_SC__YI_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
-       328,    /* Number of elements */
+static const UV UNI_SC__ZYYY_invlist[] = {  /* for ASCII/Latin1 */
+       332,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -345614,15 +354392,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -345721,10 +354495,12 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -345767,6 +354543,8 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -345782,8 +354560,6 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -345804,11 +354580,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -345824,15 +354600,21 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -345846,8 +354628,8 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
-       354,    /* Number of elements */
+static const UV UNI_SC__ZYYY_invlist[] = {  /* for EBCDIC 1047 */
+       358,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -345982,15 +354764,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -346089,10 +354867,12 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -346135,6 +354915,8 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -346150,8 +354932,6 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -346172,11 +354952,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -346192,15 +354972,21 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -346214,8 +355000,8 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
-       350,    /* Number of elements */
+static const UV UNI_SC__ZYYY_invlist[] = {  /* for EBCDIC 037 */
+       354,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -346346,15 +355132,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -346453,10 +355235,12 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -346499,6 +355283,8 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -346514,8 +355300,6 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -346536,11 +355320,11 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -346556,15 +355340,21 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -346575,7 +355365,7 @@ static const UV PL_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SD_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SD_invlist[] = {  /* for ASCII/Latin1 */
        63,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346652,7 +355442,7 @@ static const UV PL_SD_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SD_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SD_invlist[] = {  /* for EBCDIC 1047 */
        65,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346731,7 +355521,7 @@ static const UV PL_SD_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SD_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SD_invlist[] = {  /* for EBCDIC 037 */
        65,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346805,7 +355595,7 @@ static const UV PL_SD_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SGNW_invlist[] = { /* for all charsets */
+static const UV UNI_SGNW_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346819,7 +355609,7 @@ static const UV PL_SGNW_invlist[] = { /* for all charsets */
        0x1DAB0
 };
 
-static const UV PL_SHAW_invlist[] = { /* for all charsets */
+static const UV UNI_SHAW_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346829,7 +355619,7 @@ static const UV PL_SHAW_invlist[] = { /* for all charsets */
        0x10480
 };
 
-static const UV PL_SHORTHANDFORMATCONTROLS_invlist[] = { /* for all charsets */
+static const UV UNI_SHORTHANDFORMATCONTROLS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346839,7 +355629,7 @@ static const UV PL_SHORTHANDFORMATCONTROLS_invlist[] = { /* for all charsets */
        0x1BCB0
 };
 
-static const UV PL_SHRD_invlist[] = { /* for all charsets */
+static const UV UNI_SHRD_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346861,7 +355651,7 @@ static const UV PL_SHRD_invlist[] = { /* for all charsets */
        0x111E0
 };
 
-static const UV PL_SIDD_invlist[] = { /* for all charsets */
+static const UV UNI_SIDD_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346873,7 +355663,7 @@ static const UV PL_SIDD_invlist[] = { /* for all charsets */
        0x115DE
 };
 
-static const UV PL_SIND_invlist[] = { /* for all charsets */
+static const UV UNI_SIND_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346889,7 +355679,7 @@ static const UV PL_SIND_invlist[] = { /* for all charsets */
        0x112FA
 };
 
-static const UV PL_SINH_invlist[] = { /* for all charsets */
+static const UV UNI_SINH_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346925,7 +355715,7 @@ static const UV PL_SINH_invlist[] = { /* for all charsets */
        0x111F5
 };
 
-static const UV PL_SINHALAARCHAICNUMBERS_invlist[] = { /* for all charsets */
+static const UV UNI_SINHALAARCHAICNUMBERS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -346937,7 +355727,7 @@ static const UV PL_SINHALAARCHAICNUMBERS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SK_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SK_invlist[] = {  /* for ASCII/Latin1 */
        59,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347010,7 +355800,7 @@ static const UV PL_SK_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SK_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SK_invlist[] = {  /* for EBCDIC 1047 */
        57,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347081,7 +355871,7 @@ static const UV PL_SK_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SK_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SK_invlist[] = {  /* for EBCDIC 037 */
        55,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347147,7 +355937,7 @@ static const UV PL_SK_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SM_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_SM_invlist[] = {  /* for ASCII/Latin1 */
        129,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347290,7 +356080,7 @@ static const UV PL_SM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SM_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_SM_invlist[] = {  /* for EBCDIC 1047 */
        131,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347435,7 +356225,7 @@ static const UV PL_SM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SM_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_SM_invlist[] = {  /* for EBCDIC 037 */
        131,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347575,7 +356365,7 @@ static const UV PL_SM_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SMALLFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_SMALLFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -347587,8 +356377,8 @@ static const UV PL_SMALLFORMS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
-       347,    /* Number of elements */
+static const UV UNI_SO_invlist[] = {  /* for ASCII/Latin1 */
+       349,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -347752,13 +356542,9 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -347875,6 +356661,8 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -347888,8 +356676,6 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -347910,11 +356696,11 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -347930,15 +356716,21 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* ASCII/Latin1 */
@@ -347948,8 +356740,8 @@ static const UV PL_SO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
-       347,    /* Number of elements */
+static const UV UNI_SO_invlist[] = {  /* for EBCDIC 1047 */
+       349,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -348113,13 +356905,9 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -348236,6 +357024,8 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -348249,8 +357039,6 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -348271,11 +357059,11 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -348291,15 +357079,21 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 1047 */
@@ -348309,8 +357103,8 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
-       347,    /* Number of elements */
+static const UV UNI_SO_invlist[] = {  /* for EBCDIC 037 */
+       349,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -348474,13 +357268,9 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2CE5,
        0x2CEB,
        0x2E80,
@@ -348597,6 +357387,8 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
        0x1DA84,
        0x1DA85,
        0x1DA87,
+       0x1ECAC,
+       0x1ECAD,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -348610,8 +357402,6 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
        0x1F0D1,
        0x1F0F6,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -348632,11 +357422,11 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -348652,20 +357442,48 @@ static const UV PL_SO_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E
 };
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SORA_invlist[] = { /* for all charsets */
+static const UV UNI_SOGD_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x640,
+       0x641,
+       0x10F30,
+       0x10F5A
+};
+
+static const UV UNI_SOGO_invlist[] = {  /* for all charsets */
+       3,      /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x10F00,
+       0x10F28
+};
+
+static const UV UNI_SORA_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -348677,8 +357495,8 @@ static const UV PL_SORA_invlist[] = { /* for all charsets */
        0x110FA
 };
 
-static const UV PL_SOYO_invlist[] = { /* for all charsets */
-       7,      /* Number of elements */
+static const UV UNI_SOYO_invlist[] = {  /* for all charsets */
+       5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -348686,12 +357504,10 @@ static const UV PL_SOYO_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3
 };
 
-static const UV PL_SPECIALS_invlist[] = { /* for all charsets */
+static const UV UNI_SPECIALS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -348703,8 +357519,8 @@ static const UV PL_SPECIALS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
-       137,    /* Number of elements */
+static const UV UNI_STERM_invlist[] = {  /* for ASCII/Latin1 */
+       149,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -348717,7 +357533,7 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
        0x40,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -348725,6 +357541,12 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -348799,6 +357621,8 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -348833,6 +357657,8 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -348841,6 +357667,8 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -348854,8 +357682,8 @@ static const UV PL_STERM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
-       137,    /* Number of elements */
+static const UV UNI_STERM_invlist[] = {  /* for EBCDIC 1047 */
+       149,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -348868,7 +357696,7 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
        0x70,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -348876,6 +357704,12 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -348950,6 +357784,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -348984,6 +357820,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -348992,6 +357830,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -349005,8 +357845,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
-       137,    /* Number of elements */
+static const UV UNI_STERM_invlist[] = {  /* for EBCDIC 037 */
+       149,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -349019,7 +357859,7 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
        0x70,
        0x589,
        0x58A,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -349027,6 +357867,12 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
        0x703,
        0x7F9,
        0x7FA,
+       0x837,
+       0x838,
+       0x839,
+       0x83A,
+       0x83D,
+       0x83F,
        0x964,
        0x966,
        0x104A,
@@ -349101,6 +357947,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
        0xFF62,
        0x10A56,
        0x10A58,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x11049,
        0x110BE,
@@ -349135,6 +357983,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
        0x11A9D,
        0x11C41,
        0x11C43,
+       0x11EF7,
+       0x11EF9,
        0x16A6E,
        0x16A70,
        0x16AF5,
@@ -349143,6 +357993,8 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
        0x16B39,
        0x16B44,
        0x16B45,
+       0x16E98,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA88,
@@ -349151,7 +358003,7 @@ static const UV PL_STERM_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_SUND_invlist[] = { /* for all charsets */
+static const UV UNI_SUND_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349163,7 +358015,7 @@ static const UV PL_SUND_invlist[] = { /* for all charsets */
        0x1CC8
 };
 
-static const UV PL_SUNDANESESUP_invlist[] = { /* for all charsets */
+static const UV UNI_SUNDANESESUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349173,7 +358025,7 @@ static const UV PL_SUNDANESESUP_invlist[] = { /* for all charsets */
        0x1CD0
 };
 
-static const UV PL_SUPARROWSA_invlist[] = { /* for all charsets */
+static const UV UNI_SUPARROWSA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349183,7 +358035,7 @@ static const UV PL_SUPARROWSA_invlist[] = { /* for all charsets */
        0x2800
 };
 
-static const UV PL_SUPARROWSB_invlist[] = { /* for all charsets */
+static const UV UNI_SUPARROWSB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349193,7 +358045,7 @@ static const UV PL_SUPARROWSB_invlist[] = { /* for all charsets */
        0x2980
 };
 
-static const UV PL_SUPARROWSC_invlist[] = { /* for all charsets */
+static const UV UNI_SUPARROWSC_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349203,7 +358055,7 @@ static const UV PL_SUPARROWSC_invlist[] = { /* for all charsets */
        0x1F900
 };
 
-static const UV PL_SUPERANDSUB_invlist[] = { /* for all charsets */
+static const UV UNI_SUPERANDSUB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349213,7 +358065,7 @@ static const UV PL_SUPERANDSUB_invlist[] = { /* for all charsets */
        0x20A0
 };
 
-static const UV PL_SUPMATHOPERATORS_invlist[] = { /* for all charsets */
+static const UV UNI_SUPMATHOPERATORS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349223,7 +358075,7 @@ static const UV PL_SUPMATHOPERATORS_invlist[] = { /* for all charsets */
        0x2B00
 };
 
-static const UV PL_SUPPUAA_invlist[] = { /* for all charsets */
+static const UV UNI_SUPPUAA_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349233,7 +358085,7 @@ static const UV PL_SUPPUAA_invlist[] = { /* for all charsets */
        0x100000
 };
 
-static const UV PL_SUPPUAB_invlist[] = { /* for all charsets */
+static const UV UNI_SUPPUAB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349243,7 +358095,7 @@ static const UV PL_SUPPUAB_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_SUPPUNCTUATION_invlist[] = { /* for all charsets */
+static const UV UNI_SUPPUNCTUATION_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349253,7 +358105,7 @@ static const UV PL_SUPPUNCTUATION_invlist[] = { /* for all charsets */
        0x2E80
 };
 
-static const UV PL_SUPSYMBOLSANDPICTOGRAPHS_invlist[] = { /* for all charsets */
+static const UV UNI_SUPSYMBOLSANDPICTOGRAPHS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349263,7 +358115,7 @@ static const UV PL_SUPSYMBOLSANDPICTOGRAPHS_invlist[] = { /* for all charsets */
        0x1FA00
 };
 
-static const UV PL_SUTTONSIGNWRITING_invlist[] = { /* for all charsets */
+static const UV UNI_SUTTONSIGNWRITING_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349273,7 +358125,7 @@ static const UV PL_SUTTONSIGNWRITING_invlist[] = { /* for all charsets */
        0x1DAB0
 };
 
-static const UV PL_SYLO_invlist[] = { /* for all charsets */
+static const UV UNI_SYLO_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349287,7 +358139,7 @@ static const UV PL_SYLO_invlist[] = { /* for all charsets */
        0xA82C
 };
 
-static const UV PL_SYRC_invlist[] = { /* for all charsets */
+static const UV UNI_SYRC_invlist[] = {  /* for all charsets */
        21,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349315,7 +358167,7 @@ static const UV PL_SYRC_invlist[] = { /* for all charsets */
        0x86B
 };
 
-static const UV PL_SYRIACSUP_invlist[] = { /* for all charsets */
+static const UV UNI_SYRIACSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349325,7 +358177,7 @@ static const UV PL_SYRIACSUP_invlist[] = { /* for all charsets */
        0x870
 };
 
-static const UV PL_TAGB_invlist[] = { /* for all charsets */
+static const UV UNI_TAGB_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349341,7 +358193,7 @@ static const UV PL_TAGB_invlist[] = { /* for all charsets */
        0x1774
 };
 
-static const UV PL_TAGS_invlist[] = { /* for all charsets */
+static const UV UNI_TAGS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349351,7 +358203,7 @@ static const UV PL_TAGS_invlist[] = { /* for all charsets */
        0xE0080
 };
 
-static const UV PL_TAIXUANJING_invlist[] = { /* for all charsets */
+static const UV UNI_TAIXUANJING_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349361,7 +358213,7 @@ static const UV PL_TAIXUANJING_invlist[] = { /* for all charsets */
        0x1D360
 };
 
-static const UV PL_TAKR_invlist[] = { /* for all charsets */
+static const UV UNI_TAKR_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349377,7 +358229,7 @@ static const UV PL_TAKR_invlist[] = { /* for all charsets */
        0x116CA
 };
 
-static const UV PL_TALE_invlist[] = { /* for all charsets */
+static const UV UNI_TALE_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349391,7 +358243,7 @@ static const UV PL_TALE_invlist[] = { /* for all charsets */
        0x1975
 };
 
-static const UV PL_TALU_invlist[] = { /* for all charsets */
+static const UV UNI_TALU_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349407,7 +358259,7 @@ static const UV PL_TALU_invlist[] = { /* for all charsets */
        0x19E0
 };
 
-static const UV PL_TAML_invlist[] = { /* for all charsets */
+static const UV UNI_TAML_invlist[] = {  /* for all charsets */
        47,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349457,11 +358309,11 @@ static const UV PL_TAML_invlist[] = { /* for all charsets */
        0x11302,
        0x11303,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D
 };
 
-static const UV PL_TANG_invlist[] = { /* for all charsets */
+static const UV UNI_TANG_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349470,12 +358322,12 @@ static const UV PL_TANG_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE1,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3
 };
 
-static const UV PL_TANGUTCOMPONENTS_invlist[] = { /* for all charsets */
+static const UV UNI_TANGUTCOMPONENTS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349485,7 +358337,7 @@ static const UV PL_TANGUTCOMPONENTS_invlist[] = { /* for all charsets */
        0x18B00
 };
 
-static const UV PL_TAVT_invlist[] = { /* for all charsets */
+static const UV UNI_TAVT_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -349497,8 +358349,8 @@ static const UV PL_TAVT_invlist[] = { /* for all charsets */
        0xAAE0
 };
 
-static const UV PL_TELU_invlist[] = { /* for all charsets */
-       33,     /* Number of elements */
+static const UV UNI_TELU_invlist[] = {  /* for all charsets */
+       31,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -349508,8 +358360,6 @@ static const UV PL_TELU_invlist[] = { /* for all charsets */
        0x964,
        0x966,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -349539,8 +358389,8 @@ static const UV PL_TELU_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
-       195,    /* Number of elements */
+static const UV UNI_TERM_invlist[] = {  /* for ASCII/Latin1 */
+       205,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -349567,7 +358417,7 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
        0x60D,
        0x61B,
        0x61C,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -349629,6 +358479,10 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
        0x2E3D,
        0x2E41,
        0x2E42,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3001,
        0x3003,
        0xA4FE,
@@ -349687,6 +358541,8 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BE,
@@ -349725,6 +358581,8 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
        0x11C44,
        0x11C71,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -349735,6 +358593,8 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -349748,8 +358608,8 @@ static const UV PL_TERM_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
-       197,    /* Number of elements */
+static const UV UNI_TERM_invlist[] = {  /* for EBCDIC 1047 */
+       207,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -349778,7 +358638,7 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
        0x60D,
        0x61B,
        0x61C,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -349840,6 +358700,10 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
        0x2E3D,
        0x2E41,
        0x2E42,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3001,
        0x3003,
        0xA4FE,
@@ -349898,6 +358762,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BE,
@@ -349936,6 +358802,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
        0x11C44,
        0x11C71,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -349946,6 +358814,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -349959,8 +358829,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
-       197,    /* Number of elements */
+static const UV UNI_TERM_invlist[] = {  /* for EBCDIC 037 */
+       207,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -349989,7 +358859,7 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
        0x60D,
        0x61B,
        0x61C,
-       0x61F,
+       0x61E,
        0x620,
        0x6D4,
        0x6D5,
@@ -350051,6 +358921,10 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
        0x2E3D,
        0x2E41,
        0x2E42,
+       0x2E4C,
+       0x2E4D,
+       0x2E4E,
+       0x2E4F,
        0x3001,
        0x3003,
        0xA4FE,
@@ -350109,6 +358983,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
        0x10B40,
        0x10B99,
        0x10B9D,
+       0x10F55,
+       0x10F5A,
        0x11047,
        0x1104E,
        0x110BE,
@@ -350147,6 +359023,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
        0x11C44,
        0x11C71,
        0x11C72,
+       0x11EF7,
+       0x11EF9,
        0x12470,
        0x12475,
        0x16A6E,
@@ -350157,6 +359035,8 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
        0x16B3A,
        0x16B44,
        0x16B45,
+       0x16E97,
+       0x16E99,
        0x1BC9F,
        0x1BCA0,
        0x1DA87,
@@ -350165,7 +359045,7 @@ static const UV PL_TERM_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_TFNG_invlist[] = { /* for all charsets */
+static const UV UNI_TFNG_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350179,7 +359059,7 @@ static const UV PL_TFNG_invlist[] = { /* for all charsets */
        0x2D80
 };
 
-static const UV PL_TGLG_invlist[] = { /* for all charsets */
+static const UV UNI_TGLG_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350193,7 +359073,7 @@ static const UV PL_TGLG_invlist[] = { /* for all charsets */
        0x1737
 };
 
-static const UV PL_THAA_invlist[] = { /* for all charsets */
+static const UV UNI_THAA_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350215,7 +359095,7 @@ static const UV PL_THAA_invlist[] = { /* for all charsets */
        0xFDFE
 };
 
-static const UV PL_THAI_invlist[] = { /* for all charsets */
+static const UV UNI_THAI_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350227,7 +359107,7 @@ static const UV PL_THAI_invlist[] = { /* for all charsets */
        0xE5C
 };
 
-static const UV PL_TIBT_invlist[] = { /* for all charsets */
+static const UV UNI_TIBT_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350249,12 +359129,14 @@ static const UV PL_TIBT_invlist[] = { /* for all charsets */
        0xFDB
 };
 
-static const UV PL_TIRH_invlist[] = { /* for all charsets */
-       9,      /* Number of elements */
+static const UV UNI_TIRH_invlist[] = {  /* for all charsets */
+       11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
+       0x951,
+       0x953,
        0x964,
        0x966,
        0xA830,
@@ -350265,7 +359147,7 @@ static const UV PL_TIRH_invlist[] = { /* for all charsets */
        0x114DA
 };
 
-static const UV PL_TRANSPORTANDMAP_invlist[] = { /* for all charsets */
+static const UV UNI_TRANSPORTANDMAP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350275,7 +359157,7 @@ static const UV PL_TRANSPORTANDMAP_invlist[] = { /* for all charsets */
        0x1F700
 };
 
-static const UV PL_UCAS_invlist[] = { /* for all charsets */
+static const UV UNI_UCAS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350285,7 +359167,7 @@ static const UV PL_UCAS_invlist[] = { /* for all charsets */
        0x1680
 };
 
-static const UV PL_UCASEXT_invlist[] = { /* for all charsets */
+static const UV UNI_UCASEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350295,7 +359177,7 @@ static const UV PL_UCASEXT_invlist[] = { /* for all charsets */
        0x1900
 };
 
-static const UV PL_UGAR_invlist[] = { /* for all charsets */
+static const UV UNI_UGAR_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350307,7 +359189,7 @@ static const UV PL_UGAR_invlist[] = { /* for all charsets */
        0x103A0
 };
 
-static const UV PL_UIDEO_invlist[] = { /* for all charsets */
+static const UV UNI_UIDEO_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350316,7 +359198,7 @@ static const UV PL_UIDEO_invlist[] = { /* for all charsets */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xFA0E,
        0xFA10,
        0xFA11,
@@ -350343,7 +359225,7 @@ static const UV PL_UIDEO_invlist[] = { /* for all charsets */
        0x2EBE1
 };
 
-static const UV PL_VAI_invlist[] = { /* for all charsets */
+static const UV UNI_VAI_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350353,7 +359235,7 @@ static const UV PL_VAI_invlist[] = { /* for all charsets */
        0xA62C
 };
 
-static const UV PL_VEDICEXT_invlist[] = { /* for all charsets */
+static const UV UNI_VEDICEXT_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350363,7 +359245,7 @@ static const UV PL_VEDICEXT_invlist[] = { /* for all charsets */
        0x1D00
 };
 
-static const UV PL_VERTICALFORMS_invlist[] = { /* for all charsets */
+static const UV UNI_VERTICALFORMS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350375,7 +359257,7 @@ static const UV PL_VERTICALFORMS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_VO__R_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_VO__R_invlist[] = {  /* for ASCII/Latin1 */
        175,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -350539,14 +359421,14 @@ static const UV PL_VO__R_invlist[] = { /* for ASCII/Latin1 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
        0x1F000,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -350564,7 +359446,7 @@ static const UV PL_VO__R_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VO__R_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_VO__R_invlist[] = {  /* for EBCDIC 1047 */
        173,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -350726,14 +359608,14 @@ static const UV PL_VO__R_invlist[] = { /* for EBCDIC 1047 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
        0x1F000,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -350751,7 +359633,7 @@ static const UV PL_VO__R_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VO__R_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_VO__R_invlist[] = {  /* for EBCDIC 037 */
        173,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
@@ -350913,14 +359795,14 @@ static const UV PL_VO__R_invlist[] = { /* for EBCDIC 037 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
        0x1F000,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -350933,7 +359815,7 @@ static const UV PL_VO__R_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_VO__TR_invlist[] = { /* for all charsets */
+static const UV UNI_VO__TR_invlist[] = {  /* for all charsets */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -350969,7 +359851,7 @@ static const UV PL_VO__TR_invlist[] = { /* for all charsets */
        0xFFE4
 };
 
-static const UV PL_VO__TU_invlist[] = { /* for all charsets */
+static const UV UNI_VO__TU_invlist[] = {  /* for all charsets */
        69,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351047,7 +359929,7 @@ static const UV PL_VO__TU_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_VO__U_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_VO__U_invlist[] = {  /* for ASCII/Latin1 */
        253,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351287,7 +360169,7 @@ static const UV PL_VO__U_invlist[] = { /* for ASCII/Latin1 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
@@ -351296,7 +360178,7 @@ static const UV PL_VO__U_invlist[] = { /* for ASCII/Latin1 */
        0x1F202,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -351314,7 +360196,7 @@ static const UV PL_VO__U_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VO__U_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_VO__U_invlist[] = {  /* for EBCDIC 1047 */
        251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351552,7 +360434,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 1047 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
@@ -351561,7 +360443,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 1047 */
        0x1F202,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -351579,7 +360461,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_VO__U_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_VO__U_invlist[] = {  /* for EBCDIC 037 */
        251,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351817,7 +360699,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 037 */
        0x1B300,
        0x1D000,
        0x1D200,
-       0x1D300,
+       0x1D2E0,
        0x1D380,
        0x1D800,
        0x1DAB0,
@@ -351826,7 +360708,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 037 */
        0x1F202,
        0x1F800,
        0x1F900,
-       0x1FA00,
+       0x1FA70,
        0x20000,
        0x2FFFE,
        0x30000,
@@ -351839,7 +360721,7 @@ static const UV PL_VO__U_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_VS_invlist[] = { /* for all charsets */
+static const UV UNI_VS_invlist[] = {  /* for all charsets */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351853,7 +360735,7 @@ static const UV PL_VS_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_VSSUP_invlist[] = { /* for all charsets */
+static const UV UNI_VSSUP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351863,7 +360745,7 @@ static const UV PL_VSSUP_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_WARA_invlist[] = { /* for all charsets */
+static const UV UNI_WARA_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351877,7 +360759,7 @@ static const UV PL_WARA_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__DQ_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__DQ_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351894,7 +360776,7 @@ static const UV PL_WB__DQ_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__DQ_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__DQ_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351911,7 +360793,7 @@ static const UV PL_WB__DQ_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__DQ_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__DQ_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -351923,89 +360805,16 @@ static const UV PL_WB__DQ_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_WB__EB_invlist[] = { /* for all charsets */
-       63,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x261D,
-       0x261E,
-       0x26F9,
-       0x26FA,
-       0x270A,
-       0x270E,
-       0x1F385,
-       0x1F386,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE
-};
-
-static const UV PL_WB__EBG_invlist[] = { /* for all charsets */
-       3,      /* Number of elements */
+static const UV UNI_WB__EB_invlist[] = {  /* for ASCII/Latin1 */
+       0,      /* Number of elements */
        148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
+       0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
-       0x0,
-       0x1F466,
-       0x1F46A
 };
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__EX_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__EX_invlist[] = {  /* for ASCII/Latin1 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -352034,7 +360843,7 @@ static const UV PL_WB__EX_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__EX_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__EX_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -352063,7 +360872,7 @@ static const UV PL_WB__EX_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__EX_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__EX_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -352087,8 +360896,8 @@ static const UV PL_WB__EX_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
-       533,    /* Number of elements */
+static const UV UNI_WB__EXTEND_invlist[] = {  /* for all charsets */
+       559,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -352129,6 +360938,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x7B1,
        0x7EB,
        0x7F4,
+       0x7FD,
+       0x7FE,
        0x816,
        0x81A,
        0x81B,
@@ -352139,7 +360950,7 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x82E,
        0x859,
        0x85C,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x904,
@@ -352165,6 +360976,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x9D8,
        0x9E2,
        0x9E4,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA3C,
@@ -352220,7 +361033,7 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0xBD7,
        0xBD8,
        0xC00,
-       0xC04,
+       0xC05,
        0xC3E,
        0xC45,
        0xC46,
@@ -352421,6 +361234,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0xA8C6,
        0xA8E0,
        0xA8F2,
+       0xA8FF,
+       0xA900,
        0xA926,
        0xA92E,
        0xA947,
@@ -352483,6 +361298,10 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x10A40,
        0x10AE5,
        0x10AE7,
+       0x10D24,
+       0x10D28,
+       0x10F46,
+       0x10F51,
        0x11000,
        0x11003,
        0x11038,
@@ -352495,13 +361314,15 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x11103,
        0x11127,
        0x11135,
+       0x11145,
+       0x11147,
        0x11173,
        0x11174,
        0x11180,
        0x11183,
        0x111B3,
        0x111C1,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x1122C,
        0x11238,
@@ -352511,7 +361332,7 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x112EB,
        0x11300,
        0x11304,
-       0x1133C,
+       0x1133B,
        0x1133D,
        0x1133E,
        0x11345,
@@ -352529,6 +361350,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x11375,
        0x11435,
        0x11447,
+       0x1145E,
+       0x1145F,
        0x114B0,
        0x114C4,
        0x115AF,
@@ -352543,6 +361366,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x116B8,
        0x1171D,
        0x1172C,
+       0x1182C,
+       0x1183B,
        0x11A01,
        0x11A0B,
        0x11A33,
@@ -352573,6 +361398,14 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x11D46,
        0x11D47,
        0x11D48,
+       0x11D8A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D98,
+       0x11EF3,
+       0x11EF7,
        0x16AF0,
        0x16AF5,
        0x16B30,
@@ -352621,6 +361454,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
        0x1E8D7,
        0x1E944,
        0x1E94B,
+       0x1F3FB,
+       0x1F400,
        0xE0020,
        0xE0080,
        0xE0100,
@@ -352629,8 +361464,8 @@ static const UV PL_WB__EXTEND_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__FO_invlist[] = { /* for ASCII/Latin1 */
-       35,     /* Number of elements */
+static const UV UNI_WB__FO_invlist[] = {  /* for ASCII/Latin1 */
+       37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -352663,6 +361498,8 @@ static const UV PL_WB__FO_invlist[] = { /* for ASCII/Latin1 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -352678,8 +361515,8 @@ static const UV PL_WB__FO_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 1047 */
-       35,     /* Number of elements */
+static const UV UNI_WB__FO_invlist[] = {  /* for EBCDIC 1047 */
+       37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -352712,6 +361549,8 @@ static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 1047 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -352727,8 +361566,8 @@ static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 037 */
-       35,     /* Number of elements */
+static const UV UNI_WB__FO_invlist[] = {  /* for EBCDIC 037 */
+       37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -352761,6 +361600,8 @@ static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 037 */
        0xFFFC,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x1BCA0,
        0x1BCA4,
        0x1D173,
@@ -352771,55 +361612,7 @@ static const UV PL_WB__FO_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_WB__GAZ_invlist[] = { /* for all charsets */
-       41,     /* Number of elements */
-       148565664, /* Version and data structure type */
-       1,      /* 0 if the list starts at 0;
-                  1 if it starts at the element beyond 0 */
-       0x0,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x2708,
-       0x2709,
-       0x2764,
-       0x2765,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
-       0x1F48B,
-       0x1F48C,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693
-};
-
-static const UV PL_WB__KA_invlist[] = { /* for all charsets */
+static const UV UNI_WB__KA_invlist[] = {  /* for all charsets */
        19,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -352847,8 +361640,8 @@ static const UV PL_WB__KA_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
-       1015,   /* Number of elements */
+static const UV UNI_WB__LE_invlist[] = {  /* for ASCII/Latin1 */
+       1047,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -352899,8 +361692,12 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
+       0x589,
        0x5F3,
        0x5F4,
        0x620,
@@ -353202,7 +361999,7 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x176E,
        0x1771,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -353233,6 +362030,10 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -353360,7 +362161,7 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x303B,
        0x303D,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -353382,9 +362183,7 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0xA6A0,
        0xA6F0,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -353402,7 +362201,7 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -353560,7 +362359,7 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -353583,6 +362382,14 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -353591,6 +362398,8 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -353657,6 +362466,8 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -353673,6 +362484,8 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -353691,6 +362504,16 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -353715,6 +362538,8 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -353876,8 +362701,8 @@ static const UV PL_WB__LE_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
-       1041,   /* Number of elements */
+static const UV UNI_WB__LE_invlist[] = {  /* for EBCDIC 1047 */
+       1073,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -353954,8 +362779,12 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
+       0x589,
        0x5F3,
        0x5F4,
        0x620,
@@ -354257,7 +363086,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x176E,
        0x1771,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -354288,6 +363117,10 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -354415,7 +363248,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x303B,
        0x303D,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -354437,9 +363270,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0xA6A0,
        0xA6F0,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -354457,7 +363288,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -354615,7 +363446,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -354638,6 +363469,14 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -354646,6 +363485,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -354712,6 +363553,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -354728,6 +363571,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -354746,6 +363591,16 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -354770,6 +363625,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -354931,8 +363788,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
-       1037,   /* Number of elements */
+static const UV UNI_WB__LE_invlist[] = {  /* for EBCDIC 037 */
+       1069,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -355005,8 +363862,12 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
+       0x589,
        0x5F3,
        0x5F4,
        0x620,
@@ -355308,7 +364169,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x176E,
        0x1771,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x1885,
        0x1887,
@@ -355339,6 +364200,10 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -355466,7 +364331,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x303B,
        0x303D,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -355488,9 +364353,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0xA6A0,
        0xA6F0,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -355508,7 +364371,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -355666,7 +364529,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -355689,6 +364552,14 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -355697,6 +364568,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -355763,6 +364636,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x11645,
        0x11680,
        0x116AB,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -355779,6 +364654,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -355797,6 +364674,16 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -355821,6 +364708,8 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -355979,7 +364868,7 @@ static const UV PL_WB__LE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__MB_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__MB_invlist[] = {  /* for ASCII/Latin1 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356006,7 +364895,7 @@ static const UV PL_WB__MB_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__MB_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__MB_invlist[] = {  /* for EBCDIC 1047 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356033,7 +364922,7 @@ static const UV PL_WB__MB_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__MB_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__MB_invlist[] = {  /* for EBCDIC 037 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356057,7 +364946,7 @@ static const UV PL_WB__MB_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__ML_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__ML_invlist[] = {  /* for ASCII/Latin1 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356088,7 +364977,7 @@ static const UV PL_WB__ML_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__ML_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__ML_invlist[] = {  /* for EBCDIC 1047 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356119,7 +365008,7 @@ static const UV PL_WB__ML_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__ML_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__ML_invlist[] = {  /* for EBCDIC 037 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356147,7 +365036,7 @@ static const UV PL_WB__ML_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__MN_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__MN_invlist[] = {  /* for ASCII/Latin1 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356190,7 +365079,7 @@ static const UV PL_WB__MN_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__MN_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__MN_invlist[] = {  /* for EBCDIC 1047 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356233,7 +365122,7 @@ static const UV PL_WB__MN_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__MN_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__MN_invlist[] = {  /* for EBCDIC 037 */
        29,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356273,7 +365162,7 @@ static const UV PL_WB__MN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__NL_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__NL_invlist[] = {  /* for ASCII/Latin1 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356294,7 +365183,7 @@ static const UV PL_WB__NL_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__NL_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__NL_invlist[] = {  /* for EBCDIC 1047 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356315,7 +365204,7 @@ static const UV PL_WB__NL_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__NL_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__NL_invlist[] = {  /* for EBCDIC 037 */
        7,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356333,8 +365222,8 @@ static const UV PL_WB__NL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__NU_invlist[] = { /* for ASCII/Latin1 */
-       111,    /* Number of elements */
+static const UV UNI_WB__NU_invlist[] = {  /* for ASCII/Latin1 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -356415,6 +365304,8 @@ static const UV PL_WB__NU_invlist[] = { /* for ASCII/Latin1 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -356441,6 +365332,8 @@ static const UV PL_WB__NU_invlist[] = { /* for ASCII/Latin1 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -356458,8 +365351,8 @@ static const UV PL_WB__NU_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 1047 */
-       111,    /* Number of elements */
+static const UV UNI_WB__NU_invlist[] = {  /* for EBCDIC 1047 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -356540,6 +365433,8 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 1047 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -356566,6 +365461,8 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 1047 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -356583,8 +365480,8 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 037 */
-       111,    /* Number of elements */
+static const UV UNI_WB__NU_invlist[] = {  /* for EBCDIC 037 */
+       115,    /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -356665,6 +365562,8 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 037 */
        0xABFA,
        0x104A0,
        0x104AA,
+       0x10D30,
+       0x10D3A,
        0x11066,
        0x11070,
        0x110F0,
@@ -356691,6 +365590,8 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 037 */
        0x11C5A,
        0x11D50,
        0x11D5A,
+       0x11DA0,
+       0x11DAA,
        0x16A60,
        0x16A6A,
        0x16B50,
@@ -356705,7 +365606,7 @@ static const UV PL_WB__NU_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__SQ_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_WB__SQ_invlist[] = {  /* for ASCII/Latin1 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356722,7 +365623,7 @@ static const UV PL_WB__SQ_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__SQ_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_WB__SQ_invlist[] = {  /* for EBCDIC 1047 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356739,7 +365640,7 @@ static const UV PL_WB__SQ_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__SQ_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_WB__SQ_invlist[] = {  /* for EBCDIC 037 */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -356753,14 +365654,94 @@ static const UV PL_WB__SQ_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
-       1499,   /* Number of elements */
+static const UV UNI_WB__WSEGSPACE_invlist[] = {  /* for ASCII/Latin1 */
+       13,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x20,
+       0x21,
+       0x1680,
+       0x1681,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
+       0x205F,
+       0x2060,
+       0x3000,
+       0x3001
+};
+
+#  endif       /* ASCII/Latin1 */
+
+#  if 'A' == 193 /* EBCDIC 1047 */ \
+     && '\\' == 224 && '[' == 173 && ']' == 189 && '{' == 192 && '}' == 208 \
+     && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
+static const UV UNI_WB__WSEGSPACE_invlist[] = {  /* for EBCDIC 1047 */
+       13,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x40,
+       0x41,
+       0x1680,
+       0x1681,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
+       0x205F,
+       0x2060,
+       0x3000,
+       0x3001
+};
+
+#  endif       /* EBCDIC 1047 */
+
+#  if 'A' == 193 /* EBCDIC 037 */ \
+     && '\\' == 224 && '[' == 186 && ']' == 187 && '{' == 192 && '}' == 208 \
+     && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
+     && '$' == 91 && '@' == 124 && '`' == 121
+
+static const UV UNI_WB__WSEGSPACE_invlist[] = {  /* for EBCDIC 037 */
+       13,     /* Number of elements */
+       148565664, /* Version and data structure type */
+       1,      /* 0 if the list starts at 0;
+                  1 if it starts at the element beyond 0 */
+       0x0,
+       0x40,
+       0x41,
+       0x1680,
+       0x1681,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
+       0x205F,
+       0x2060,
+       0x3000,
+       0x3001
+};
+
+#  endif       /* EBCDIC 037 */
+
+#  if 'A' == 65 /* ASCII/Latin1 */
+
+static const UV UNI_WB__XX_invlist[] = {  /* for ASCII/Latin1 */
+       1441,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
        0x0,
        0xA,
        0xE,
+       0x20,
+       0x21,
        0x22,
        0x23,
        0x27,
@@ -356819,9 +365800,11 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
-       0x589,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -356835,7 +365818,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x606,
@@ -356869,6 +365852,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -356879,7 +365864,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x964,
        0x966,
        0x970,
@@ -356913,6 +365898,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -357036,8 +366023,6 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -357242,8 +366227,6 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1401,
        0x166D,
        0x166F,
-       0x1680,
-       0x1681,
        0x169B,
        0x16A0,
        0x16EB,
@@ -357274,7 +366257,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -357317,6 +366300,10 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -357361,6 +366348,10 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1FF5,
        0x1FF6,
        0x1FFD,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
        0x200C,
        0x2010,
        0x2018,
@@ -357375,7 +366366,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x2045,
        0x2054,
        0x2055,
-       0x2060,
+       0x205F,
        0x2065,
        0x2066,
        0x2070,
@@ -357417,22 +366408,6 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x2189,
        0x24B6,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -357473,6 +366448,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x2E00,
        0x2E2F,
        0x2E30,
+       0x3000,
+       0x3001,
        0x3005,
        0x3006,
        0x302A,
@@ -357488,7 +366465,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -357514,9 +366491,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA67F,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -357530,8 +366505,6 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -357756,7 +366729,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -357783,6 +366756,16 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -357791,6 +366774,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -357799,13 +366784,15 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -357845,7 +366832,7 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -357865,6 +366852,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -357891,6 +366880,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -357903,6 +366894,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -357933,6 +366926,20 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -357963,6 +366970,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -358161,96 +367170,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
        0x1F18A,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -358266,8 +367187,8 @@ static const UV PL_WB__XX_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
-       1523,   /* Number of elements */
+static const UV UNI_WB__XX_invlist[] = {  /* for EBCDIC 1047 */
+       1465,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -358278,6 +367199,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x16,
        0x25,
        0x26,
+       0x40,
+       0x41,
        0x42,
        0x4A,
        0x4B,
@@ -358356,9 +367279,11 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
-       0x589,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -358372,7 +367297,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x606,
@@ -358406,6 +367331,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -358416,7 +367343,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x964,
        0x966,
        0x970,
@@ -358450,6 +367377,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -358573,8 +367502,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -358779,8 +367706,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1401,
        0x166D,
        0x166F,
-       0x1680,
-       0x1681,
        0x169B,
        0x16A0,
        0x16EB,
@@ -358811,7 +367736,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -358854,6 +367779,10 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -358898,6 +367827,10 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1FF5,
        0x1FF6,
        0x1FFD,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
        0x200C,
        0x2010,
        0x2018,
@@ -358912,7 +367845,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x2045,
        0x2054,
        0x2055,
-       0x2060,
+       0x205F,
        0x2065,
        0x2066,
        0x2070,
@@ -358954,22 +367887,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x2189,
        0x24B6,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -359010,6 +367927,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x2E00,
        0x2E2F,
        0x2E30,
+       0x3000,
+       0x3001,
        0x3005,
        0x3006,
        0x302A,
@@ -359025,7 +367944,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -359051,9 +367970,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xA67F,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -359067,8 +367984,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -359293,7 +368208,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -359320,6 +368235,16 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -359328,6 +368253,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -359336,13 +368263,15 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -359382,7 +368311,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -359402,6 +368331,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -359428,6 +368359,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -359440,6 +368373,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -359470,6 +368405,20 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -359500,6 +368449,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -359698,96 +368649,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
        0x1F18A,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -359803,8 +368666,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
-       1519,   /* Number of elements */
+static const UV UNI_WB__XX_invlist[] = {  /* for EBCDIC 037 */
+       1461,   /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -359815,6 +368678,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x16,
        0x25,
        0x26,
+       0x40,
+       0x41,
        0x42,
        0x4A,
        0x4B,
@@ -359889,9 +368754,11 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
-       0x589,
+       0x55B,
+       0x55D,
+       0x55E,
+       0x55F,
+       0x560,
        0x58A,
        0x591,
        0x5BE,
@@ -359905,7 +368772,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x606,
@@ -359939,6 +368806,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x7F9,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -359949,7 +368818,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x964,
        0x966,
        0x970,
@@ -359983,6 +368852,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -360106,8 +368977,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -360312,8 +369181,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1401,
        0x166D,
        0x166F,
-       0x1680,
-       0x1681,
        0x169B,
        0x16A0,
        0x16EB,
@@ -360344,7 +369211,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -360387,6 +369254,10 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -360431,6 +369302,10 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1FF5,
        0x1FF6,
        0x1FFD,
+       0x2000,
+       0x2007,
+       0x2008,
+       0x200B,
        0x200C,
        0x2010,
        0x2018,
@@ -360445,7 +369320,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x2045,
        0x2054,
        0x2055,
-       0x2060,
+       0x205F,
        0x2065,
        0x2066,
        0x2070,
@@ -360487,22 +369362,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x2189,
        0x24B6,
        0x24EA,
-       0x261D,
-       0x261E,
-       0x2640,
-       0x2641,
-       0x2642,
-       0x2643,
-       0x2695,
-       0x2697,
-       0x26F9,
-       0x26FA,
-       0x2708,
-       0x2709,
-       0x270A,
-       0x270E,
-       0x2764,
-       0x2765,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -360543,6 +369402,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x2E00,
        0x2E2F,
        0x2E30,
+       0x3000,
+       0x3001,
        0x3005,
        0x3006,
        0x302A,
@@ -360558,7 +369419,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -360584,9 +369445,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0xA67F,
        0xA6F2,
        0xA717,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -360600,8 +369459,6 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -360826,7 +369683,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -360853,6 +369710,16 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -360861,6 +369728,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x110BB,
        0x110BD,
        0x110BE,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -360869,13 +369738,15 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -360915,7 +369786,7 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -360935,6 +369806,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -360961,6 +369834,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -360973,6 +369848,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -361003,6 +369880,20 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -361033,6 +369924,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -361231,96 +370124,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
        0x1F18A,
        0x1F1E6,
        0x1F200,
-       0x1F308,
-       0x1F309,
-       0x1F33E,
-       0x1F33F,
-       0x1F373,
-       0x1F374,
-       0x1F385,
-       0x1F386,
-       0x1F393,
-       0x1F394,
-       0x1F3A4,
-       0x1F3A5,
-       0x1F3A8,
-       0x1F3A9,
-       0x1F3C2,
-       0x1F3C5,
-       0x1F3C7,
-       0x1F3C8,
-       0x1F3CA,
-       0x1F3CD,
-       0x1F3EB,
-       0x1F3EC,
-       0x1F3ED,
-       0x1F3EE,
        0x1F3FB,
        0x1F400,
-       0x1F442,
-       0x1F444,
-       0x1F446,
-       0x1F451,
-       0x1F466,
-       0x1F46A,
-       0x1F46E,
-       0x1F46F,
-       0x1F470,
-       0x1F479,
-       0x1F47C,
-       0x1F47D,
-       0x1F481,
-       0x1F484,
-       0x1F485,
-       0x1F488,
-       0x1F48B,
-       0x1F48C,
-       0x1F4AA,
-       0x1F4AB,
-       0x1F4BB,
-       0x1F4BD,
-       0x1F527,
-       0x1F528,
-       0x1F52C,
-       0x1F52D,
-       0x1F574,
-       0x1F576,
-       0x1F57A,
-       0x1F57B,
-       0x1F590,
-       0x1F591,
-       0x1F595,
-       0x1F597,
-       0x1F5E8,
-       0x1F5E9,
-       0x1F645,
-       0x1F648,
-       0x1F64B,
-       0x1F650,
-       0x1F680,
-       0x1F681,
-       0x1F692,
-       0x1F693,
-       0x1F6A3,
-       0x1F6A4,
-       0x1F6B4,
-       0x1F6B7,
-       0x1F6C0,
-       0x1F6C1,
-       0x1F6CC,
-       0x1F6CD,
-       0x1F918,
-       0x1F91D,
-       0x1F91E,
-       0x1F920,
-       0x1F926,
-       0x1F927,
-       0x1F930,
-       0x1F93A,
-       0x1F93D,
-       0x1F93F,
-       0x1F9D1,
-       0x1F9DE,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -361333,8 +370138,8 @@ static const UV PL_WB__XX_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
-       1393,   /* Number of elements */
+static const UV UNI_XIDC_invlist[] = {  /* for ASCII/Latin1 */
+       1429,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -361395,8 +370200,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -361409,7 +370214,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -361433,6 +370238,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -361443,7 +370250,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -361479,6 +370286,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -361602,8 +370411,6 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -361854,7 +370661,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -361905,6 +370712,10 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -362048,7 +370859,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -362058,7 +370869,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -362078,9 +370889,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -362094,8 +370903,6 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -362314,7 +371121,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -362341,6 +371148,16 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -362355,13 +371172,15 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -362401,7 +371220,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -362421,6 +371240,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -362444,11 +371265,13 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -362461,6 +371284,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -362491,6 +371316,20 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -362521,6 +371360,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -362530,7 +371371,7 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -362740,8 +371581,8 @@ static const UV PL_XIDC_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
-       1417,   /* Number of elements */
+static const UV UNI_XIDC_invlist[] = {  /* for EBCDIC 1047 */
+       1453,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -362826,8 +371667,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -362840,7 +371681,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -362864,6 +371705,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -362874,7 +371717,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -362910,6 +371753,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -363033,8 +371878,6 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -363285,7 +372128,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -363336,6 +372179,10 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -363479,7 +372326,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -363489,7 +372336,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -363509,9 +372356,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -363525,8 +372370,6 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -363745,7 +372588,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -363772,6 +372615,16 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -363786,13 +372639,15 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -363832,7 +372687,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -363852,6 +372707,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -363875,11 +372732,13 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -363892,6 +372751,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -363922,6 +372783,20 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -363952,6 +372827,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -363961,7 +372838,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -364171,8 +373048,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
-       1413,   /* Number of elements */
+static const UV UNI_XIDC_invlist[] = {  /* for EBCDIC 037 */
+       1449,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -364253,8 +373130,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x591,
        0x5BE,
        0x5BF,
@@ -364267,7 +373144,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x610,
        0x61B,
@@ -364291,6 +373168,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x7F6,
        0x7FA,
        0x7FB,
+       0x7FD,
+       0x7FE,
        0x800,
        0x82E,
        0x840,
@@ -364301,7 +373180,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x8E2,
        0x8E3,
        0x964,
@@ -364337,6 +373216,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x9F2,
        0x9FC,
        0x9FD,
+       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -364460,8 +373341,6 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0xBE6,
        0xBF0,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -364712,7 +373591,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -364763,6 +373642,10 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CD0,
        0x1CD3,
        0x1CD4,
@@ -364906,7 +373789,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -364916,7 +373799,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -364936,9 +373819,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA828,
        0xA840,
@@ -364952,8 +373833,6 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
-       0xA900,
        0xA92E,
        0xA930,
        0xA954,
@@ -365172,7 +374051,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
@@ -365199,6 +374078,16 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F51,
        0x11000,
        0x11047,
        0x11066,
@@ -365213,13 +374102,15 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x11135,
        0x11136,
        0x11140,
+       0x11144,
+       0x11147,
        0x11150,
        0x11174,
        0x11176,
        0x11177,
        0x11180,
        0x111C5,
-       0x111CA,
+       0x111C9,
        0x111CD,
        0x111D0,
        0x111DB,
@@ -365259,7 +374150,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -365279,6 +374170,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x1144B,
        0x11450,
        0x1145A,
+       0x1145E,
+       0x1145F,
        0x11480,
        0x114C6,
        0x114C7,
@@ -365302,11 +374195,13 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x1173A,
+       0x11800,
+       0x1183B,
        0x118A0,
        0x118EA,
        0x118FF,
@@ -365319,6 +374214,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A9A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -365349,6 +374246,20 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF7,
        0x12000,
        0x1239A,
        0x12400,
@@ -365379,6 +374290,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -365388,7 +374301,7 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -365595,8 +374508,8 @@ static const UV PL_XIDC_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
-       1185,   /* Number of elements */
+static const UV UNI_XIDS_invlist[] = {  /* for ASCII/Latin1 */
+       1213,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -365651,11 +374564,11 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -366020,7 +374933,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -366061,6 +374974,10 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -366194,7 +375111,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -366204,7 +375121,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -366226,9 +375143,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -366246,7 +375161,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -366462,7 +375377,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -366485,6 +375400,14 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -366493,6 +375416,8 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -366560,7 +375485,9 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -366577,6 +375504,8 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -366595,6 +375524,16 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -366619,6 +375558,8 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -366628,7 +375569,7 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -366794,8 +375735,8 @@ static const UV PL_XIDS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
-       1211,   /* Number of elements */
+static const UV UNI_XIDS_invlist[] = {  /* for EBCDIC 1047 */
+       1239,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -366876,11 +375817,11 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -367245,7 +376186,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -367286,6 +376227,10 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -367419,7 +376364,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -367429,7 +376374,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -367451,9 +376396,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -367471,7 +376414,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -367687,7 +376630,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -367710,6 +376653,14 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -367718,6 +376669,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -367785,7 +376738,9 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -367802,6 +376757,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -367820,6 +376777,16 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -367844,6 +376811,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -367853,7 +376822,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -368019,8 +376988,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
-       1207,   /* Number of elements */
+static const UV UNI_XIDS_invlist[] = {  /* for EBCDIC 037 */
+       1235,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -368097,11 +377066,11 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x557,
        0x559,
        0x55A,
-       0x561,
-       0x588,
+       0x560,
+       0x589,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F3,
        0x620,
        0x64B,
@@ -368466,7 +377435,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x17DC,
        0x17DD,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18A9,
        0x18AA,
@@ -368507,6 +377476,10 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x1C7E,
        0x1C80,
        0x1C89,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
+       0x1CC0,
        0x1CE9,
        0x1CED,
        0x1CEE,
@@ -368640,7 +377613,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x30FC,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x31A0,
@@ -368650,7 +377623,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x3400,
        0x4DB6,
        0x4E00,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA4D0,
@@ -368672,9 +377645,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0xA722,
        0xA789,
        0xA78B,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA802,
        0xA803,
@@ -368692,7 +377663,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0xA8FB,
        0xA8FC,
        0xA8FD,
-       0xA8FE,
+       0xA8FF,
        0xA90A,
        0xA926,
        0xA930,
@@ -368908,7 +377879,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A60,
        0x10A7D,
        0x10A80,
@@ -368931,6 +377902,14 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x10CB3,
        0x10CC0,
        0x10CF3,
+       0x10D00,
+       0x10D24,
+       0x10F00,
+       0x10F1D,
+       0x10F27,
+       0x10F28,
+       0x10F30,
+       0x10F46,
        0x11003,
        0x11038,
        0x11083,
@@ -368939,6 +377918,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x110E9,
        0x11103,
        0x11127,
+       0x11144,
+       0x11145,
        0x11150,
        0x11173,
        0x11176,
@@ -369006,7 +377987,9 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x11680,
        0x116AB,
        0x11700,
-       0x1171A,
+       0x1171B,
+       0x11800,
+       0x1182C,
        0x118A0,
        0x118E0,
        0x118FF,
@@ -369023,6 +378006,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x11A84,
        0x11A86,
        0x11A8A,
+       0x11A9D,
+       0x11A9E,
        0x11AC0,
        0x11AF9,
        0x11C00,
@@ -369041,6 +378026,16 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x11D31,
        0x11D46,
        0x11D47,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8A,
+       0x11D98,
+       0x11D99,
+       0x11EE0,
+       0x11EF3,
        0x12000,
        0x1239A,
        0x12400,
@@ -369065,6 +378060,8 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E80,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -369074,7 +378071,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -369235,7 +378232,7 @@ static const UV PL_XIDS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_XPEO_invlist[] = { /* for all charsets */
+static const UV UNI_XPEO_invlist[] = {  /* for all charsets */
        5,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369247,7 +378244,7 @@ static const UV PL_XPEO_invlist[] = { /* for all charsets */
        0x103D6
 };
 
-static const UV PL_XSUX_invlist[] = { /* for all charsets */
+static const UV UNI_XSUX_invlist[] = {  /* for all charsets */
        9,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369263,7 +378260,7 @@ static const UV PL_XSUX_invlist[] = { /* for all charsets */
        0x12544
 };
 
-static const UV PL_YI_invlist[] = { /* for all charsets */
+static const UV UNI_YI_invlist[] = {  /* for all charsets */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369285,7 +378282,7 @@ static const UV PL_YI_invlist[] = { /* for all charsets */
        0xFF66
 };
 
-static const UV PL_YIJING_invlist[] = { /* for all charsets */
+static const UV UNI_YIJING_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369295,7 +378292,7 @@ static const UV PL_YIJING_invlist[] = { /* for all charsets */
        0x4E00
 };
 
-static const UV PL_YIRADICALS_invlist[] = { /* for all charsets */
+static const UV UNI_YIRADICALS_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369305,7 +378302,7 @@ static const UV PL_YIRADICALS_invlist[] = { /* for all charsets */
        0xA4D0
 };
 
-static const UV PL_YISYLLABLES_invlist[] = { /* for all charsets */
+static const UV UNI_YISYLLABLES_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369317,7 +378314,7 @@ static const UV PL_YISYLLABLES_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_Z_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_Z_invlist[] = {  /* for ASCII/Latin1 */
        17,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369348,7 +378345,7 @@ static const UV PL_Z_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_Z_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_Z_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369377,7 +378374,7 @@ static const UV PL_Z_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_Z_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_Z_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369401,7 +378398,7 @@ static const UV PL_Z_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_ZANB_invlist[] = { /* for all charsets */
+static const UV UNI_ZANB_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369411,7 +378408,7 @@ static const UV PL_ZANB_invlist[] = { /* for all charsets */
        0x11A48
 };
 
-static const UV PL_ZL_invlist[] = { /* for all charsets */
+static const UV UNI_ZL_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369421,7 +378418,7 @@ static const UV PL_ZL_invlist[] = { /* for all charsets */
        0x2029
 };
 
-static const UV PL_ZP_invlist[] = { /* for all charsets */
+static const UV UNI_ZP_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369433,7 +378430,7 @@ static const UV PL_ZP_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_ZS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI_ZS_invlist[] = {  /* for ASCII/Latin1 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369462,7 +378459,7 @@ static const UV PL_ZS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ZS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI_ZS_invlist[] = {  /* for EBCDIC 1047 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369489,7 +378486,7 @@ static const UV PL_ZS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ZS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI_ZS_invlist[] = {  /* for EBCDIC 037 */
        13,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -369513,8 +378510,8 @@ static const UV PL_ZS_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
-       276,    /* Number of elements */
+static const UV UNI_ZYYY_invlist[] = {  /* for ASCII/Latin1 */
+       282,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -369593,17 +378590,13 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -369682,8 +378675,12 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
+       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -369726,6 +378723,8 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -369741,8 +378740,6 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -369761,11 +378758,11 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -369781,15 +378778,21 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -369803,8 +378806,8 @@ static const UV PL_ZYYY_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
-       302,    /* Number of elements */
+static const UV UNI_ZYYY_invlist[] = {  /* for EBCDIC 1047 */
+       308,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -369909,17 +378912,13 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -369998,8 +378997,12 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
+       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -370042,6 +379045,8 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -370057,8 +379062,6 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -370077,11 +379080,11 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -370097,15 +379100,21 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -370119,8 +379128,8 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
-       298,    /* Number of elements */
+static const UV UNI_ZYYY_invlist[] = {  /* for EBCDIC 037 */
+       304,    /* Number of elements */
        148565664, /* Version and data structure type */
        0,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -370221,17 +379230,13 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2E00,
        0x2E43,
        0x2E44,
-       0x2E4A,
+       0x2E4F,
        0x2FF0,
        0x2FFC,
        0x3000,
@@ -370310,8 +379315,12 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1D1AA,
        0x1D1AE,
        0x1D1E9,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
+       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -370354,6 +379363,8 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1D7CC,
        0x1D7CE,
        0x1D800,
+       0x1EC71,
+       0x1ECB5,
        0x1F000,
        0x1F02C,
        0x1F030,
@@ -370369,8 +379380,6 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -370389,11 +379398,11 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -370409,15 +379418,21 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0xE0001,
        0xE0002,
        0xE0020,
@@ -370426,8 +379441,8 @@ static const UV PL_ZYYY_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
-       1294,   /* Number of elements */
+static const UV UNI_ZZZZ_invlist[] = {  /* for all charsets */
+       1312,   /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
                   1 if it starts at the element beyond 0 */
@@ -370446,10 +379461,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x531,
        0x557,
        0x559,
-       0x560,
-       0x561,
-       0x588,
-       0x589,
        0x58B,
        0x58D,
        0x590,
@@ -370457,7 +379468,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x5C8,
        0x5D0,
        0x5EB,
-       0x5F0,
+       0x5EF,
        0x5F5,
        0x600,
        0x61D,
@@ -370469,7 +379480,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x7B2,
        0x7C0,
        0x7FB,
-       0x800,
+       0x7FD,
        0x82E,
        0x830,
        0x83F,
@@ -370483,7 +379494,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x8B5,
        0x8B6,
        0x8BE,
-       0x8D4,
+       0x8D3,
        0x984,
        0x985,
        0x98D,
@@ -370510,7 +379521,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x9DF,
        0x9E4,
        0x9E6,
-       0x9FE,
+       0x9FF,
        0xA01,
        0xA04,
        0xA05,
@@ -370542,7 +379553,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xA5E,
        0xA5F,
        0xA66,
-       0xA76,
+       0xA77,
        0xA81,
        0xA84,
        0xA85,
@@ -370632,8 +379643,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xBE6,
        0xBFB,
        0xC00,
-       0xC04,
-       0xC05,
        0xC0D,
        0xC0E,
        0xC11,
@@ -370656,8 +379665,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xC66,
        0xC70,
        0xC78,
-       0xC84,
-       0xC85,
        0xC8D,
        0xC8E,
        0xC91,
@@ -370850,7 +379857,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1810,
        0x181A,
        0x1820,
-       0x1878,
+       0x1879,
        0x1880,
        0x18AB,
        0x18B0,
@@ -370899,7 +379906,9 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1C4A,
        0x1C4D,
        0x1C89,
-       0x1CC0,
+       0x1C90,
+       0x1CBB,
+       0x1CBD,
        0x1CC8,
        0x1CD0,
        0x1CFA,
@@ -370960,13 +379969,9 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x2B76,
        0x2B96,
        0x2B98,
-       0x2BBA,
-       0x2BBD,
        0x2BC9,
        0x2BCA,
-       0x2BD3,
-       0x2BEC,
-       0x2BF0,
+       0x2BFF,
        0x2C00,
        0x2C2F,
        0x2C30,
@@ -371002,7 +380007,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x2DD8,
        0x2DDF,
        0x2DE0,
-       0x2E4A,
+       0x2E4F,
        0x2E80,
        0x2E9A,
        0x2E9B,
@@ -371018,7 +380023,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x3099,
        0x3100,
        0x3105,
-       0x312F,
+       0x3130,
        0x3131,
        0x318F,
        0x3190,
@@ -371032,7 +380037,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x3300,
        0x4DB6,
        0x4DC0,
-       0x9FEB,
+       0x9FF0,
        0xA000,
        0xA48D,
        0xA490,
@@ -371042,9 +380047,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xA640,
        0xA6F8,
        0xA700,
-       0xA7AF,
-       0xA7B0,
-       0xA7B8,
+       0xA7BA,
        0xA7F7,
        0xA82C,
        0xA830,
@@ -371056,8 +380059,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xA8CE,
        0xA8DA,
        0xA8E0,
-       0xA8FE,
-       0xA900,
        0xA954,
        0xA95F,
        0xA97D,
@@ -371260,11 +380261,11 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x10A15,
        0x10A18,
        0x10A19,
-       0x10A34,
+       0x10A36,
        0x10A38,
        0x10A3B,
        0x10A3F,
-       0x10A48,
+       0x10A49,
        0x10A50,
        0x10A59,
        0x10A60,
@@ -371292,15 +380293,23 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x10CC0,
        0x10CF3,
        0x10CFA,
-       0x10D00,
+       0x10D28,
+       0x10D30,
+       0x10D3A,
        0x10E60,
        0x10E7F,
+       0x10F00,
+       0x10F28,
+       0x10F30,
+       0x10F5A,
        0x11000,
        0x1104E,
        0x11052,
        0x11070,
        0x1107F,
        0x110C2,
+       0x110CD,
+       0x110CE,
        0x110D0,
        0x110E9,
        0x110F0,
@@ -371308,7 +380317,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x11100,
        0x11135,
        0x11136,
-       0x11144,
+       0x11147,
        0x11150,
        0x11177,
        0x11180,
@@ -371349,7 +380358,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x11334,
        0x11335,
        0x1133A,
-       0x1133C,
+       0x1133B,
        0x11345,
        0x11347,
        0x11349,
@@ -371370,7 +380379,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1145B,
        0x1145C,
        0x1145D,
-       0x1145E,
+       0x1145F,
        0x11480,
        0x114C8,
        0x114D0,
@@ -371390,11 +380399,13 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x116C0,
        0x116CA,
        0x11700,
-       0x1171A,
+       0x1171B,
        0x1171D,
        0x1172C,
        0x11730,
        0x11740,
+       0x11800,
+       0x1183C,
        0x118A0,
        0x118F3,
        0x118FF,
@@ -371404,8 +380415,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x11A50,
        0x11A84,
        0x11A86,
-       0x11A9D,
-       0x11A9E,
        0x11AA3,
        0x11AC0,
        0x11AF9,
@@ -371437,6 +380446,20 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x11D48,
        0x11D50,
        0x11D5A,
+       0x11D60,
+       0x11D66,
+       0x11D67,
+       0x11D69,
+       0x11D6A,
+       0x11D8F,
+       0x11D90,
+       0x11D92,
+       0x11D93,
+       0x11D99,
+       0x11DA0,
+       0x11DAA,
+       0x11EE0,
+       0x11EF9,
        0x12000,
        0x1239A,
        0x12400,
@@ -371471,6 +380494,8 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x16B78,
        0x16B7D,
        0x16B90,
+       0x16E40,
+       0x16E9B,
        0x16F00,
        0x16F45,
        0x16F50,
@@ -371480,7 +380505,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x16FE0,
        0x16FE2,
        0x17000,
-       0x187ED,
+       0x187F2,
        0x18800,
        0x18AF3,
        0x1B000,
@@ -371505,10 +380530,12 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1D1E9,
        0x1D200,
        0x1D246,
+       0x1D2E0,
+       0x1D2F4,
        0x1D300,
        0x1D357,
        0x1D360,
-       0x1D372,
+       0x1D379,
        0x1D400,
        0x1D455,
        0x1D456,
@@ -371575,6 +380602,8 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1E95A,
        0x1E95E,
        0x1E960,
+       0x1EC71,
+       0x1ECB5,
        0x1EE00,
        0x1EE04,
        0x1EE05,
@@ -371658,8 +380687,6 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1F100,
        0x1F10D,
        0x1F110,
-       0x1F12F,
-       0x1F130,
        0x1F16C,
        0x1F170,
        0x1F1AD,
@@ -371678,11 +380705,11 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1F6E0,
        0x1F6ED,
        0x1F6F0,
-       0x1F6F9,
+       0x1F6FA,
        0x1F700,
        0x1F774,
        0x1F780,
-       0x1F7D5,
+       0x1F7D9,
        0x1F800,
        0x1F80C,
        0x1F810,
@@ -371698,15 +380725,21 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0x1F910,
        0x1F93F,
        0x1F940,
-       0x1F94D,
-       0x1F950,
-       0x1F96C,
-       0x1F980,
-       0x1F998,
+       0x1F971,
+       0x1F973,
+       0x1F977,
+       0x1F97A,
+       0x1F97B,
+       0x1F97C,
+       0x1F9A3,
+       0x1F9B0,
+       0x1F9BA,
        0x1F9C0,
-       0x1F9C1,
+       0x1F9C3,
        0x1F9D0,
-       0x1F9E7,
+       0x1FA00,
+       0x1FA60,
+       0x1FA6E,
        0x20000,
        0x2A6D7,
        0x2A700,
@@ -371727,7 +380760,7 @@ static const UV PL_ZZZZ_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL__PERL_NCHAR_invlist[] = { /* for all charsets */
+static const UV UNI__PERL_NCHAR_invlist[] = {  /* for all charsets */
        37,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -371773,7 +380806,7 @@ static const UV PL__PERL_NCHAR_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL__PERL_PATWS_invlist[] = { /* for ASCII/Latin1 */
+static const UV UNI__PERL_PATWS_invlist[] = {  /* for ASCII/Latin1 */
        11,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -371798,7 +380831,7 @@ static const UV PL__PERL_PATWS_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_PATWS_invlist[] = { /* for EBCDIC 1047 */
+static const UV UNI__PERL_PATWS_invlist[] = {  /* for EBCDIC 1047 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -371827,7 +380860,7 @@ static const UV PL__PERL_PATWS_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL__PERL_PATWS_invlist[] = { /* for EBCDIC 037 */
+static const UV UNI__PERL_PATWS_invlist[] = {  /* for EBCDIC 037 */
        15,     /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -371851,7 +380884,7 @@ static const UV PL__PERL_PATWS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL__PERL_SURROGATE_invlist[] = { /* for all charsets */
+static const UV UNI__PERL_SURROGATE_invlist[] = {  /* for all charsets */
        3,      /* Number of elements */
        148565664, /* Version and data structure type */
        1,      /* 0 if the list starts at 0;
@@ -371867,2316 +380900,2374 @@ const char * deprecated_property_msgs[] = {
        "Supplanted by Line_Break property values; see www.unicode.org/reports/tr14"
 };
 
-#define PL_HYPHEN (PL_HYPHEN_perl_aux + (MAX_UNI_KEYWORD_INDEX * 2))
-#define PL_LB__SG (PL_LB__SG_perl_aux + (MAX_UNI_KEYWORD_INDEX * 1))
+#define UNI_HYPHEN (UNI_HYPHEN_perl_aux + (MAX_UNI_KEYWORD_INDEX * 2))
+#define UNI_LB__SG (UNI_LB__SG_perl_aux + (MAX_UNI_KEYWORD_INDEX * 1))
 
 typedef enum {
        PERL_BIN_PLACEHOLDER = 0,
-       PL_ADLM,
-       PL_AEGEANNUMBERS,
-       PL_AGE__10,
-       PL_AGE__2,
-       PL_AGE__2_DOT_1,
-       PL_AGE__3,
-       PL_AGE__3_DOT_1,
-       PL_AGE__3_DOT_2,
-       PL_AGE__4,
-       PL_AGE__4_DOT_1,
-       PL_AGE__5,
-       PL_AGE__5_DOT_1,
-       PL_AGE__5_DOT_2,
-       PL_AGE__6,
-       PL_AGE__6_DOT_1,
-       PL_AGE__6_DOT_2,
-       PL_AGE__6_DOT_3,
-       PL_AGE__7,
-       PL_AGE__8,
-       PL_AGE__9,
-       PL_AGE__NA,
-       PL_AGHB,
-       PL_AHOM,
-       PL_ALCHEMICAL,
-       PL_ALL,
-       PL_ALPHABETICPF,
-       PL_ANCIENTGREEKMUSIC,
-       PL_ANCIENTGREEKNUMBERS,
-       PL_ANCIENTSYMBOLS,
-       PL_ANY,
-       PL_ARAB,
-       PL_ARABICEXTA,
-       PL_ARABICMATH,
-       PL_ARABICPFA,
-       PL_ARABICPFB,
-       PL_ARABICSUP,
-       PL_ARMI,
-       PL_ARMN,
-       PL_ARROWS,
-       PL_ASCII,
-       PL_ASSIGNED,
-       PL_AVST,
-       PL_BALI,
-       PL_BAMU,
-       PL_BAMUMSUP,
-       PL_BASS,
-       PL_BATK,
-       PL_BC__AL,
-       PL_BC__AN,
-       PL_BC__B,
-       PL_BC__BN,
-       PL_BC__CS,
-       PL_BC__EN,
-       PL_BC__ES,
-       PL_BC__ET,
-       PL_BC__FSI,
-       PL_BC__L,
-       PL_BC__LRE,
-       PL_BC__LRI,
-       PL_BC__LRO,
-       PL_BC__NSM,
-       PL_BC__ON,
-       PL_BC__PDF,
-       PL_BC__PDI,
-       PL_BC__R,
-       PL_BC__RLE,
-       PL_BC__RLI,
-       PL_BC__RLO,
-       PL_BC__S,
-       PL_BC__WS,
-       PL_BENG,
-       PL_BHKS,
-       PL_BIDIC,
-       PL_BIDIM,
-       PL_BLOCKELEMENTS,
-       PL_BOPO,
-       PL_BOPOMOFOEXT,
-       PL_BOXDRAWING,
-       PL_BPT__C,
-       PL_BPT__N,
-       PL_BPT__O,
-       PL_BRAH,
-       PL_BRAI,
-       PL_BUGI,
-       PL_BUHD,
-       PL_BYZANTINEMUSIC,
-       PL_C,
-       PL_CAKM,
-       PL_CANS,
-       PL_CARI,
-       PL_CASED,
-       PL_CASEDLETTER,
-       PL_CCC__0,
-       PL_CCC__1,
-       PL_CCC__10,
-       PL_CCC__103,
-       PL_CCC__107,
-       PL_CCC__11,
-       PL_CCC__118,
-       PL_CCC__12,
-       PL_CCC__122,
-       PL_CCC__129,
-       PL_CCC__13,
-       PL_CCC__130,
-       PL_CCC__132,
-       PL_CCC__133,
-       PL_CCC__14,
-       PL_CCC__15,
-       PL_CCC__16,
-       PL_CCC__17,
-       PL_CCC__18,
-       PL_CCC__19,
-       PL_CCC__20,
-       PL_CCC__202,
-       PL_CCC__21,
-       PL_CCC__214,
-       PL_CCC__216,
-       PL_CCC__22,
-       PL_CCC__23,
-       PL_CCC__24,
-       PL_CCC__25,
-       PL_CCC__26,
-       PL_CCC__27,
-       PL_CCC__28,
-       PL_CCC__29,
-       PL_CCC__30,
-       PL_CCC__31,
-       PL_CCC__32,
-       PL_CCC__33,
-       PL_CCC__34,
-       PL_CCC__35,
-       PL_CCC__36,
-       PL_CCC__7,
-       PL_CCC__8,
-       PL_CCC__84,
-       PL_CCC__9,
-       PL_CCC__91,
-       PL_CCC__A,
-       PL_CCC__AL,
-       PL_CCC__AR,
-       PL_CCC__B,
-       PL_CCC__BL,
-       PL_CCC__BR,
-       PL_CCC__DA,
-       PL_CCC__DB,
-       PL_CCC__IS,
-       PL_CCC__L,
-       PL_CCC__R,
-       PL_CE,
-       PL_CF,
-       PL_CHAM,
-       PL_CHER,
-       PL_CHEROKEESUP,
-       PL_CI,
-       PL_CJK,
-       PL_CJKCOMPAT,
-       PL_CJKCOMPATFORMS,
-       PL_CJKCOMPATIDEOGRAPHS,
-       PL_CJKCOMPATIDEOGRAPHSSUP,
-       PL_CJKEXTA,
-       PL_CJKEXTB,
-       PL_CJKEXTC,
-       PL_CJKEXTD,
-       PL_CJKEXTE,
-       PL_CJKEXTF,
-       PL_CJKRADICALSSUP,
-       PL_CJKSTROKES,
-       PL_CJKSYMBOLS,
-       PL_CN,
-       PL_CO,
-       PL_COMPATJAMO,
-       PL_COMPEX,
-       PL_CONTROLPICTURES,
-       PL_COPT,
-       PL_COPTICEPACTNUMBERS,
-       PL_COUNTINGROD,
-       PL_CPRT,
-       PL_CUNEIFORMNUMBERS,
-       PL_CURRENCYSYMBOLS,
-       PL_CWCF,
-       PL_CWCM,
-       PL_CWKCF,
-       PL_CWL,
-       PL_CWT,
-       PL_CWU,
-       PL_CYPRIOTSYLLABARY,
-       PL_CYRILLICEXTA,
-       PL_CYRILLICEXTB,
-       PL_CYRILLICEXTC,
-       PL_CYRILLICSUP,
-       PL_CYRL,
-       PL_DASH,
-       PL_DEP,
-       PL_DEVA,
-       PL_DEVANAGARIEXT,
-       PL_DI,
-       PL_DIA,
-       PL_DIACRITICALS,
-       PL_DIACRITICALSEXT,
-       PL_DIACRITICALSFORSYMBOLS,
-       PL_DIACRITICALSSUP,
-       PL_DINGBATS,
-       PL_DOMINO,
-       PL_DSRT,
-       PL_DT__CAN,
-       PL_DT__COM,
-       PL_DT__ENC,
-       PL_DT__FIN,
-       PL_DT__FONT,
-       PL_DT__FRA,
-       PL_DT__INIT,
-       PL_DT__ISO,
-       PL_DT__MED,
-       PL_DT__NAR,
-       PL_DT__NB,
-       PL_DT__NONCANON,
-       PL_DT__NONE,
-       PL_DT__SML,
-       PL_DT__SQR,
-       PL_DT__SUB,
-       PL_DT__SUP,
-       PL_DT__VERT,
-       PL_DUPL,
-       PL_EARLYDYNASTICCUNEIFORM,
-       PL_EA__A,
-       PL_EA__F,
-       PL_EA__H,
-       PL_EA__N,
-       PL_EA__NA,
-       PL_EA__W,
-       PL_EGYP,
-       PL_ELBA,
-       PL_EMOTICONS,
-       PL_ENCLOSEDALPHANUM,
-       PL_ENCLOSEDALPHANUMSUP,
-       PL_ENCLOSEDCJK,
-       PL_ENCLOSEDIDEOGRAPHICSUP,
-       PL_ETHI,
-       PL_ETHIOPICEXT,
-       PL_ETHIOPICEXTA,
-       PL_ETHIOPICSUP,
-       PL_EXT,
-       PL_GCB__CN,
-       PL_GCB__L,
-       PL_GCB__PP,
-       PL_GCB__SM,
-       PL_GCB__T,
-       PL_GCB__V,
-       PL_GCB__XX,
-       PL_GEOMETRICSHAPES,
-       PL_GEOMETRICSHAPESEXT,
-       PL_GEOR,
-       PL_GEORGIANSUP,
-       PL_GLAG,
-       PL_GLAGOLITICSUP,
-       PL_GONM,
-       PL_GOTH,
-       PL_GRAN,
-       PL_GRBASE,
-       PL_GREEKEXT,
-       PL_GREK,
-       PL_GREXT,
-       PL_GUJR,
-       PL_GURU,
-       PL_HALFANDFULLFORMS,
-       PL_HALFMARKS,
-       PL_HAN,
-       PL_HANG,
-       PL_HANO,
-       PL_HATR,
-       PL_HEBR,
-       PL_HIGHPUSURROGATES,
-       PL_HIGHSURROGATES,
-       PL_HIRA,
-       PL_HLUW,
-       PL_HMNG,
-       PL_HST__NA,
-       PL_HUNG,
-       PL_HYPHEN_perl_aux,
-       PL_IDC,
-       PL_IDEO,
-       PL_IDEOGRAPHICSYMBOLS,
-       PL_IDS,
-       PL_IDSB,
-       PL_IDST,
-       PL_INADLAM,
-       PL_INAHOM,
-       PL_INANATOLIANHIEROGLYPHS,
-       PL_INARABIC,
-       PL_INARMENIAN,
-       PL_INAVESTAN,
-       PL_INBALINESE,
-       PL_INBAMUM,
-       PL_INBASSAVAH,
-       PL_INBATAK,
-       PL_INBENGALI,
-       PL_INBHAIKSUKI,
-       PL_INBOPOMOFO,
-       PL_INBRAHMI,
-       PL_INBUGINESE,
-       PL_INBUHID,
-       PL_INCARIAN,
-       PL_INCAUCASIANALBANIAN,
-       PL_INCHAKMA,
-       PL_INCHAM,
-       PL_INCHEROKEE,
-       PL_INCOPTIC,
-       PL_INCUNEIFORM,
-       PL_INCYRILLIC,
-       PL_INDEVANAGARI,
-       PL_INDICNUMBERFORMS,
-       PL_INDUPLOYAN,
-       PL_INEGYPTIANHIEROGLYPHS,
-       PL_INELBASAN,
-       PL_INETHIOPIC,
-       PL_INGEORGIAN,
-       PL_INGLAGOLITIC,
-       PL_INGOTHIC,
-       PL_INGRANTHA,
-       PL_INGREEK,
-       PL_INGUJARATI,
-       PL_INGURMUKHI,
-       PL_INHANGUL,
-       PL_INHANUNOO,
-       PL_INHATRAN,
-       PL_INHEBREW,
-       PL_INHIRAGANA,
-       PL_INIDC,
-       PL_INIMPERIALARAMAIC,
-       PL_ININSCRIPTIONALPAHLAVI,
-       PL_ININSCRIPTIONALPARTHIAN,
-       PL_INJAVANESE,
-       PL_INKAITHI,
-       PL_INKANNADA,
-       PL_INKATAKANA,
-       PL_INKHAROSHTHI,
-       PL_INKHMER,
-       PL_INKHOJKI,
-       PL_INKHUDAWADI,
-       PL_INLAO,
-       PL_INLEPCHA,
-       PL_INLIMBU,
-       PL_INLINEARA,
-       PL_INLYCIAN,
-       PL_INLYDIAN,
-       PL_INMAHAJANI,
-       PL_INMALAYALAM,
-       PL_INMANDAIC,
-       PL_INMANICHAEAN,
-       PL_INMARCHEN,
-       PL_INMASARAMGONDI,
-       PL_INMEETEIMAYEK,
-       PL_INMENDEKIKAKUI,
-       PL_INMEROITICCURSIVE,
-       PL_INMIAO,
-       PL_INMODI,
-       PL_INMONGOLIAN,
-       PL_INMRO,
-       PL_INMULTANI,
-       PL_INMYANMAR,
-       PL_INNABATAEAN,
-       PL_INNEWA,
-       PL_INNEWTAILUE,
-       PL_INNKO,
-       PL_INNUSHU,
-       PL_INOGHAM,
-       PL_INOLDHUNGARIAN,
-       PL_INOLDITALIC,
-       PL_INOLDPERMIC,
-       PL_INOLDPERSIAN,
-       PL_INOLDTURKIC,
-       PL_INORIYA,
-       PL_INOSAGE,
-       PL_INOSMANYA,
-       PL_INPAHAWHHMONG,
-       PL_INPAUCINHAU,
-       PL_INPC__BOTTOM,
-       PL_INPC__BOTTOMANDLEFT,
-       PL_INPC__BOTTOMANDRIGHT,
-       PL_INPC__LEFT,
-       PL_INPC__LEFTANDRIGHT,
-       PL_INPC__NA,
-       PL_INPC__OVERSTRUCK,
-       PL_INPC__RIGHT,
-       PL_INPC__TOP,
-       PL_INPC__TOPANDBOTTOM,
-       PL_INPC__TOPANDBOTTOMANDRIGHT,
-       PL_INPC__TOPANDLEFT,
-       PL_INPC__TOPANDLEFTANDRIGHT,
-       PL_INPC__TOPANDRIGHT,
-       PL_INPHAGSPA,
-       PL_INPHOENICIAN,
-       PL_INPSALTERPAHLAVI,
-       PL_INPUNCTUATION,
-       PL_INREJANG,
-       PL_INRUNIC,
-       PL_INSAMARITAN,
-       PL_INSAURASHTRA,
-       PL_INSC__AVAGRAHA,
-       PL_INSC__BINDU,
-       PL_INSC__BRAHMIJOININGNUMBER,
-       PL_INSC__CANTILLATIONMARK,
-       PL_INSC__CONSONANT,
-       PL_INSC__CONSONANTDEAD,
-       PL_INSC__CONSONANTFINAL,
-       PL_INSC__CONSONANTHEADLETTER,
-       PL_INSC__CONSONANTKILLER,
-       PL_INSC__CONSONANTMEDIAL,
-       PL_INSC__CONSONANTPLACEHOLDER,
-       PL_INSC__CONSONANTPRECEDINGREPHA,
-       PL_INSC__CONSONANTPREFIXED,
-       PL_INSC__CONSONANTSUBJOINED,
-       PL_INSC__CONSONANTSUCCEEDINGREPHA,
-       PL_INSC__CONSONANTWITHSTACKER,
-       PL_INSC__GEMINATIONMARK,
-       PL_INSC__INVISIBLESTACKER,
-       PL_INSC__MODIFYINGLETTER,
-       PL_INSC__NONJOINER,
-       PL_INSC__NUKTA,
-       PL_INSC__NUMBER,
-       PL_INSC__NUMBERJOINER,
-       PL_INSC__OTHER,
-       PL_INSC__PUREKILLER,
-       PL_INSC__REGISTERSHIFTER,
-       PL_INSC__SYLLABLEMODIFIER,
-       PL_INSC__TONELETTER,
-       PL_INSC__TONEMARK,
-       PL_INSC__VIRAMA,
-       PL_INSC__VISARGA,
-       PL_INSC__VOWEL,
-       PL_INSC__VOWELDEPENDENT,
-       PL_INSC__VOWELINDEPENDENT,
-       PL_INSHARADA,
-       PL_INSIDDHAM,
-       PL_INSINHALA,
-       PL_INSORASOMPENG,
-       PL_INSOYOMBO,
-       PL_INSUNDANESE,
-       PL_INSYLOTINAGRI,
-       PL_INSYRIAC,
-       PL_INTAGALOG,
-       PL_INTAGBANWA,
-       PL_INTAILE,
-       PL_INTAITHAM,
-       PL_INTAIVIET,
-       PL_INTAKRI,
-       PL_INTAMIL,
-       PL_INTANGUT,
-       PL_INTELUGU,
-       PL_INTHAANA,
-       PL_INTHAI,
-       PL_INTIBETAN,
-       PL_INTIFINAGH,
-       PL_INTIRHUTA,
-       PL_INUGARITIC,
-       PL_INVAI,
-       PL_INVS,
-       PL_INWARANGCITI,
-       PL_INZANABAZARSQUARE,
-       PL_IN__10,
-       PL_IN__1_DOT_1,
-       PL_IN__2,
-       PL_IN__2_DOT_1,
-       PL_IN__3,
-       PL_IN__3_DOT_1,
-       PL_IN__3_DOT_2,
-       PL_IN__4,
-       PL_IN__4_DOT_1,
-       PL_IN__5,
-       PL_IN__5_DOT_1,
-       PL_IN__5_DOT_2,
-       PL_IN__6,
-       PL_IN__6_DOT_1,
-       PL_IN__6_DOT_2,
-       PL_IN__6_DOT_3,
-       PL_IN__7,
-       PL_IN__8,
-       PL_IN__9,
-       PL_IPAEXT,
-       PL_ITAL,
-       PL_JAMO,
-       PL_JAMOEXTA,
-       PL_JAMOEXTB,
-       PL_JAVA,
-       PL_JG__AFRICANFEH,
-       PL_JG__AFRICANNOON,
-       PL_JG__AFRICANQAF,
-       PL_JG__AIN,
-       PL_JG__ALAPH,
-       PL_JG__ALEF,
-       PL_JG__BEH,
-       PL_JG__BETH,
-       PL_JG__BURUSHASKIYEHBARREE,
-       PL_JG__DAL,
-       PL_JG__DALATHRISH,
-       PL_JG__E,
-       PL_JG__FARSIYEH,
-       PL_JG__FE,
-       PL_JG__FEH,
-       PL_JG__FINALSEMKATH,
-       PL_JG__GAF,
-       PL_JG__GAMAL,
-       PL_JG__HAH,
-       PL_JG__HAMZAONHEHGOAL,
-       PL_JG__HE,
-       PL_JG__HEH,
-       PL_JG__HEHGOAL,
-       PL_JG__HETH,
-       PL_JG__KAF,
-       PL_JG__KAPH,
-       PL_JG__KHAPH,
-       PL_JG__KNOTTEDHEH,
-       PL_JG__LAM,
-       PL_JG__LAMADH,
-       PL_JG__MALAYALAMBHA,
-       PL_JG__MALAYALAMJA,
-       PL_JG__MALAYALAMLLA,
-       PL_JG__MALAYALAMLLLA,
-       PL_JG__MALAYALAMNGA,
-       PL_JG__MALAYALAMNNA,
-       PL_JG__MALAYALAMNNNA,
-       PL_JG__MALAYALAMNYA,
-       PL_JG__MALAYALAMRA,
-       PL_JG__MALAYALAMSSA,
-       PL_JG__MALAYALAMTTA,
-       PL_JG__MANICHAEANALEPH,
-       PL_JG__MANICHAEANAYIN,
-       PL_JG__MANICHAEANBETH,
-       PL_JG__MANICHAEANDALETH,
-       PL_JG__MANICHAEANDHAMEDH,
-       PL_JG__MANICHAEANFIVE,
-       PL_JG__MANICHAEANGIMEL,
-       PL_JG__MANICHAEANHETH,
-       PL_JG__MANICHAEANHUNDRED,
-       PL_JG__MANICHAEANKAPH,
-       PL_JG__MANICHAEANLAMEDH,
-       PL_JG__MANICHAEANMEM,
-       PL_JG__MANICHAEANNUN,
-       PL_JG__MANICHAEANONE,
-       PL_JG__MANICHAEANPE,
-       PL_JG__MANICHAEANQOPH,
-       PL_JG__MANICHAEANRESH,
-       PL_JG__MANICHAEANSADHE,
-       PL_JG__MANICHAEANSAMEKH,
-       PL_JG__MANICHAEANTAW,
-       PL_JG__MANICHAEANTEN,
-       PL_JG__MANICHAEANTETH,
-       PL_JG__MANICHAEANTHAMEDH,
-       PL_JG__MANICHAEANTWENTY,
-       PL_JG__MANICHAEANWAW,
-       PL_JG__MANICHAEANYODH,
-       PL_JG__MANICHAEANZAYIN,
-       PL_JG__MEEM,
-       PL_JG__MIM,
-       PL_JG__NOJOININGGROUP,
-       PL_JG__NOON,
-       PL_JG__NUN,
-       PL_JG__NYA,
-       PL_JG__PE,
-       PL_JG__QAF,
-       PL_JG__QAPH,
-       PL_JG__REH,
-       PL_JG__REVERSEDPE,
-       PL_JG__ROHINGYAYEH,
-       PL_JG__SAD,
-       PL_JG__SADHE,
-       PL_JG__SEEN,
-       PL_JG__SEMKATH,
-       PL_JG__SHIN,
-       PL_JG__STRAIGHTWAW,
-       PL_JG__SWASHKAF,
-       PL_JG__SYRIACWAW,
-       PL_JG__TAH,
-       PL_JG__TAW,
-       PL_JG__TEHMARBUTA,
-       PL_JG__TETH,
-       PL_JG__WAW,
-       PL_JG__YEH,
-       PL_JG__YEHBARREE,
-       PL_JG__YEHWITHTAIL,
-       PL_JG__YUDH,
-       PL_JG__YUDHHE,
-       PL_JG__ZAIN,
-       PL_JG__ZHAIN,
-       PL_JOINC,
-       PL_JT__C,
-       PL_JT__D,
-       PL_JT__L,
-       PL_JT__R,
-       PL_JT__T,
-       PL_JT__U,
-       PL_KALI,
-       PL_KANA,
-       PL_KANAEXTA,
-       PL_KANASUP,
-       PL_KANBUN,
-       PL_KANGXI,
-       PL_KATAKANAEXT,
-       PL_KHAR,
-       PL_KHMERSYMBOLS,
-       PL_KHMR,
-       PL_KHOJ,
-       PL_KNDA,
-       PL_KTHI,
-       PL_L,
-       PL_LANA,
-       PL_LAO,
-       PL_LATIN1,
-       PL_LATINEXTA,
-       PL_LATINEXTADDITIONAL,
-       PL_LATINEXTB,
-       PL_LATINEXTC,
-       PL_LATINEXTD,
-       PL_LATINEXTE,
-       PL_LATN,
-       PL_LB__AI,
-       PL_LB__AL,
-       PL_LB__B2,
-       PL_LB__BA,
-       PL_LB__BB,
-       PL_LB__BK,
-       PL_LB__CB,
-       PL_LB__CJ,
-       PL_LB__CL,
-       PL_LB__CM,
-       PL_LB__CP,
-       PL_LB__CR,
-       PL_LB__EB,
-       PL_LB__EM,
-       PL_LB__EX,
-       PL_LB__GL,
-       PL_LB__H2,
-       PL_LB__H3,
-       PL_LB__HL,
-       PL_LB__HY,
-       PL_LB__ID,
-       PL_LB__IN,
-       PL_LB__IS,
-       PL_LB__LF,
-       PL_LB__NL,
-       PL_LB__NS,
-       PL_LB__NU,
-       PL_LB__OP,
-       PL_LB__PO,
-       PL_LB__PR,
-       PL_LB__QU,
-       PL_LB__SA,
-       PL_LB__SG_perl_aux,
-       PL_LB__SP,
-       PL_LB__SY,
-       PL_LB__WJ,
-       PL_LB__XX,
-       PL_LB__ZW,
-       PL_LB__ZWJ,
-       PL_LEPC,
-       PL_LETTERLIKESYMBOLS,
-       PL_LIMB,
-       PL_LINA,
-       PL_LINB,
-       PL_LINEARBIDEOGRAMS,
-       PL_LINEARBSYLLABARY,
-       PL_LISU,
-       PL_LM,
-       PL_LO,
-       PL_LOE,
-       PL_LOWERCASELETTER,
-       PL_LOWSURROGATES,
-       PL_LYCI,
-       PL_LYDI,
-       PL_M,
-       PL_MAHJ,
-       PL_MAHJONG,
-       PL_MAND,
-       PL_MANI,
-       PL_MARC,
-       PL_MATH,
-       PL_MATHALPHANUM,
-       PL_MATHOPERATORS,
-       PL_MC,
-       PL_ME,
-       PL_MEETEIMAYEKEXT,
-       PL_MEND,
-       PL_MERC,
-       PL_MERO,
-       PL_MIAO,
-       PL_MISCARROWS,
-       PL_MISCMATHSYMBOLSA,
-       PL_MISCMATHSYMBOLSB,
-       PL_MISCPICTOGRAPHS,
-       PL_MISCSYMBOLS,
-       PL_MISCTECHNICAL,
-       PL_MLYM,
-       PL_MN,
-       PL_MODI,
-       PL_MODIFIERLETTERS,
-       PL_MODIFIERTONELETTERS,
-       PL_MONG,
-       PL_MONGOLIANSUP,
-       PL_MRO,
-       PL_MTEI,
-       PL_MULT,
-       PL_MUSIC,
-       PL_MYANMAREXTA,
-       PL_MYANMAREXTB,
-       PL_MYMR,
-       PL_N,
-       PL_NARB,
-       PL_NB,
-       PL_NBAT,
-       PL_NEWA,
-       PL_NFCQC__M,
-       PL_NFCQC__Y,
-       PL_NFDQC__Y,
-       PL_NFKCQC__N,
-       PL_NFKCQC__Y,
-       PL_NFKDQC__N,
-       PL_NKO,
-       PL_NL,
-       PL_NO,
-       PL_NSHU,
-       PL_NT__DI,
-       PL_NT__NU,
-       PL_NUMBERFORMS,
-       PL_NV__0,
-       PL_NV__1,
-       PL_NV__10,
-       PL_NV__100,
-       PL_NV__1000,
-       PL_NV__10000,
-       PL_NV__100000,
-       PL_NV__1000000,
-       PL_NV__100000000,
-       PL_NV__10000000000,
-       PL_NV__1000000000000,
-       PL_NV__11,
-       PL_NV__11_SLASH_12,
-       PL_NV__11_SLASH_2,
-       PL_NV__12,
-       PL_NV__13,
-       PL_NV__13_SLASH_2,
-       PL_NV__14,
-       PL_NV__15,
-       PL_NV__15_SLASH_2,
-       PL_NV__16,
-       PL_NV__17,
-       PL_NV__17_SLASH_2,
-       PL_NV__18,
-       PL_NV__19,
-       PL_NV__1_SLASH_10,
-       PL_NV__1_SLASH_12,
-       PL_NV__1_SLASH_16,
-       PL_NV__1_SLASH_160,
-       PL_NV__1_SLASH_2,
-       PL_NV__1_SLASH_20,
-       PL_NV__1_SLASH_3,
-       PL_NV__1_SLASH_4,
-       PL_NV__1_SLASH_40,
-       PL_NV__1_SLASH_5,
-       PL_NV__1_SLASH_6,
-       PL_NV__1_SLASH_7,
-       PL_NV__1_SLASH_8,
-       PL_NV__1_SLASH_9,
-       PL_NV__2,
-       PL_NV__20,
-       PL_NV__200,
-       PL_NV__2000,
-       PL_NV__20000,
-       PL_NV__200000,
-       PL_NV__21,
-       PL_NV__216000,
-       PL_NV__22,
-       PL_NV__23,
-       PL_NV__24,
-       PL_NV__25,
-       PL_NV__26,
-       PL_NV__27,
-       PL_NV__28,
-       PL_NV__29,
-       PL_NV__2_SLASH_3,
-       PL_NV__2_SLASH_5,
-       PL_NV__3,
-       PL_NV__30,
-       PL_NV__300,
-       PL_NV__3000,
-       PL_NV__30000,
-       PL_NV__300000,
-       PL_NV__31,
-       PL_NV__32,
-       PL_NV__33,
-       PL_NV__34,
-       PL_NV__35,
-       PL_NV__36,
-       PL_NV__37,
-       PL_NV__38,
-       PL_NV__39,
-       PL_NV__3_SLASH_16,
-       PL_NV__3_SLASH_2,
-       PL_NV__3_SLASH_20,
-       PL_NV__3_SLASH_4,
-       PL_NV__3_SLASH_5,
-       PL_NV__3_SLASH_8,
-       PL_NV__3_SLASH_80,
-       PL_NV__4,
-       PL_NV__40,
-       PL_NV__400,
-       PL_NV__4000,
-       PL_NV__40000,
-       PL_NV__400000,
-       PL_NV__41,
-       PL_NV__42,
-       PL_NV__43,
-       PL_NV__432000,
-       PL_NV__44,
-       PL_NV__45,
-       PL_NV__46,
-       PL_NV__47,
-       PL_NV__48,
-       PL_NV__49,
-       PL_NV__4_SLASH_5,
-       PL_NV__5,
-       PL_NV__50,
-       PL_NV__500,
-       PL_NV__5000,
-       PL_NV__50000,
-       PL_NV__500000,
-       PL_NV__5_SLASH_12,
-       PL_NV__5_SLASH_2,
-       PL_NV__5_SLASH_6,
-       PL_NV__5_SLASH_8,
-       PL_NV__6,
-       PL_NV__60,
-       PL_NV__600,
-       PL_NV__6000,
-       PL_NV__60000,
-       PL_NV__600000,
-       PL_NV__7,
-       PL_NV__70,
-       PL_NV__700,
-       PL_NV__7000,
-       PL_NV__70000,
-       PL_NV__700000,
-       PL_NV__7_SLASH_12,
-       PL_NV__7_SLASH_2,
-       PL_NV__7_SLASH_8,
-       PL_NV__8,
-       PL_NV__80,
-       PL_NV__800,
-       PL_NV__8000,
-       PL_NV__80000,
-       PL_NV__800000,
-       PL_NV__9,
-       PL_NV__90,
-       PL_NV__900,
-       PL_NV__9000,
-       PL_NV__90000,
-       PL_NV__900000,
-       PL_NV__9_SLASH_2,
-       PL_NV__NAN,
-       PL_NV___MINUS_1_SLASH_2,
-       PL_OCR,
-       PL_OGAM,
-       PL_OLCK,
-       PL_ORKH,
-       PL_ORNAMENTALDINGBATS,
-       PL_ORYA,
-       PL_OSGE,
-       PL_OSMA,
-       PL_P,
-       PL_PALM,
-       PL_PATSYN,
-       PL_PAUC,
-       PL_PC,
-       PL_PCM,
-       PL_PD,
-       PL_PE,
-       PL_PERM,
-       PL_PF,
-       PL_PHAG,
-       PL_PHAISTOS,
-       PL_PHLI,
-       PL_PHLP,
-       PL_PHNX,
-       PL_PHONETICEXT,
-       PL_PHONETICEXTSUP,
-       PL_PI,
-       PL_PLAYINGCARDS,
-       PL_PO,
-       PL_POSIXALNUM,
-       PL_POSIXALPHA,
-       PL_POSIXBLANK,
-       PL_POSIXCNTRL,
-       PL_POSIXDIGIT,
-       PL_POSIXGRAPH,
-       PL_POSIXLOWER,
-       PL_POSIXPRINT,
-       PL_POSIXPUNCT,
-       PL_POSIXSPACE,
-       PL_POSIXUPPER,
-       PL_POSIXWORD,
-       PL_POSIXXDIGIT,
-       PL_PRTI,
-       PL_PS,
-       PL_PUA,
-       PL_QAAI,
-       PL_QMARK,
-       PL_RADICAL,
-       PL_RI,
-       PL_RJNG,
-       PL_RUMI,
-       PL_RUNR,
-       PL_S,
-       PL_SAMR,
-       PL_SARB,
-       PL_SAUR,
-       PL_SB__AT,
-       PL_SB__CL,
-       PL_SB__EX,
-       PL_SB__FO,
-       PL_SB__LE,
-       PL_SB__LO,
-       PL_SB__SC,
-       PL_SB__SE,
-       PL_SB__SP,
-       PL_SB__ST,
-       PL_SB__UP,
-       PL_SB__XX,
-       PL_SC,
-       PL_SC__ADLM,
-       PL_SC__ARAB,
-       PL_SC__ARMN,
-       PL_SC__BENG,
-       PL_SC__BOPO,
-       PL_SC__BUGI,
-       PL_SC__BUHD,
-       PL_SC__CAKM,
-       PL_SC__COPT,
-       PL_SC__CPRT,
-       PL_SC__CYRL,
-       PL_SC__DEVA,
-       PL_SC__DUPL,
-       PL_SC__GEOR,
-       PL_SC__GLAG,
-       PL_SC__GRAN,
-       PL_SC__GREK,
-       PL_SC__GUJR,
-       PL_SC__GURU,
-       PL_SC__HAN,
-       PL_SC__HANG,
-       PL_SC__HANO,
-       PL_SC__HIRA,
-       PL_SC__JAVA,
-       PL_SC__KALI,
-       PL_SC__KANA,
-       PL_SC__KHOJ,
-       PL_SC__KNDA,
-       PL_SC__KTHI,
-       PL_SC__LATN,
-       PL_SC__LIMB,
-       PL_SC__LINA,
-       PL_SC__LINB,
-       PL_SC__MAHJ,
-       PL_SC__MAND,
-       PL_SC__MANI,
-       PL_SC__MLYM,
-       PL_SC__MODI,
-       PL_SC__MONG,
-       PL_SC__MULT,
-       PL_SC__MYMR,
-       PL_SC__ORYA,
-       PL_SC__PERM,
-       PL_SC__PHAG,
-       PL_SC__PHLP,
-       PL_SC__QAAI,
-       PL_SC__SHRD,
-       PL_SC__SIND,
-       PL_SC__SINH,
-       PL_SC__SYLO,
-       PL_SC__SYRC,
-       PL_SC__TAGB,
-       PL_SC__TAKR,
-       PL_SC__TALE,
-       PL_SC__TAML,
-       PL_SC__TELU,
-       PL_SC__TGLG,
-       PL_SC__THAA,
-       PL_SC__TIRH,
-       PL_SC__YI,
-       PL_SC__ZYYY,
-       PL_SD,
-       PL_SGNW,
-       PL_SHAW,
-       PL_SHORTHANDFORMATCONTROLS,
-       PL_SHRD,
-       PL_SIDD,
-       PL_SIND,
-       PL_SINH,
-       PL_SINHALAARCHAICNUMBERS,
-       PL_SK,
-       PL_SM,
-       PL_SMALLFORMS,
-       PL_SO,
-       PL_SORA,
-       PL_SOYO,
-       PL_SPECIALS,
-       PL_STERM,
-       PL_SUND,
-       PL_SUNDANESESUP,
-       PL_SUPARROWSA,
-       PL_SUPARROWSB,
-       PL_SUPARROWSC,
-       PL_SUPERANDSUB,
-       PL_SUPMATHOPERATORS,
-       PL_SUPPUAA,
-       PL_SUPPUAB,
-       PL_SUPPUNCTUATION,
-       PL_SUPSYMBOLSANDPICTOGRAPHS,
-       PL_SUTTONSIGNWRITING,
-       PL_SYLO,
-       PL_SYRC,
-       PL_SYRIACSUP,
-       PL_TAGB,
-       PL_TAGS,
-       PL_TAIXUANJING,
-       PL_TAKR,
-       PL_TALE,
-       PL_TALU,
-       PL_TAML,
-       PL_TANG,
-       PL_TANGUTCOMPONENTS,
-       PL_TAVT,
-       PL_TELU,
-       PL_TERM,
-       PL_TFNG,
-       PL_TGLG,
-       PL_THAA,
-       PL_THAI,
-       PL_TIBT,
-       PL_TIRH,
-       PL_TITLE,
-       PL_TRANSPORTANDMAP,
-       PL_UCAS,
-       PL_UCASEXT,
-       PL_UGAR,
-       PL_UIDEO,
-       PL_UPPERCASELETTER,
-       PL_VAI,
-       PL_VEDICEXT,
-       PL_VERTICALFORMS,
-       PL_VERTSPACE,
-       PL_VO__R,
-       PL_VO__TR,
-       PL_VO__TU,
-       PL_VO__U,
-       PL_VS,
-       PL_VSSUP,
-       PL_WARA,
-       PL_WB__DQ,
-       PL_WB__EB,
-       PL_WB__EBG,
-       PL_WB__EX,
-       PL_WB__EXTEND,
-       PL_WB__FO,
-       PL_WB__GAZ,
-       PL_WB__KA,
-       PL_WB__LE,
-       PL_WB__MB,
-       PL_WB__ML,
-       PL_WB__MN,
-       PL_WB__NL,
-       PL_WB__NU,
-       PL_WB__SQ,
-       PL_WB__XX,
-       PL_XIDC,
-       PL_XIDS,
-       PL_XPEO,
-       PL_XPOSIXALNUM,
-       PL_XPOSIXALPHA,
-       PL_XPOSIXBLANK,
-       PL_XPOSIXCNTRL,
-       PL_XPOSIXDIGIT,
-       PL_XPOSIXGRAPH,
-       PL_XPOSIXLOWER,
-       PL_XPOSIXPRINT,
-       PL_XPOSIXPUNCT,
-       PL_XPOSIXSPACE,
-       PL_XPOSIXUPPER,
-       PL_XPOSIXWORD,
-       PL_XPOSIXXDIGIT,
-       PL_XSUX,
-       PL_YI,
-       PL_YIJING,
-       PL_YIRADICALS,
-       PL_YISYLLABLES,
-       PL_Z,
-       PL_ZANB,
-       PL_ZL,
-       PL_ZP,
-       PL_ZS,
-       PL_ZYYY,
-       PL_ZZZZ,
-       PL__PERL_ANY_FOLDS,
-       PL__PERL_CHARNAME_BEGIN,
-       PL__PERL_CHARNAME_CONTINUE,
-       PL__PERL_FOLDS_TO_MULTI_CHAR,
-       PL__PERL_IDCONT,
-       PL__PERL_IDSTART,
-       PL__PERL_NCHAR,
-       PL__PERL_PATWS,
-       PL__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START,
-       PL__PERL_PROBLEMATIC_LOCALE_FOLDS,
-       PL__PERL_QUOTEMETA,
-       PL__PERL_SURROGATE
+       UNI_ADLM,
+       UNI_AEGEANNUMBERS,
+       UNI_AGE__10,
+       UNI_AGE__11,
+       UNI_AGE__2,
+       UNI_AGE__2_DOT_1,
+       UNI_AGE__3,
+       UNI_AGE__3_DOT_1,
+       UNI_AGE__3_DOT_2,
+       UNI_AGE__4,
+       UNI_AGE__4_DOT_1,
+       UNI_AGE__5,
+       UNI_AGE__5_DOT_1,
+       UNI_AGE__5_DOT_2,
+       UNI_AGE__6,
+       UNI_AGE__6_DOT_1,
+       UNI_AGE__6_DOT_2,
+       UNI_AGE__6_DOT_3,
+       UNI_AGE__7,
+       UNI_AGE__8,
+       UNI_AGE__9,
+       UNI_AGE__NA,
+       UNI_AGHB,
+       UNI_AHOM,
+       UNI_ALCHEMICAL,
+       UNI_ALL,
+       UNI_ALPHABETICPF,
+       UNI_ANCIENTGREEKMUSIC,
+       UNI_ANCIENTGREEKNUMBERS,
+       UNI_ANCIENTSYMBOLS,
+       UNI_ANY,
+       UNI_ARAB,
+       UNI_ARABICEXTA,
+       UNI_ARABICMATH,
+       UNI_ARABICPFA,
+       UNI_ARABICPFB,
+       UNI_ARABICSUP,
+       UNI_ARMI,
+       UNI_ARMN,
+       UNI_ARROWS,
+       UNI_ASCII,
+       UNI_ASSIGNED,
+       UNI_AVST,
+       UNI_BALI,
+       UNI_BAMU,
+       UNI_BAMUMSUP,
+       UNI_BASS,
+       UNI_BATK,
+       UNI_BC__AL,
+       UNI_BC__AN,
+       UNI_BC__B,
+       UNI_BC__BN,
+       UNI_BC__CS,
+       UNI_BC__EN,
+       UNI_BC__ES,
+       UNI_BC__ET,
+       UNI_BC__FSI,
+       UNI_BC__L,
+       UNI_BC__LRE,
+       UNI_BC__LRI,
+       UNI_BC__LRO,
+       UNI_BC__NSM,
+       UNI_BC__ON,
+       UNI_BC__PDF,
+       UNI_BC__PDI,
+       UNI_BC__R,
+       UNI_BC__RLE,
+       UNI_BC__RLI,
+       UNI_BC__RLO,
+       UNI_BC__S,
+       UNI_BC__WS,
+       UNI_BENG,
+       UNI_BHKS,
+       UNI_BIDIC,
+       UNI_BIDIM,
+       UNI_BLOCKELEMENTS,
+       UNI_BOPO,
+       UNI_BOPOMOFOEXT,
+       UNI_BOXDRAWING,
+       UNI_BPT__C,
+       UNI_BPT__N,
+       UNI_BPT__O,
+       UNI_BRAH,
+       UNI_BRAI,
+       UNI_BUGI,
+       UNI_BUHD,
+       UNI_BYZANTINEMUSIC,
+       UNI_C,
+       UNI_CAKM,
+       UNI_CANS,
+       UNI_CARI,
+       UNI_CASED,
+       UNI_CASEDLETTER,
+       UNI_CCC__0,
+       UNI_CCC__1,
+       UNI_CCC__10,
+       UNI_CCC__103,
+       UNI_CCC__107,
+       UNI_CCC__11,
+       UNI_CCC__118,
+       UNI_CCC__12,
+       UNI_CCC__122,
+       UNI_CCC__129,
+       UNI_CCC__13,
+       UNI_CCC__130,
+       UNI_CCC__132,
+       UNI_CCC__14,
+       UNI_CCC__15,
+       UNI_CCC__16,
+       UNI_CCC__17,
+       UNI_CCC__18,
+       UNI_CCC__19,
+       UNI_CCC__20,
+       UNI_CCC__202,
+       UNI_CCC__21,
+       UNI_CCC__214,
+       UNI_CCC__216,
+       UNI_CCC__22,
+       UNI_CCC__23,
+       UNI_CCC__24,
+       UNI_CCC__25,
+       UNI_CCC__26,
+       UNI_CCC__27,
+       UNI_CCC__28,
+       UNI_CCC__29,
+       UNI_CCC__30,
+       UNI_CCC__31,
+       UNI_CCC__32,
+       UNI_CCC__33,
+       UNI_CCC__34,
+       UNI_CCC__35,
+       UNI_CCC__36,
+       UNI_CCC__7,
+       UNI_CCC__8,
+       UNI_CCC__84,
+       UNI_CCC__9,
+       UNI_CCC__91,
+       UNI_CCC__A,
+       UNI_CCC__AL,
+       UNI_CCC__AR,
+       UNI_CCC__B,
+       UNI_CCC__BL,
+       UNI_CCC__BR,
+       UNI_CCC__DA,
+       UNI_CCC__DB,
+       UNI_CCC__IS,
+       UNI_CCC__L,
+       UNI_CCC__R,
+       UNI_CE,
+       UNI_CF,
+       UNI_CHAM,
+       UNI_CHER,
+       UNI_CHEROKEESUP,
+       UNI_CHESSSYMBOLS,
+       UNI_CI,
+       UNI_CJK,
+       UNI_CJKCOMPAT,
+       UNI_CJKCOMPATFORMS,
+       UNI_CJKCOMPATIDEOGRAPHS,
+       UNI_CJKCOMPATIDEOGRAPHSSUP,
+       UNI_CJKEXTA,
+       UNI_CJKEXTB,
+       UNI_CJKEXTC,
+       UNI_CJKEXTD,
+       UNI_CJKEXTE,
+       UNI_CJKEXTF,
+       UNI_CJKRADICALSSUP,
+       UNI_CJKSTROKES,
+       UNI_CJKSYMBOLS,
+       UNI_CN,
+       UNI_CO,
+       UNI_COMPATJAMO,
+       UNI_COMPEX,
+       UNI_CONTROLPICTURES,
+       UNI_COPT,
+       UNI_COPTICEPACTNUMBERS,
+       UNI_COUNTINGROD,
+       UNI_CPRT,
+       UNI_CUNEIFORMNUMBERS,
+       UNI_CURRENCYSYMBOLS,
+       UNI_CWCF,
+       UNI_CWCM,
+       UNI_CWKCF,
+       UNI_CWL,
+       UNI_CWT,
+       UNI_CWU,
+       UNI_CYPRIOTSYLLABARY,
+       UNI_CYRILLICEXTA,
+       UNI_CYRILLICEXTB,
+       UNI_CYRILLICEXTC,
+       UNI_CYRILLICSUP,
+       UNI_CYRL,
+       UNI_DASH,
+       UNI_DEP,
+       UNI_DEVA,
+       UNI_DEVANAGARIEXT,
+       UNI_DI,
+       UNI_DIA,
+       UNI_DIACRITICALS,
+       UNI_DIACRITICALSEXT,
+       UNI_DIACRITICALSFORSYMBOLS,
+       UNI_DIACRITICALSSUP,
+       UNI_DINGBATS,
+       UNI_DOGR,
+       UNI_DOMINO,
+       UNI_DSRT,
+       UNI_DT__CAN,
+       UNI_DT__COM,
+       UNI_DT__ENC,
+       UNI_DT__FIN,
+       UNI_DT__FONT,
+       UNI_DT__FRA,
+       UNI_DT__INIT,
+       UNI_DT__ISO,
+       UNI_DT__MED,
+       UNI_DT__NAR,
+       UNI_DT__NB,
+       UNI_DT__NONCANON,
+       UNI_DT__NONE,
+       UNI_DT__SML,
+       UNI_DT__SQR,
+       UNI_DT__SUB,
+       UNI_DT__SUP,
+       UNI_DT__VERT,
+       UNI_DUPL,
+       UNI_EARLYDYNASTICCUNEIFORM,
+       UNI_EA__A,
+       UNI_EA__F,
+       UNI_EA__H,
+       UNI_EA__N,
+       UNI_EA__NA,
+       UNI_EA__W,
+       UNI_EGYP,
+       UNI_ELBA,
+       UNI_EMOTICONS,
+       UNI_ENCLOSEDALPHANUM,
+       UNI_ENCLOSEDALPHANUMSUP,
+       UNI_ENCLOSEDCJK,
+       UNI_ENCLOSEDIDEOGRAPHICSUP,
+       UNI_ETHI,
+       UNI_ETHIOPICEXT,
+       UNI_ETHIOPICEXTA,
+       UNI_ETHIOPICSUP,
+       UNI_EXT,
+       UNI_GCB__CN,
+       UNI_GCB__EX,
+       UNI_GCB__L,
+       UNI_GCB__PP,
+       UNI_GCB__SM,
+       UNI_GCB__T,
+       UNI_GCB__V,
+       UNI_GCB__XX,
+       UNI_GEOMETRICSHAPES,
+       UNI_GEOMETRICSHAPESEXT,
+       UNI_GEOR,
+       UNI_GEORGIANEXT,
+       UNI_GEORGIANSUP,
+       UNI_GLAG,
+       UNI_GLAGOLITICSUP,
+       UNI_GONG,
+       UNI_GONM,
+       UNI_GOTH,
+       UNI_GRAN,
+       UNI_GRBASE,
+       UNI_GREEKEXT,
+       UNI_GREK,
+       UNI_GREXT,
+       UNI_GUJR,
+       UNI_GURU,
+       UNI_HALFANDFULLFORMS,
+       UNI_HALFMARKS,
+       UNI_HAN,
+       UNI_HANG,
+       UNI_HANO,
+       UNI_HATR,
+       UNI_HEBR,
+       UNI_HIGHPUSURROGATES,
+       UNI_HIGHSURROGATES,
+       UNI_HIRA,
+       UNI_HLUW,
+       UNI_HMNG,
+       UNI_HST__NA,
+       UNI_HUNG,
+       UNI_HYPHEN_perl_aux,
+       UNI_IDC,
+       UNI_IDEO,
+       UNI_IDEOGRAPHICSYMBOLS,
+       UNI_IDS,
+       UNI_IDSB,
+       UNI_IDST,
+       UNI_INADLAM,
+       UNI_INAHOM,
+       UNI_INANATOLIANHIEROGLYPHS,
+       UNI_INARABIC,
+       UNI_INARMENIAN,
+       UNI_INAVESTAN,
+       UNI_INBALINESE,
+       UNI_INBAMUM,
+       UNI_INBASSAVAH,
+       UNI_INBATAK,
+       UNI_INBENGALI,
+       UNI_INBHAIKSUKI,
+       UNI_INBOPOMOFO,
+       UNI_INBRAHMI,
+       UNI_INBUGINESE,
+       UNI_INBUHID,
+       UNI_INCARIAN,
+       UNI_INCAUCASIANALBANIAN,
+       UNI_INCHAKMA,
+       UNI_INCHAM,
+       UNI_INCHEROKEE,
+       UNI_INCOPTIC,
+       UNI_INCUNEIFORM,
+       UNI_INCYRILLIC,
+       UNI_INDEVANAGARI,
+       UNI_INDICNUMBERFORMS,
+       UNI_INDICSIYAQNUMBERS,
+       UNI_INDOGRA,
+       UNI_INDUPLOYAN,
+       UNI_INEGYPTIANHIEROGLYPHS,
+       UNI_INELBASAN,
+       UNI_INETHIOPIC,
+       UNI_INGEORGIAN,
+       UNI_INGLAGOLITIC,
+       UNI_INGOTHIC,
+       UNI_INGRANTHA,
+       UNI_INGREEK,
+       UNI_INGUJARATI,
+       UNI_INGUNJALAGONDI,
+       UNI_INGURMUKHI,
+       UNI_INHANGUL,
+       UNI_INHANIFIROHINGYA,
+       UNI_INHANUNOO,
+       UNI_INHATRAN,
+       UNI_INHEBREW,
+       UNI_INHIRAGANA,
+       UNI_INIDC,
+       UNI_INIMPERIALARAMAIC,
+       UNI_ININSCRIPTIONALPAHLAVI,
+       UNI_ININSCRIPTIONALPARTHIAN,
+       UNI_INJAVANESE,
+       UNI_INKAITHI,
+       UNI_INKANNADA,
+       UNI_INKATAKANA,
+       UNI_INKHAROSHTHI,
+       UNI_INKHMER,
+       UNI_INKHOJKI,
+       UNI_INKHUDAWADI,
+       UNI_INLAO,
+       UNI_INLEPCHA,
+       UNI_INLIMBU,
+       UNI_INLINEARA,
+       UNI_INLYCIAN,
+       UNI_INLYDIAN,
+       UNI_INMAHAJANI,
+       UNI_INMAKASAR,
+       UNI_INMALAYALAM,
+       UNI_INMANDAIC,
+       UNI_INMANICHAEAN,
+       UNI_INMARCHEN,
+       UNI_INMASARAMGONDI,
+       UNI_INMEDEFAIDRIN,
+       UNI_INMEETEIMAYEK,
+       UNI_INMENDEKIKAKUI,
+       UNI_INMEROITICCURSIVE,
+       UNI_INMIAO,
+       UNI_INMODI,
+       UNI_INMONGOLIAN,
+       UNI_INMRO,
+       UNI_INMULTANI,
+       UNI_INMYANMAR,
+       UNI_INNABATAEAN,
+       UNI_INNEWA,
+       UNI_INNEWTAILUE,
+       UNI_INNKO,
+       UNI_INNUSHU,
+       UNI_INOGHAM,
+       UNI_INOLDHUNGARIAN,
+       UNI_INOLDITALIC,
+       UNI_INOLDPERMIC,
+       UNI_INOLDPERSIAN,
+       UNI_INOLDSOGDIAN,
+       UNI_INOLDTURKIC,
+       UNI_INORIYA,
+       UNI_INOSAGE,
+       UNI_INOSMANYA,
+       UNI_INPAHAWHHMONG,
+       UNI_INPAUCINHAU,
+       UNI_INPC__BOTTOM,
+       UNI_INPC__BOTTOMANDLEFT,
+       UNI_INPC__BOTTOMANDRIGHT,
+       UNI_INPC__LEFT,
+       UNI_INPC__LEFTANDRIGHT,
+       UNI_INPC__NA,
+       UNI_INPC__OVERSTRUCK,
+       UNI_INPC__RIGHT,
+       UNI_INPC__TOP,
+       UNI_INPC__TOPANDBOTTOM,
+       UNI_INPC__TOPANDBOTTOMANDRIGHT,
+       UNI_INPC__TOPANDLEFT,
+       UNI_INPC__TOPANDLEFTANDRIGHT,
+       UNI_INPC__TOPANDRIGHT,
+       UNI_INPHAGSPA,
+       UNI_INPHOENICIAN,
+       UNI_INPSALTERPAHLAVI,
+       UNI_INPUNCTUATION,
+       UNI_INREJANG,
+       UNI_INRUNIC,
+       UNI_INSAMARITAN,
+       UNI_INSAURASHTRA,
+       UNI_INSC__AVAGRAHA,
+       UNI_INSC__BINDU,
+       UNI_INSC__BRAHMIJOININGNUMBER,
+       UNI_INSC__CANTILLATIONMARK,
+       UNI_INSC__CONSONANT,
+       UNI_INSC__CONSONANTDEAD,
+       UNI_INSC__CONSONANTFINAL,
+       UNI_INSC__CONSONANTHEADLETTER,
+       UNI_INSC__CONSONANTINITIALPOSTFIXED,
+       UNI_INSC__CONSONANTKILLER,
+       UNI_INSC__CONSONANTMEDIAL,
+       UNI_INSC__CONSONANTPLACEHOLDER,
+       UNI_INSC__CONSONANTPRECEDINGREPHA,
+       UNI_INSC__CONSONANTPREFIXED,
+       UNI_INSC__CONSONANTSUBJOINED,
+       UNI_INSC__CONSONANTSUCCEEDINGREPHA,
+       UNI_INSC__CONSONANTWITHSTACKER,
+       UNI_INSC__GEMINATIONMARK,
+       UNI_INSC__INVISIBLESTACKER,
+       UNI_INSC__MODIFYINGLETTER,
+       UNI_INSC__NONJOINER,
+       UNI_INSC__NUKTA,
+       UNI_INSC__NUMBER,
+       UNI_INSC__NUMBERJOINER,
+       UNI_INSC__OTHER,
+       UNI_INSC__PUREKILLER,
+       UNI_INSC__REGISTERSHIFTER,
+       UNI_INSC__SYLLABLEMODIFIER,
+       UNI_INSC__TONELETTER,
+       UNI_INSC__TONEMARK,
+       UNI_INSC__VIRAMA,
+       UNI_INSC__VISARGA,
+       UNI_INSC__VOWEL,
+       UNI_INSC__VOWELDEPENDENT,
+       UNI_INSC__VOWELINDEPENDENT,
+       UNI_INSHARADA,
+       UNI_INSIDDHAM,
+       UNI_INSINHALA,
+       UNI_INSOGDIAN,
+       UNI_INSORASOMPENG,
+       UNI_INSOYOMBO,
+       UNI_INSUNDANESE,
+       UNI_INSYLOTINAGRI,
+       UNI_INSYRIAC,
+       UNI_INTAGALOG,
+       UNI_INTAGBANWA,
+       UNI_INTAILE,
+       UNI_INTAITHAM,
+       UNI_INTAIVIET,
+       UNI_INTAKRI,
+       UNI_INTAMIL,
+       UNI_INTANGUT,
+       UNI_INTELUGU,
+       UNI_INTHAANA,
+       UNI_INTHAI,
+       UNI_INTIBETAN,
+       UNI_INTIFINAGH,
+       UNI_INTIRHUTA,
+       UNI_INUGARITIC,
+       UNI_INVAI,
+       UNI_INVS,
+       UNI_INWARANGCITI,
+       UNI_INZANABAZARSQUARE,
+       UNI_IN__10,
+       UNI_IN__11,
+       UNI_IN__1_DOT_1,
+       UNI_IN__2,
+       UNI_IN__2_DOT_1,
+       UNI_IN__3,
+       UNI_IN__3_DOT_1,
+       UNI_IN__3_DOT_2,
+       UNI_IN__4,
+       UNI_IN__4_DOT_1,
+       UNI_IN__5,
+       UNI_IN__5_DOT_1,
+       UNI_IN__5_DOT_2,
+       UNI_IN__6,
+       UNI_IN__6_DOT_1,
+       UNI_IN__6_DOT_2,
+       UNI_IN__6_DOT_3,
+       UNI_IN__7,
+       UNI_IN__8,
+       UNI_IN__9,
+       UNI_IPAEXT,
+       UNI_ITAL,
+       UNI_JAMO,
+       UNI_JAMOEXTA,
+       UNI_JAMOEXTB,
+       UNI_JAVA,
+       UNI_JG__AFRICANFEH,
+       UNI_JG__AFRICANNOON,
+       UNI_JG__AFRICANQAF,
+       UNI_JG__AIN,
+       UNI_JG__ALAPH,
+       UNI_JG__ALEF,
+       UNI_JG__BEH,
+       UNI_JG__BETH,
+       UNI_JG__BURUSHASKIYEHBARREE,
+       UNI_JG__DAL,
+       UNI_JG__DALATHRISH,
+       UNI_JG__E,
+       UNI_JG__FARSIYEH,
+       UNI_JG__FE,
+       UNI_JG__FEH,
+       UNI_JG__FINALSEMKATH,
+       UNI_JG__GAF,
+       UNI_JG__GAMAL,
+       UNI_JG__HAH,
+       UNI_JG__HAMZAONHEHGOAL,
+       UNI_JG__HANIFIROHINGYAKINNAYA,
+       UNI_JG__HANIFIROHINGYAPA,
+       UNI_JG__HE,
+       UNI_JG__HEH,
+       UNI_JG__HEHGOAL,
+       UNI_JG__HETH,
+       UNI_JG__KAF,
+       UNI_JG__KAPH,
+       UNI_JG__KHAPH,
+       UNI_JG__KNOTTEDHEH,
+       UNI_JG__LAM,
+       UNI_JG__LAMADH,
+       UNI_JG__MALAYALAMBHA,
+       UNI_JG__MALAYALAMJA,
+       UNI_JG__MALAYALAMLLA,
+       UNI_JG__MALAYALAMLLLA,
+       UNI_JG__MALAYALAMNGA,
+       UNI_JG__MALAYALAMNNA,
+       UNI_JG__MALAYALAMNNNA,
+       UNI_JG__MALAYALAMNYA,
+       UNI_JG__MALAYALAMRA,
+       UNI_JG__MALAYALAMSSA,
+       UNI_JG__MALAYALAMTTA,
+       UNI_JG__MANICHAEANALEPH,
+       UNI_JG__MANICHAEANAYIN,
+       UNI_JG__MANICHAEANBETH,
+       UNI_JG__MANICHAEANDALETH,
+       UNI_JG__MANICHAEANDHAMEDH,
+       UNI_JG__MANICHAEANFIVE,
+       UNI_JG__MANICHAEANGIMEL,
+       UNI_JG__MANICHAEANHETH,
+       UNI_JG__MANICHAEANHUNDRED,
+       UNI_JG__MANICHAEANKAPH,
+       UNI_JG__MANICHAEANLAMEDH,
+       UNI_JG__MANICHAEANMEM,
+       UNI_JG__MANICHAEANNUN,
+       UNI_JG__MANICHAEANONE,
+       UNI_JG__MANICHAEANPE,
+       UNI_JG__MANICHAEANQOPH,
+       UNI_JG__MANICHAEANRESH,
+       UNI_JG__MANICHAEANSADHE,
+       UNI_JG__MANICHAEANSAMEKH,
+       UNI_JG__MANICHAEANTAW,
+       UNI_JG__MANICHAEANTEN,
+       UNI_JG__MANICHAEANTETH,
+       UNI_JG__MANICHAEANTHAMEDH,
+       UNI_JG__MANICHAEANTWENTY,
+       UNI_JG__MANICHAEANWAW,
+       UNI_JG__MANICHAEANYODH,
+       UNI_JG__MANICHAEANZAYIN,
+       UNI_JG__MEEM,
+       UNI_JG__MIM,
+       UNI_JG__NOJOININGGROUP,
+       UNI_JG__NOON,
+       UNI_JG__NUN,
+       UNI_JG__NYA,
+       UNI_JG__PE,
+       UNI_JG__QAF,
+       UNI_JG__QAPH,
+       UNI_JG__REH,
+       UNI_JG__REVERSEDPE,
+       UNI_JG__ROHINGYAYEH,
+       UNI_JG__SAD,
+       UNI_JG__SADHE,
+       UNI_JG__SEEN,
+       UNI_JG__SEMKATH,
+       UNI_JG__SHIN,
+       UNI_JG__STRAIGHTWAW,
+       UNI_JG__SWASHKAF,
+       UNI_JG__SYRIACWAW,
+       UNI_JG__TAH,
+       UNI_JG__TAW,
+       UNI_JG__TEHMARBUTA,
+       UNI_JG__TETH,
+       UNI_JG__WAW,
+       UNI_JG__YEH,
+       UNI_JG__YEHBARREE,
+       UNI_JG__YEHWITHTAIL,
+       UNI_JG__YUDH,
+       UNI_JG__YUDHHE,
+       UNI_JG__ZAIN,
+       UNI_JG__ZHAIN,
+       UNI_JOINC,
+       UNI_JT__C,
+       UNI_JT__D,
+       UNI_JT__L,
+       UNI_JT__R,
+       UNI_JT__T,
+       UNI_JT__U,
+       UNI_KALI,
+       UNI_KANA,
+       UNI_KANAEXTA,
+       UNI_KANASUP,
+       UNI_KANBUN,
+       UNI_KANGXI,
+       UNI_KATAKANAEXT,
+       UNI_KHAR,
+       UNI_KHMERSYMBOLS,
+       UNI_KHMR,
+       UNI_KHOJ,
+       UNI_KNDA,
+       UNI_KTHI,
+       UNI_L,
+       UNI_LANA,
+       UNI_LAO,
+       UNI_LATIN1,
+       UNI_LATINEXTA,
+       UNI_LATINEXTADDITIONAL,
+       UNI_LATINEXTB,
+       UNI_LATINEXTC,
+       UNI_LATINEXTD,
+       UNI_LATINEXTE,
+       UNI_LATN,
+       UNI_LB__AI,
+       UNI_LB__AL,
+       UNI_LB__B2,
+       UNI_LB__BA,
+       UNI_LB__BB,
+       UNI_LB__BK,
+       UNI_LB__CB,
+       UNI_LB__CJ,
+       UNI_LB__CL,
+       UNI_LB__CM,
+       UNI_LB__CP,
+       UNI_LB__CR,
+       UNI_LB__EB,
+       UNI_LB__EM,
+       UNI_LB__EX,
+       UNI_LB__GL,
+       UNI_LB__H2,
+       UNI_LB__H3,
+       UNI_LB__HL,
+       UNI_LB__HY,
+       UNI_LB__ID,
+       UNI_LB__IN,
+       UNI_LB__IS,
+       UNI_LB__LF,
+       UNI_LB__NL,
+       UNI_LB__NS,
+       UNI_LB__NU,
+       UNI_LB__OP,
+       UNI_LB__PO,
+       UNI_LB__PR,
+       UNI_LB__QU,
+       UNI_LB__SA,
+       UNI_LB__SG_perl_aux,
+       UNI_LB__SP,
+       UNI_LB__SY,
+       UNI_LB__WJ,
+       UNI_LB__XX,
+       UNI_LB__ZW,
+       UNI_LB__ZWJ,
+       UNI_LEPC,
+       UNI_LETTERLIKESYMBOLS,
+       UNI_LIMB,
+       UNI_LINA,
+       UNI_LINB,
+       UNI_LINEARBIDEOGRAMS,
+       UNI_LINEARBSYLLABARY,
+       UNI_LISU,
+       UNI_LM,
+       UNI_LO,
+       UNI_LOE,
+       UNI_LOWERCASELETTER,
+       UNI_LOWSURROGATES,
+       UNI_LYCI,
+       UNI_LYDI,
+       UNI_M,
+       UNI_MAHJ,
+       UNI_MAHJONG,
+       UNI_MAKA,
+       UNI_MAND,
+       UNI_MANI,
+       UNI_MARC,
+       UNI_MATH,
+       UNI_MATHALPHANUM,
+       UNI_MATHOPERATORS,
+       UNI_MAYANNUMERALS,
+       UNI_MC,
+       UNI_ME,
+       UNI_MEDF,
+       UNI_MEETEIMAYEKEXT,
+       UNI_MEND,
+       UNI_MERC,
+       UNI_MERO,
+       UNI_MIAO,
+       UNI_MISCARROWS,
+       UNI_MISCMATHSYMBOLSA,
+       UNI_MISCMATHSYMBOLSB,
+       UNI_MISCPICTOGRAPHS,
+       UNI_MISCSYMBOLS,
+       UNI_MISCTECHNICAL,
+       UNI_MLYM,
+       UNI_MN,
+       UNI_MODI,
+       UNI_MODIFIERLETTERS,
+       UNI_MODIFIERTONELETTERS,
+       UNI_MONG,
+       UNI_MONGOLIANSUP,
+       UNI_MRO,
+       UNI_MTEI,
+       UNI_MULT,
+       UNI_MUSIC,
+       UNI_MYANMAREXTA,
+       UNI_MYANMAREXTB,
+       UNI_MYMR,
+       UNI_N,
+       UNI_NARB,
+       UNI_NB,
+       UNI_NBAT,
+       UNI_NEWA,
+       UNI_NFCQC__M,
+       UNI_NFCQC__Y,
+       UNI_NFDQC__Y,
+       UNI_NFKCQC__N,
+       UNI_NFKCQC__Y,
+       UNI_NFKDQC__N,
+       UNI_NKO,
+       UNI_NL,
+       UNI_NO,
+       UNI_NSHU,
+       UNI_NT__DI,
+       UNI_NT__NU,
+       UNI_NUMBERFORMS,
+       UNI_NV__0,
+       UNI_NV__1,
+       UNI_NV__10,
+       UNI_NV__100,
+       UNI_NV__1000,
+       UNI_NV__10000,
+       UNI_NV__100000,
+       UNI_NV__1000000,
+       UNI_NV__10000000,
+       UNI_NV__100000000,
+       UNI_NV__10000000000,
+       UNI_NV__1000000000000,
+       UNI_NV__11,
+       UNI_NV__11_SLASH_12,
+       UNI_NV__11_SLASH_2,
+       UNI_NV__12,
+       UNI_NV__13,
+       UNI_NV__13_SLASH_2,
+       UNI_NV__14,
+       UNI_NV__15,
+       UNI_NV__15_SLASH_2,
+       UNI_NV__16,
+       UNI_NV__17,
+       UNI_NV__17_SLASH_2,
+       UNI_NV__18,
+       UNI_NV__19,
+       UNI_NV__1_SLASH_10,
+       UNI_NV__1_SLASH_12,
+       UNI_NV__1_SLASH_16,
+       UNI_NV__1_SLASH_160,
+       UNI_NV__1_SLASH_2,
+       UNI_NV__1_SLASH_20,
+       UNI_NV__1_SLASH_3,
+       UNI_NV__1_SLASH_4,
+       UNI_NV__1_SLASH_40,
+       UNI_NV__1_SLASH_5,
+       UNI_NV__1_SLASH_6,
+       UNI_NV__1_SLASH_7,
+       UNI_NV__1_SLASH_8,
+       UNI_NV__1_SLASH_9,
+       UNI_NV__2,
+       UNI_NV__20,
+       UNI_NV__200,
+       UNI_NV__2000,
+       UNI_NV__20000,
+       UNI_NV__200000,
+       UNI_NV__20000000,
+       UNI_NV__21,
+       UNI_NV__216000,
+       UNI_NV__22,
+       UNI_NV__23,
+       UNI_NV__24,
+       UNI_NV__25,
+       UNI_NV__26,
+       UNI_NV__27,
+       UNI_NV__28,
+       UNI_NV__29,
+       UNI_NV__2_SLASH_3,
+       UNI_NV__2_SLASH_5,
+       UNI_NV__3,
+       UNI_NV__30,
+       UNI_NV__300,
+       UNI_NV__3000,
+       UNI_NV__30000,
+       UNI_NV__300000,
+       UNI_NV__31,
+       UNI_NV__32,
+       UNI_NV__33,
+       UNI_NV__34,
+       UNI_NV__35,
+       UNI_NV__36,
+       UNI_NV__37,
+       UNI_NV__38,
+       UNI_NV__39,
+       UNI_NV__3_SLASH_16,
+       UNI_NV__3_SLASH_2,
+       UNI_NV__3_SLASH_20,
+       UNI_NV__3_SLASH_4,
+       UNI_NV__3_SLASH_5,
+       UNI_NV__3_SLASH_8,
+       UNI_NV__3_SLASH_80,
+       UNI_NV__4,
+       UNI_NV__40,
+       UNI_NV__400,
+       UNI_NV__4000,
+       UNI_NV__40000,
+       UNI_NV__400000,
+       UNI_NV__41,
+       UNI_NV__42,
+       UNI_NV__43,
+       UNI_NV__432000,
+       UNI_NV__44,
+       UNI_NV__45,
+       UNI_NV__46,
+       UNI_NV__47,
+       UNI_NV__48,
+       UNI_NV__49,
+       UNI_NV__4_SLASH_5,
+       UNI_NV__5,
+       UNI_NV__50,
+       UNI_NV__500,
+       UNI_NV__5000,
+       UNI_NV__50000,
+       UNI_NV__500000,
+       UNI_NV__5_SLASH_12,
+       UNI_NV__5_SLASH_2,
+       UNI_NV__5_SLASH_6,
+       UNI_NV__5_SLASH_8,
+       UNI_NV__6,
+       UNI_NV__60,
+       UNI_NV__600,
+       UNI_NV__6000,
+       UNI_NV__60000,
+       UNI_NV__600000,
+       UNI_NV__7,
+       UNI_NV__70,
+       UNI_NV__700,
+       UNI_NV__7000,
+       UNI_NV__70000,
+       UNI_NV__700000,
+       UNI_NV__7_SLASH_12,
+       UNI_NV__7_SLASH_2,
+       UNI_NV__7_SLASH_8,
+       UNI_NV__8,
+       UNI_NV__80,
+       UNI_NV__800,
+       UNI_NV__8000,
+       UNI_NV__80000,
+       UNI_NV__800000,
+       UNI_NV__9,
+       UNI_NV__90,
+       UNI_NV__900,
+       UNI_NV__9000,
+       UNI_NV__90000,
+       UNI_NV__900000,
+       UNI_NV__9_SLASH_2,
+       UNI_NV__NAN,
+       UNI_NV___MINUS_1_SLASH_2,
+       UNI_OCR,
+       UNI_OGAM,
+       UNI_OLCK,
+       UNI_ORKH,
+       UNI_ORNAMENTALDINGBATS,
+       UNI_ORYA,
+       UNI_OSGE,
+       UNI_OSMA,
+       UNI_P,
+       UNI_PALM,
+       UNI_PATSYN,
+       UNI_PAUC,
+       UNI_PC,
+       UNI_PCM,
+       UNI_PD,
+       UNI_PE,
+       UNI_PERM,
+       UNI_PF,
+       UNI_PHAG,
+       UNI_PHAISTOS,
+       UNI_PHLI,
+       UNI_PHLP,
+       UNI_PHNX,
+       UNI_PHONETICEXT,
+       UNI_PHONETICEXTSUP,
+       UNI_PI,
+       UNI_PLAYINGCARDS,
+       UNI_PO,
+       UNI_POSIXALNUM,
+       UNI_POSIXALPHA,
+       UNI_POSIXBLANK,
+       UNI_POSIXCNTRL,
+       UNI_POSIXDIGIT,
+       UNI_POSIXGRAPH,
+       UNI_POSIXLOWER,
+       UNI_POSIXPRINT,
+       UNI_POSIXPUNCT,
+       UNI_POSIXSPACE,
+       UNI_POSIXUPPER,
+       UNI_POSIXWORD,
+       UNI_POSIXXDIGIT,
+       UNI_PRTI,
+       UNI_PS,
+       UNI_PUA,
+       UNI_QAAI,
+       UNI_QMARK,
+       UNI_RADICAL,
+       UNI_RI,
+       UNI_RJNG,
+       UNI_ROHG,
+       UNI_RUMI,
+       UNI_RUNR,
+       UNI_S,
+       UNI_SAMR,
+       UNI_SARB,
+       UNI_SAUR,
+       UNI_SB__AT,
+       UNI_SB__CL,
+       UNI_SB__EX,
+       UNI_SB__FO,
+       UNI_SB__LE,
+       UNI_SB__LO,
+       UNI_SB__SC,
+       UNI_SB__SE,
+       UNI_SB__SP,
+       UNI_SB__ST,
+       UNI_SB__UP,
+       UNI_SB__XX,
+       UNI_SC,
+       UNI_SC__ADLM,
+       UNI_SC__ARAB,
+       UNI_SC__ARMN,
+       UNI_SC__BENG,
+       UNI_SC__BOPO,
+       UNI_SC__BUGI,
+       UNI_SC__BUHD,
+       UNI_SC__CAKM,
+       UNI_SC__COPT,
+       UNI_SC__CPRT,
+       UNI_SC__CYRL,
+       UNI_SC__DEVA,
+       UNI_SC__DOGR,
+       UNI_SC__DUPL,
+       UNI_SC__GEOR,
+       UNI_SC__GLAG,
+       UNI_SC__GONG,
+       UNI_SC__GRAN,
+       UNI_SC__GREK,
+       UNI_SC__GUJR,
+       UNI_SC__GURU,
+       UNI_SC__HAN,
+       UNI_SC__HANG,
+       UNI_SC__HANO,
+       UNI_SC__HIRA,
+       UNI_SC__JAVA,
+       UNI_SC__KALI,
+       UNI_SC__KANA,
+       UNI_SC__KHOJ,
+       UNI_SC__KNDA,
+       UNI_SC__KTHI,
+       UNI_SC__LATN,
+       UNI_SC__LIMB,
+       UNI_SC__LINA,
+       UNI_SC__LINB,
+       UNI_SC__MAHJ,
+       UNI_SC__MAND,
+       UNI_SC__MANI,
+       UNI_SC__MLYM,
+       UNI_SC__MODI,
+       UNI_SC__MONG,
+       UNI_SC__MULT,
+       UNI_SC__MYMR,
+       UNI_SC__ORYA,
+       UNI_SC__PERM,
+       UNI_SC__PHAG,
+       UNI_SC__PHLP,
+       UNI_SC__QAAI,
+       UNI_SC__ROHG,
+       UNI_SC__SHRD,
+       UNI_SC__SIND,
+       UNI_SC__SINH,
+       UNI_SC__SOGD,
+       UNI_SC__SYLO,
+       UNI_SC__SYRC,
+       UNI_SC__TAGB,
+       UNI_SC__TAKR,
+       UNI_SC__TALE,
+       UNI_SC__TAML,
+       UNI_SC__TELU,
+       UNI_SC__TGLG,
+       UNI_SC__THAA,
+       UNI_SC__TIRH,
+       UNI_SC__YI,
+       UNI_SC__ZYYY,
+       UNI_SD,
+       UNI_SGNW,
+       UNI_SHAW,
+       UNI_SHORTHANDFORMATCONTROLS,
+       UNI_SHRD,
+       UNI_SIDD,
+       UNI_SIND,
+       UNI_SINH,
+       UNI_SINHALAARCHAICNUMBERS,
+       UNI_SK,
+       UNI_SM,
+       UNI_SMALLFORMS,
+       UNI_SO,
+       UNI_SOGD,
+       UNI_SOGO,
+       UNI_SORA,
+       UNI_SOYO,
+       UNI_SPECIALS,
+       UNI_STERM,
+       UNI_SUND,
+       UNI_SUNDANESESUP,
+       UNI_SUPARROWSA,
+       UNI_SUPARROWSB,
+       UNI_SUPARROWSC,
+       UNI_SUPERANDSUB,
+       UNI_SUPMATHOPERATORS,
+       UNI_SUPPUAA,
+       UNI_SUPPUAB,
+       UNI_SUPPUNCTUATION,
+       UNI_SUPSYMBOLSANDPICTOGRAPHS,
+       UNI_SUTTONSIGNWRITING,
+       UNI_SYLO,
+       UNI_SYRC,
+       UNI_SYRIACSUP,
+       UNI_TAGB,
+       UNI_TAGS,
+       UNI_TAIXUANJING,
+       UNI_TAKR,
+       UNI_TALE,
+       UNI_TALU,
+       UNI_TAML,
+       UNI_TANG,
+       UNI_TANGUTCOMPONENTS,
+       UNI_TAVT,
+       UNI_TELU,
+       UNI_TERM,
+       UNI_TFNG,
+       UNI_TGLG,
+       UNI_THAA,
+       UNI_THAI,
+       UNI_TIBT,
+       UNI_TIRH,
+       UNI_TITLE,
+       UNI_TRANSPORTANDMAP,
+       UNI_UCAS,
+       UNI_UCASEXT,
+       UNI_UGAR,
+       UNI_UIDEO,
+       UNI_UPPERCASELETTER,
+       UNI_VAI,
+       UNI_VEDICEXT,
+       UNI_VERTICALFORMS,
+       UNI_VERTSPACE,
+       UNI_VO__R,
+       UNI_VO__TR,
+       UNI_VO__TU,
+       UNI_VO__U,
+       UNI_VS,
+       UNI_VSSUP,
+       UNI_WARA,
+       UNI_WB__DQ,
+       UNI_WB__EB,
+       UNI_WB__EX,
+       UNI_WB__EXTEND,
+       UNI_WB__FO,
+       UNI_WB__KA,
+       UNI_WB__LE,
+       UNI_WB__MB,
+       UNI_WB__ML,
+       UNI_WB__MN,
+       UNI_WB__NL,
+       UNI_WB__NU,
+       UNI_WB__SQ,
+       UNI_WB__WSEGSPACE,
+       UNI_WB__XX,
+       UNI_XIDC,
+       UNI_XIDS,
+       UNI_XPEO,
+       UNI_XPOSIXALNUM,
+       UNI_XPOSIXALPHA,
+       UNI_XPOSIXBLANK,
+       UNI_XPOSIXCNTRL,
+       UNI_XPOSIXDIGIT,
+       UNI_XPOSIXGRAPH,
+       UNI_XPOSIXLOWER,
+       UNI_XPOSIXPRINT,
+       UNI_XPOSIXPUNCT,
+       UNI_XPOSIXSPACE,
+       UNI_XPOSIXUPPER,
+       UNI_XPOSIXWORD,
+       UNI_XPOSIXXDIGIT,
+       UNI_XSUX,
+       UNI_YI,
+       UNI_YIJING,
+       UNI_YIRADICALS,
+       UNI_YISYLLABLES,
+       UNI_Z,
+       UNI_ZANB,
+       UNI_ZL,
+       UNI_ZP,
+       UNI_ZS,
+       UNI_ZYYY,
+       UNI_ZZZZ,
+       UNI__PERL_ANY_FOLDS,
+       UNI__PERL_CHARNAME_BEGIN,
+       UNI__PERL_CHARNAME_CONTINUE,
+       UNI__PERL_FOLDS_TO_MULTI_CHAR,
+       UNI__PERL_IDCONT,
+       UNI__PERL_IDSTART,
+       UNI__PERL_NCHAR,
+       UNI__PERL_PATWS,
+       UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START,
+       UNI__PERL_PROBLEMATIC_LOCALE_FOLDS,
+       UNI__PERL_QUOTEMETA,
+       UNI__PERL_SURROGATE
 } binary_invlist_enum;
 
-#define MAX_UNI_KEYWORD_INDEX PL__PERL_SURROGATE
+#define MAX_UNI_KEYWORD_INDEX UNI__PERL_SURROGATE
 
-/* Synonyms for perl properties */
-#define PL_AHEX   PL_POSIXXDIGIT
-#define PL_ALNUM   PL_XPOSIXALNUM
-#define PL_ALPHA   PL_XPOSIXALPHA
-#define PL_ALPHABETIC   PL_XPOSIXALPHA
-#define PL_ASCIIHEXDIGIT   PL_POSIXXDIGIT
-#define PL_BASICLATIN   PL_ASCII
-#define PL_BLANK   PL_XPOSIXBLANK
-#define PL_CC   PL_XPOSIXCNTRL
-#define PL_CNTRL   PL_XPOSIXCNTRL
-#define PL_CONTROL   PL_XPOSIXCNTRL
-#define PL_DECIMALNUMBER   PL_XPOSIXDIGIT
-#define PL_DIGIT   PL_XPOSIXDIGIT
-#define PL_GRAPH   PL_XPOSIXGRAPH
-#define PL_HEX   PL_XPOSIXXDIGIT
-#define PL_HEXDIGIT   PL_XPOSIXXDIGIT
-#define PL_HORIZSPACE   PL_XPOSIXBLANK
-#define PL_LC   PL_CASEDLETTER
-#define PL_LL   PL_LOWERCASELETTER
-#define PL_LOWER   PL_XPOSIXLOWER
-#define PL_LOWERCASE   PL_XPOSIXLOWER
-#define PL_LT   PL_TITLE
-#define PL_LU   PL_UPPERCASELETTER
-#define PL_L_   PL_CASEDLETTER
-#define PL_L_AMP_   PL_CASEDLETTER
-#define PL_ND   PL_XPOSIXDIGIT
-#define PL_PERLSPACE   PL_POSIXSPACE
-#define PL_PERLWORD   PL_POSIXWORD
-#define PL_PRINT   PL_XPOSIXPRINT
-#define PL_SPACE   PL_XPOSIXSPACE
-#define PL_SPACEPERL   PL_XPOSIXSPACE
-#define PL_TITLECASE   PL_TITLE
-#define PL_TITLECASELETTER   PL_TITLE
-#define PL_UPPER   PL_XPOSIXUPPER
-#define PL_UPPERCASE   PL_XPOSIXUPPER
-#define PL_WHITESPACE   PL_XPOSIXSPACE
-#define PL_WORD   PL_XPOSIXWORD
-#define PL_WSPACE   PL_XPOSIXSPACE
-#define PL_XDIGIT   PL_XPOSIXXDIGIT
-#define PL_XPERLSPACE   PL_XPOSIXSPACE
-
-
-static const UV * const PL_uni_prop_ptrs[] = {
+static const UV * const uni_prop_ptrs[] = {
        NULL,   /* Placeholder */
-       PL_ADLM_invlist,
-       PL_AEGEANNUMBERS_invlist,
-       PL_AGE__10_invlist,
-       PL_AGE__2_invlist,
-       PL_AGE__2_DOT_1_invlist,
-       PL_AGE__3_invlist,
-       PL_AGE__3_DOT_1_invlist,
-       PL_AGE__3_DOT_2_invlist,
-       PL_AGE__4_invlist,
-       PL_AGE__4_DOT_1_invlist,
-       PL_AGE__5_invlist,
-       PL_AGE__5_DOT_1_invlist,
-       PL_AGE__5_DOT_2_invlist,
-       PL_AGE__6_invlist,
-       PL_AGE__6_DOT_1_invlist,
-       PL_AGE__6_DOT_2_invlist,
-       PL_AGE__6_DOT_3_invlist,
-       PL_AGE__7_invlist,
-       PL_AGE__8_invlist,
-       PL_AGE__9_invlist,
-       PL_AGE__NA_invlist,
-       PL_AGHB_invlist,
-       PL_AHOM_invlist,
-       PL_ALCHEMICAL_invlist,
-       PL_ALL_invlist,
-       PL_ALPHABETICPF_invlist,
-       PL_ANCIENTGREEKMUSIC_invlist,
-       PL_ANCIENTGREEKNUMBERS_invlist,
-       PL_ANCIENTSYMBOLS_invlist,
-       PL_ANY_invlist,
-       PL_ARAB_invlist,
-       PL_ARABICEXTA_invlist,
-       PL_ARABICMATH_invlist,
-       PL_ARABICPFA_invlist,
-       PL_ARABICPFB_invlist,
-       PL_ARABICSUP_invlist,
-       PL_ARMI_invlist,
-       PL_ARMN_invlist,
-       PL_ARROWS_invlist,
-       PL_ASCII_invlist,
-       PL_ASSIGNED_invlist,
-       PL_AVST_invlist,
-       PL_BALI_invlist,
-       PL_BAMU_invlist,
-       PL_BAMUMSUP_invlist,
-       PL_BASS_invlist,
-       PL_BATK_invlist,
-       PL_BC__AL_invlist,
-       PL_BC__AN_invlist,
-       PL_BC__B_invlist,
-       PL_BC__BN_invlist,
-       PL_BC__CS_invlist,
-       PL_BC__EN_invlist,
-       PL_BC__ES_invlist,
-       PL_BC__ET_invlist,
-       PL_BC__FSI_invlist,
-       PL_BC__L_invlist,
-       PL_BC__LRE_invlist,
-       PL_BC__LRI_invlist,
-       PL_BC__LRO_invlist,
-       PL_BC__NSM_invlist,
-       PL_BC__ON_invlist,
-       PL_BC__PDF_invlist,
-       PL_BC__PDI_invlist,
-       PL_BC__R_invlist,
-       PL_BC__RLE_invlist,
-       PL_BC__RLI_invlist,
-       PL_BC__RLO_invlist,
-       PL_BC__S_invlist,
-       PL_BC__WS_invlist,
-       PL_BENG_invlist,
-       PL_BHKS_invlist,
-       PL_BIDIC_invlist,
-       PL_BIDIM_invlist,
-       PL_BLOCKELEMENTS_invlist,
-       PL_BOPO_invlist,
-       PL_BOPOMOFOEXT_invlist,
-       PL_BOXDRAWING_invlist,
-       PL_BPT__C_invlist,
-       PL_BPT__N_invlist,
-       PL_BPT__O_invlist,
-       PL_BRAH_invlist,
-       PL_BRAI_invlist,
-       PL_BUGI_invlist,
-       PL_BUHD_invlist,
-       PL_BYZANTINEMUSIC_invlist,
-       PL_C_invlist,
-       PL_CAKM_invlist,
-       PL_CANS_invlist,
-       PL_CARI_invlist,
-       PL_CASED_invlist,
-       PL_CASEDLETTER_invlist,
-       PL_CCC__0_invlist,
-       PL_CCC__1_invlist,
-       PL_CCC__10_invlist,
-       PL_CCC__103_invlist,
-       PL_CCC__107_invlist,
-       PL_CCC__11_invlist,
-       PL_CCC__118_invlist,
-       PL_CCC__12_invlist,
-       PL_CCC__122_invlist,
-       PL_CCC__129_invlist,
-       PL_CCC__13_invlist,
-       PL_CCC__130_invlist,
-       PL_CCC__132_invlist,
-       PL_CCC__133_invlist,
-       PL_CCC__14_invlist,
-       PL_CCC__15_invlist,
-       PL_CCC__16_invlist,
-       PL_CCC__17_invlist,
-       PL_CCC__18_invlist,
-       PL_CCC__19_invlist,
-       PL_CCC__20_invlist,
-       PL_CCC__202_invlist,
-       PL_CCC__21_invlist,
-       PL_CCC__214_invlist,
-       PL_CCC__216_invlist,
-       PL_CCC__22_invlist,
-       PL_CCC__23_invlist,
-       PL_CCC__24_invlist,
-       PL_CCC__25_invlist,
-       PL_CCC__26_invlist,
-       PL_CCC__27_invlist,
-       PL_CCC__28_invlist,
-       PL_CCC__29_invlist,
-       PL_CCC__30_invlist,
-       PL_CCC__31_invlist,
-       PL_CCC__32_invlist,
-       PL_CCC__33_invlist,
-       PL_CCC__34_invlist,
-       PL_CCC__35_invlist,
-       PL_CCC__36_invlist,
-       PL_CCC__7_invlist,
-       PL_CCC__8_invlist,
-       PL_CCC__84_invlist,
-       PL_CCC__9_invlist,
-       PL_CCC__91_invlist,
-       PL_CCC__A_invlist,
-       PL_CCC__AL_invlist,
-       PL_CCC__AR_invlist,
-       PL_CCC__B_invlist,
-       PL_CCC__BL_invlist,
-       PL_CCC__BR_invlist,
-       PL_CCC__DA_invlist,
-       PL_CCC__DB_invlist,
-       PL_CCC__IS_invlist,
-       PL_CCC__L_invlist,
-       PL_CCC__R_invlist,
-       PL_CE_invlist,
-       PL_CF_invlist,
-       PL_CHAM_invlist,
-       PL_CHER_invlist,
-       PL_CHEROKEESUP_invlist,
-       PL_CI_invlist,
-       PL_CJK_invlist,
-       PL_CJKCOMPAT_invlist,
-       PL_CJKCOMPATFORMS_invlist,
-       PL_CJKCOMPATIDEOGRAPHS_invlist,
-       PL_CJKCOMPATIDEOGRAPHSSUP_invlist,
-       PL_CJKEXTA_invlist,
-       PL_CJKEXTB_invlist,
-       PL_CJKEXTC_invlist,
-       PL_CJKEXTD_invlist,
-       PL_CJKEXTE_invlist,
-       PL_CJKEXTF_invlist,
-       PL_CJKRADICALSSUP_invlist,
-       PL_CJKSTROKES_invlist,
-       PL_CJKSYMBOLS_invlist,
-       PL_CN_invlist,
-       PL_CO_invlist,
-       PL_COMPATJAMO_invlist,
-       PL_COMPEX_invlist,
-       PL_CONTROLPICTURES_invlist,
-       PL_COPT_invlist,
-       PL_COPTICEPACTNUMBERS_invlist,
-       PL_COUNTINGROD_invlist,
-       PL_CPRT_invlist,
-       PL_CUNEIFORMNUMBERS_invlist,
-       PL_CURRENCYSYMBOLS_invlist,
-       PL_CWCF_invlist,
-       PL_CWCM_invlist,
-       PL_CWKCF_invlist,
-       PL_CWL_invlist,
-       PL_CWT_invlist,
-       PL_CWU_invlist,
-       PL_CYPRIOTSYLLABARY_invlist,
-       PL_CYRILLICEXTA_invlist,
-       PL_CYRILLICEXTB_invlist,
-       PL_CYRILLICEXTC_invlist,
-       PL_CYRILLICSUP_invlist,
-       PL_CYRL_invlist,
-       PL_DASH_invlist,
-       PL_DEP_invlist,
-       PL_DEVA_invlist,
-       PL_DEVANAGARIEXT_invlist,
-       PL_DI_invlist,
-       PL_DIA_invlist,
-       PL_DIACRITICALS_invlist,
-       PL_DIACRITICALSEXT_invlist,
-       PL_DIACRITICALSFORSYMBOLS_invlist,
-       PL_DIACRITICALSSUP_invlist,
-       PL_DINGBATS_invlist,
-       PL_DOMINO_invlist,
-       PL_DSRT_invlist,
-       PL_DT__CAN_invlist,
-       PL_DT__COM_invlist,
-       PL_DT__ENC_invlist,
-       PL_DT__FIN_invlist,
-       PL_DT__FONT_invlist,
-       PL_DT__FRA_invlist,
-       PL_DT__INIT_invlist,
-       PL_DT__ISO_invlist,
-       PL_DT__MED_invlist,
-       PL_DT__NAR_invlist,
-       PL_DT__NB_invlist,
-       PL_DT__NONCANON_invlist,
-       PL_DT__NONE_invlist,
-       PL_DT__SML_invlist,
-       PL_DT__SQR_invlist,
-       PL_DT__SUB_invlist,
-       PL_DT__SUP_invlist,
-       PL_DT__VERT_invlist,
-       PL_DUPL_invlist,
-       PL_EARLYDYNASTICCUNEIFORM_invlist,
-       PL_EA__A_invlist,
-       PL_EA__F_invlist,
-       PL_EA__H_invlist,
-       PL_EA__N_invlist,
-       PL_EA__NA_invlist,
-       PL_EA__W_invlist,
-       PL_EGYP_invlist,
-       PL_ELBA_invlist,
-       PL_EMOTICONS_invlist,
-       PL_ENCLOSEDALPHANUM_invlist,
-       PL_ENCLOSEDALPHANUMSUP_invlist,
-       PL_ENCLOSEDCJK_invlist,
-       PL_ENCLOSEDIDEOGRAPHICSUP_invlist,
-       PL_ETHI_invlist,
-       PL_ETHIOPICEXT_invlist,
-       PL_ETHIOPICEXTA_invlist,
-       PL_ETHIOPICSUP_invlist,
-       PL_EXT_invlist,
-       PL_GCB__CN_invlist,
-       PL_GCB__L_invlist,
-       PL_GCB__PP_invlist,
-       PL_GCB__SM_invlist,
-       PL_GCB__T_invlist,
-       PL_GCB__V_invlist,
-       PL_GCB__XX_invlist,
-       PL_GEOMETRICSHAPES_invlist,
-       PL_GEOMETRICSHAPESEXT_invlist,
-       PL_GEOR_invlist,
-       PL_GEORGIANSUP_invlist,
-       PL_GLAG_invlist,
-       PL_GLAGOLITICSUP_invlist,
-       PL_GONM_invlist,
-       PL_GOTH_invlist,
-       PL_GRAN_invlist,
-       PL_GRBASE_invlist,
-       PL_GREEKEXT_invlist,
-       PL_GREK_invlist,
-       PL_GREXT_invlist,
-       PL_GUJR_invlist,
-       PL_GURU_invlist,
-       PL_HALFANDFULLFORMS_invlist,
-       PL_HALFMARKS_invlist,
-       PL_HAN_invlist,
-       PL_HANG_invlist,
-       PL_HANO_invlist,
-       PL_HATR_invlist,
-       PL_HEBR_invlist,
-       PL_HIGHPUSURROGATES_invlist,
-       PL_HIGHSURROGATES_invlist,
-       PL_HIRA_invlist,
-       PL_HLUW_invlist,
-       PL_HMNG_invlist,
-       PL_HST__NA_invlist,
-       PL_HUNG_invlist,
-       PL_HYPHEN_invlist,
-       PL_IDC_invlist,
-       PL_IDEO_invlist,
-       PL_IDEOGRAPHICSYMBOLS_invlist,
-       PL_IDS_invlist,
-       PL_IDSB_invlist,
-       PL_IDST_invlist,
-       PL_INADLAM_invlist,
-       PL_INAHOM_invlist,
-       PL_INANATOLIANHIEROGLYPHS_invlist,
-       PL_INARABIC_invlist,
-       PL_INARMENIAN_invlist,
-       PL_INAVESTAN_invlist,
-       PL_INBALINESE_invlist,
-       PL_INBAMUM_invlist,
-       PL_INBASSAVAH_invlist,
-       PL_INBATAK_invlist,
-       PL_INBENGALI_invlist,
-       PL_INBHAIKSUKI_invlist,
-       PL_INBOPOMOFO_invlist,
-       PL_INBRAHMI_invlist,
-       PL_INBUGINESE_invlist,
-       PL_INBUHID_invlist,
-       PL_INCARIAN_invlist,
-       PL_INCAUCASIANALBANIAN_invlist,
-       PL_INCHAKMA_invlist,
-       PL_INCHAM_invlist,
-       PL_INCHEROKEE_invlist,
-       PL_INCOPTIC_invlist,
-       PL_INCUNEIFORM_invlist,
-       PL_INCYRILLIC_invlist,
-       PL_INDEVANAGARI_invlist,
-       PL_INDICNUMBERFORMS_invlist,
-       PL_INDUPLOYAN_invlist,
-       PL_INEGYPTIANHIEROGLYPHS_invlist,
-       PL_INELBASAN_invlist,
-       PL_INETHIOPIC_invlist,
-       PL_INGEORGIAN_invlist,
-       PL_INGLAGOLITIC_invlist,
-       PL_INGOTHIC_invlist,
-       PL_INGRANTHA_invlist,
-       PL_INGREEK_invlist,
-       PL_INGUJARATI_invlist,
-       PL_INGURMUKHI_invlist,
-       PL_INHANGUL_invlist,
-       PL_INHANUNOO_invlist,
-       PL_INHATRAN_invlist,
-       PL_INHEBREW_invlist,
-       PL_INHIRAGANA_invlist,
-       PL_INIDC_invlist,
-       PL_INIMPERIALARAMAIC_invlist,
-       PL_ININSCRIPTIONALPAHLAVI_invlist,
-       PL_ININSCRIPTIONALPARTHIAN_invlist,
-       PL_INJAVANESE_invlist,
-       PL_INKAITHI_invlist,
-       PL_INKANNADA_invlist,
-       PL_INKATAKANA_invlist,
-       PL_INKHAROSHTHI_invlist,
-       PL_INKHMER_invlist,
-       PL_INKHOJKI_invlist,
-       PL_INKHUDAWADI_invlist,
-       PL_INLAO_invlist,
-       PL_INLEPCHA_invlist,
-       PL_INLIMBU_invlist,
-       PL_INLINEARA_invlist,
-       PL_INLYCIAN_invlist,
-       PL_INLYDIAN_invlist,
-       PL_INMAHAJANI_invlist,
-       PL_INMALAYALAM_invlist,
-       PL_INMANDAIC_invlist,
-       PL_INMANICHAEAN_invlist,
-       PL_INMARCHEN_invlist,
-       PL_INMASARAMGONDI_invlist,
-       PL_INMEETEIMAYEK_invlist,
-       PL_INMENDEKIKAKUI_invlist,
-       PL_INMEROITICCURSIVE_invlist,
-       PL_INMIAO_invlist,
-       PL_INMODI_invlist,
-       PL_INMONGOLIAN_invlist,
-       PL_INMRO_invlist,
-       PL_INMULTANI_invlist,
-       PL_INMYANMAR_invlist,
-       PL_INNABATAEAN_invlist,
-       PL_INNEWA_invlist,
-       PL_INNEWTAILUE_invlist,
-       PL_INNKO_invlist,
-       PL_INNUSHU_invlist,
-       PL_INOGHAM_invlist,
-       PL_INOLDHUNGARIAN_invlist,
-       PL_INOLDITALIC_invlist,
-       PL_INOLDPERMIC_invlist,
-       PL_INOLDPERSIAN_invlist,
-       PL_INOLDTURKIC_invlist,
-       PL_INORIYA_invlist,
-       PL_INOSAGE_invlist,
-       PL_INOSMANYA_invlist,
-       PL_INPAHAWHHMONG_invlist,
-       PL_INPAUCINHAU_invlist,
-       PL_INPC__BOTTOM_invlist,
-       PL_INPC__BOTTOMANDLEFT_invlist,
-       PL_INPC__BOTTOMANDRIGHT_invlist,
-       PL_INPC__LEFT_invlist,
-       PL_INPC__LEFTANDRIGHT_invlist,
-       PL_INPC__NA_invlist,
-       PL_INPC__OVERSTRUCK_invlist,
-       PL_INPC__RIGHT_invlist,
-       PL_INPC__TOP_invlist,
-       PL_INPC__TOPANDBOTTOM_invlist,
-       PL_INPC__TOPANDBOTTOMANDRIGHT_invlist,
-       PL_INPC__TOPANDLEFT_invlist,
-       PL_INPC__TOPANDLEFTANDRIGHT_invlist,
-       PL_INPC__TOPANDRIGHT_invlist,
-       PL_INPHAGSPA_invlist,
-       PL_INPHOENICIAN_invlist,
-       PL_INPSALTERPAHLAVI_invlist,
-       PL_INPUNCTUATION_invlist,
-       PL_INREJANG_invlist,
-       PL_INRUNIC_invlist,
-       PL_INSAMARITAN_invlist,
-       PL_INSAURASHTRA_invlist,
-       PL_INSC__AVAGRAHA_invlist,
-       PL_INSC__BINDU_invlist,
-       PL_INSC__BRAHMIJOININGNUMBER_invlist,
-       PL_INSC__CANTILLATIONMARK_invlist,
-       PL_INSC__CONSONANT_invlist,
-       PL_INSC__CONSONANTDEAD_invlist,
-       PL_INSC__CONSONANTFINAL_invlist,
-       PL_INSC__CONSONANTHEADLETTER_invlist,
-       PL_INSC__CONSONANTKILLER_invlist,
-       PL_INSC__CONSONANTMEDIAL_invlist,
-       PL_INSC__CONSONANTPLACEHOLDER_invlist,
-       PL_INSC__CONSONANTPRECEDINGREPHA_invlist,
-       PL_INSC__CONSONANTPREFIXED_invlist,
-       PL_INSC__CONSONANTSUBJOINED_invlist,
-       PL_INSC__CONSONANTSUCCEEDINGREPHA_invlist,
-       PL_INSC__CONSONANTWITHSTACKER_invlist,
-       PL_INSC__GEMINATIONMARK_invlist,
-       PL_INSC__INVISIBLESTACKER_invlist,
-       PL_INSC__MODIFYINGLETTER_invlist,
-       PL_INSC__NONJOINER_invlist,
-       PL_INSC__NUKTA_invlist,
-       PL_INSC__NUMBER_invlist,
-       PL_INSC__NUMBERJOINER_invlist,
-       PL_INSC__OTHER_invlist,
-       PL_INSC__PUREKILLER_invlist,
-       PL_INSC__REGISTERSHIFTER_invlist,
-       PL_INSC__SYLLABLEMODIFIER_invlist,
-       PL_INSC__TONELETTER_invlist,
-       PL_INSC__TONEMARK_invlist,
-       PL_INSC__VIRAMA_invlist,
-       PL_INSC__VISARGA_invlist,
-       PL_INSC__VOWEL_invlist,
-       PL_INSC__VOWELDEPENDENT_invlist,
-       PL_INSC__VOWELINDEPENDENT_invlist,
-       PL_INSHARADA_invlist,
-       PL_INSIDDHAM_invlist,
-       PL_INSINHALA_invlist,
-       PL_INSORASOMPENG_invlist,
-       PL_INSOYOMBO_invlist,
-       PL_INSUNDANESE_invlist,
-       PL_INSYLOTINAGRI_invlist,
-       PL_INSYRIAC_invlist,
-       PL_INTAGALOG_invlist,
-       PL_INTAGBANWA_invlist,
-       PL_INTAILE_invlist,
-       PL_INTAITHAM_invlist,
-       PL_INTAIVIET_invlist,
-       PL_INTAKRI_invlist,
-       PL_INTAMIL_invlist,
-       PL_INTANGUT_invlist,
-       PL_INTELUGU_invlist,
-       PL_INTHAANA_invlist,
-       PL_INTHAI_invlist,
-       PL_INTIBETAN_invlist,
-       PL_INTIFINAGH_invlist,
-       PL_INTIRHUTA_invlist,
-       PL_INUGARITIC_invlist,
-       PL_INVAI_invlist,
-       PL_INVS_invlist,
-       PL_INWARANGCITI_invlist,
-       PL_INZANABAZARSQUARE_invlist,
-       PL_IN__10_invlist,
-       PL_IN__1_DOT_1_invlist,
-       PL_IN__2_invlist,
-       PL_IN__2_DOT_1_invlist,
-       PL_IN__3_invlist,
-       PL_IN__3_DOT_1_invlist,
-       PL_IN__3_DOT_2_invlist,
-       PL_IN__4_invlist,
-       PL_IN__4_DOT_1_invlist,
-       PL_IN__5_invlist,
-       PL_IN__5_DOT_1_invlist,
-       PL_IN__5_DOT_2_invlist,
-       PL_IN__6_invlist,
-       PL_IN__6_DOT_1_invlist,
-       PL_IN__6_DOT_2_invlist,
-       PL_IN__6_DOT_3_invlist,
-       PL_IN__7_invlist,
-       PL_IN__8_invlist,
-       PL_IN__9_invlist,
-       PL_IPAEXT_invlist,
-       PL_ITAL_invlist,
-       PL_JAMO_invlist,
-       PL_JAMOEXTA_invlist,
-       PL_JAMOEXTB_invlist,
-       PL_JAVA_invlist,
-       PL_JG__AFRICANFEH_invlist,
-       PL_JG__AFRICANNOON_invlist,
-       PL_JG__AFRICANQAF_invlist,
-       PL_JG__AIN_invlist,
-       PL_JG__ALAPH_invlist,
-       PL_JG__ALEF_invlist,
-       PL_JG__BEH_invlist,
-       PL_JG__BETH_invlist,
-       PL_JG__BURUSHASKIYEHBARREE_invlist,
-       PL_JG__DAL_invlist,
-       PL_JG__DALATHRISH_invlist,
-       PL_JG__E_invlist,
-       PL_JG__FARSIYEH_invlist,
-       PL_JG__FE_invlist,
-       PL_JG__FEH_invlist,
-       PL_JG__FINALSEMKATH_invlist,
-       PL_JG__GAF_invlist,
-       PL_JG__GAMAL_invlist,
-       PL_JG__HAH_invlist,
-       PL_JG__HAMZAONHEHGOAL_invlist,
-       PL_JG__HE_invlist,
-       PL_JG__HEH_invlist,
-       PL_JG__HEHGOAL_invlist,
-       PL_JG__HETH_invlist,
-       PL_JG__KAF_invlist,
-       PL_JG__KAPH_invlist,
-       PL_JG__KHAPH_invlist,
-       PL_JG__KNOTTEDHEH_invlist,
-       PL_JG__LAM_invlist,
-       PL_JG__LAMADH_invlist,
-       PL_JG__MALAYALAMBHA_invlist,
-       PL_JG__MALAYALAMJA_invlist,
-       PL_JG__MALAYALAMLLA_invlist,
-       PL_JG__MALAYALAMLLLA_invlist,
-       PL_JG__MALAYALAMNGA_invlist,
-       PL_JG__MALAYALAMNNA_invlist,
-       PL_JG__MALAYALAMNNNA_invlist,
-       PL_JG__MALAYALAMNYA_invlist,
-       PL_JG__MALAYALAMRA_invlist,
-       PL_JG__MALAYALAMSSA_invlist,
-       PL_JG__MALAYALAMTTA_invlist,
-       PL_JG__MANICHAEANALEPH_invlist,
-       PL_JG__MANICHAEANAYIN_invlist,
-       PL_JG__MANICHAEANBETH_invlist,
-       PL_JG__MANICHAEANDALETH_invlist,
-       PL_JG__MANICHAEANDHAMEDH_invlist,
-       PL_JG__MANICHAEANFIVE_invlist,
-       PL_JG__MANICHAEANGIMEL_invlist,
-       PL_JG__MANICHAEANHETH_invlist,
-       PL_JG__MANICHAEANHUNDRED_invlist,
-       PL_JG__MANICHAEANKAPH_invlist,
-       PL_JG__MANICHAEANLAMEDH_invlist,
-       PL_JG__MANICHAEANMEM_invlist,
-       PL_JG__MANICHAEANNUN_invlist,
-       PL_JG__MANICHAEANONE_invlist,
-       PL_JG__MANICHAEANPE_invlist,
-       PL_JG__MANICHAEANQOPH_invlist,
-       PL_JG__MANICHAEANRESH_invlist,
-       PL_JG__MANICHAEANSADHE_invlist,
-       PL_JG__MANICHAEANSAMEKH_invlist,
-       PL_JG__MANICHAEANTAW_invlist,
-       PL_JG__MANICHAEANTEN_invlist,
-       PL_JG__MANICHAEANTETH_invlist,
-       PL_JG__MANICHAEANTHAMEDH_invlist,
-       PL_JG__MANICHAEANTWENTY_invlist,
-       PL_JG__MANICHAEANWAW_invlist,
-       PL_JG__MANICHAEANYODH_invlist,
-       PL_JG__MANICHAEANZAYIN_invlist,
-       PL_JG__MEEM_invlist,
-       PL_JG__MIM_invlist,
-       PL_JG__NOJOININGGROUP_invlist,
-       PL_JG__NOON_invlist,
-       PL_JG__NUN_invlist,
-       PL_JG__NYA_invlist,
-       PL_JG__PE_invlist,
-       PL_JG__QAF_invlist,
-       PL_JG__QAPH_invlist,
-       PL_JG__REH_invlist,
-       PL_JG__REVERSEDPE_invlist,
-       PL_JG__ROHINGYAYEH_invlist,
-       PL_JG__SAD_invlist,
-       PL_JG__SADHE_invlist,
-       PL_JG__SEEN_invlist,
-       PL_JG__SEMKATH_invlist,
-       PL_JG__SHIN_invlist,
-       PL_JG__STRAIGHTWAW_invlist,
-       PL_JG__SWASHKAF_invlist,
-       PL_JG__SYRIACWAW_invlist,
-       PL_JG__TAH_invlist,
-       PL_JG__TAW_invlist,
-       PL_JG__TEHMARBUTA_invlist,
-       PL_JG__TETH_invlist,
-       PL_JG__WAW_invlist,
-       PL_JG__YEH_invlist,
-       PL_JG__YEHBARREE_invlist,
-       PL_JG__YEHWITHTAIL_invlist,
-       PL_JG__YUDH_invlist,
-       PL_JG__YUDHHE_invlist,
-       PL_JG__ZAIN_invlist,
-       PL_JG__ZHAIN_invlist,
-       PL_JOINC_invlist,
-       PL_JT__C_invlist,
-       PL_JT__D_invlist,
-       PL_JT__L_invlist,
-       PL_JT__R_invlist,
-       PL_JT__T_invlist,
-       PL_JT__U_invlist,
-       PL_KALI_invlist,
-       PL_KANA_invlist,
-       PL_KANAEXTA_invlist,
-       PL_KANASUP_invlist,
-       PL_KANBUN_invlist,
-       PL_KANGXI_invlist,
-       PL_KATAKANAEXT_invlist,
-       PL_KHAR_invlist,
-       PL_KHMERSYMBOLS_invlist,
-       PL_KHMR_invlist,
-       PL_KHOJ_invlist,
-       PL_KNDA_invlist,
-       PL_KTHI_invlist,
-       PL_L_invlist,
-       PL_LANA_invlist,
-       PL_LAO_invlist,
-       PL_LATIN1_invlist,
-       PL_LATINEXTA_invlist,
-       PL_LATINEXTADDITIONAL_invlist,
-       PL_LATINEXTB_invlist,
-       PL_LATINEXTC_invlist,
-       PL_LATINEXTD_invlist,
-       PL_LATINEXTE_invlist,
-       PL_LATN_invlist,
-       PL_LB__AI_invlist,
-       PL_LB__AL_invlist,
-       PL_LB__B2_invlist,
-       PL_LB__BA_invlist,
-       PL_LB__BB_invlist,
-       PL_LB__BK_invlist,
-       PL_LB__CB_invlist,
-       PL_LB__CJ_invlist,
-       PL_LB__CL_invlist,
-       PL_LB__CM_invlist,
-       PL_LB__CP_invlist,
-       PL_LB__CR_invlist,
-       PL_LB__EB_invlist,
-       PL_LB__EM_invlist,
-       PL_LB__EX_invlist,
-       PL_LB__GL_invlist,
-       PL_LB__H2_invlist,
-       PL_LB__H3_invlist,
-       PL_LB__HL_invlist,
-       PL_LB__HY_invlist,
-       PL_LB__ID_invlist,
-       PL_LB__IN_invlist,
-       PL_LB__IS_invlist,
-       PL_LB__LF_invlist,
-       PL_LB__NL_invlist,
-       PL_LB__NS_invlist,
-       PL_LB__NU_invlist,
-       PL_LB__OP_invlist,
-       PL_LB__PO_invlist,
-       PL_LB__PR_invlist,
-       PL_LB__QU_invlist,
-       PL_LB__SA_invlist,
-       PL_LB__SG_invlist,
-       PL_LB__SP_invlist,
-       PL_LB__SY_invlist,
-       PL_LB__WJ_invlist,
-       PL_LB__XX_invlist,
-       PL_LB__ZW_invlist,
-       PL_LB__ZWJ_invlist,
-       PL_LEPC_invlist,
-       PL_LETTERLIKESYMBOLS_invlist,
-       PL_LIMB_invlist,
-       PL_LINA_invlist,
-       PL_LINB_invlist,
-       PL_LINEARBIDEOGRAMS_invlist,
-       PL_LINEARBSYLLABARY_invlist,
-       PL_LISU_invlist,
-       PL_LM_invlist,
-       PL_LO_invlist,
-       PL_LOE_invlist,
-       PL_LOWERCASELETTER_invlist,
-       PL_LOWSURROGATES_invlist,
-       PL_LYCI_invlist,
-       PL_LYDI_invlist,
-       PL_M_invlist,
-       PL_MAHJ_invlist,
-       PL_MAHJONG_invlist,
-       PL_MAND_invlist,
-       PL_MANI_invlist,
-       PL_MARC_invlist,
-       PL_MATH_invlist,
-       PL_MATHALPHANUM_invlist,
-       PL_MATHOPERATORS_invlist,
-       PL_MC_invlist,
-       PL_ME_invlist,
-       PL_MEETEIMAYEKEXT_invlist,
-       PL_MEND_invlist,
-       PL_MERC_invlist,
-       PL_MERO_invlist,
-       PL_MIAO_invlist,
-       PL_MISCARROWS_invlist,
-       PL_MISCMATHSYMBOLSA_invlist,
-       PL_MISCMATHSYMBOLSB_invlist,
-       PL_MISCPICTOGRAPHS_invlist,
-       PL_MISCSYMBOLS_invlist,
-       PL_MISCTECHNICAL_invlist,
-       PL_MLYM_invlist,
-       PL_MN_invlist,
-       PL_MODI_invlist,
-       PL_MODIFIERLETTERS_invlist,
-       PL_MODIFIERTONELETTERS_invlist,
-       PL_MONG_invlist,
-       PL_MONGOLIANSUP_invlist,
-       PL_MRO_invlist,
-       PL_MTEI_invlist,
-       PL_MULT_invlist,
-       PL_MUSIC_invlist,
-       PL_MYANMAREXTA_invlist,
-       PL_MYANMAREXTB_invlist,
-       PL_MYMR_invlist,
-       PL_N_invlist,
-       PL_NARB_invlist,
-       PL_NB_invlist,
-       PL_NBAT_invlist,
-       PL_NEWA_invlist,
-       PL_NFCQC__M_invlist,
-       PL_NFCQC__Y_invlist,
-       PL_NFDQC__Y_invlist,
-       PL_NFKCQC__N_invlist,
-       PL_NFKCQC__Y_invlist,
-       PL_NFKDQC__N_invlist,
-       PL_NKO_invlist,
-       PL_NL_invlist,
-       PL_NO_invlist,
-       PL_NSHU_invlist,
-       PL_NT__DI_invlist,
-       PL_NT__NU_invlist,
-       PL_NUMBERFORMS_invlist,
-       PL_NV__0_invlist,
-       PL_NV__1_invlist,
-       PL_NV__10_invlist,
-       PL_NV__100_invlist,
-       PL_NV__1000_invlist,
-       PL_NV__10000_invlist,
-       PL_NV__100000_invlist,
-       PL_NV__1000000_invlist,
-       PL_NV__100000000_invlist,
-       PL_NV__10000000000_invlist,
-       PL_NV__1000000000000_invlist,
-       PL_NV__11_invlist,
-       PL_NV__11_SLASH_12_invlist,
-       PL_NV__11_SLASH_2_invlist,
-       PL_NV__12_invlist,
-       PL_NV__13_invlist,
-       PL_NV__13_SLASH_2_invlist,
-       PL_NV__14_invlist,
-       PL_NV__15_invlist,
-       PL_NV__15_SLASH_2_invlist,
-       PL_NV__16_invlist,
-       PL_NV__17_invlist,
-       PL_NV__17_SLASH_2_invlist,
-       PL_NV__18_invlist,
-       PL_NV__19_invlist,
-       PL_NV__1_SLASH_10_invlist,
-       PL_NV__1_SLASH_12_invlist,
-       PL_NV__1_SLASH_16_invlist,
-       PL_NV__1_SLASH_160_invlist,
-       PL_NV__1_SLASH_2_invlist,
-       PL_NV__1_SLASH_20_invlist,
-       PL_NV__1_SLASH_3_invlist,
-       PL_NV__1_SLASH_4_invlist,
-       PL_NV__1_SLASH_40_invlist,
-       PL_NV__1_SLASH_5_invlist,
-       PL_NV__1_SLASH_6_invlist,
-       PL_NV__1_SLASH_7_invlist,
-       PL_NV__1_SLASH_8_invlist,
-       PL_NV__1_SLASH_9_invlist,
-       PL_NV__2_invlist,
-       PL_NV__20_invlist,
-       PL_NV__200_invlist,
-       PL_NV__2000_invlist,
-       PL_NV__20000_invlist,
-       PL_NV__200000_invlist,
-       PL_NV__21_invlist,
-       PL_NV__216000_invlist,
-       PL_NV__22_invlist,
-       PL_NV__23_invlist,
-       PL_NV__24_invlist,
-       PL_NV__25_invlist,
-       PL_NV__26_invlist,
-       PL_NV__27_invlist,
-       PL_NV__28_invlist,
-       PL_NV__29_invlist,
-       PL_NV__2_SLASH_3_invlist,
-       PL_NV__2_SLASH_5_invlist,
-       PL_NV__3_invlist,
-       PL_NV__30_invlist,
-       PL_NV__300_invlist,
-       PL_NV__3000_invlist,
-       PL_NV__30000_invlist,
-       PL_NV__300000_invlist,
-       PL_NV__31_invlist,
-       PL_NV__32_invlist,
-       PL_NV__33_invlist,
-       PL_NV__34_invlist,
-       PL_NV__35_invlist,
-       PL_NV__36_invlist,
-       PL_NV__37_invlist,
-       PL_NV__38_invlist,
-       PL_NV__39_invlist,
-       PL_NV__3_SLASH_16_invlist,
-       PL_NV__3_SLASH_2_invlist,
-       PL_NV__3_SLASH_20_invlist,
-       PL_NV__3_SLASH_4_invlist,
-       PL_NV__3_SLASH_5_invlist,
-       PL_NV__3_SLASH_8_invlist,
-       PL_NV__3_SLASH_80_invlist,
-       PL_NV__4_invlist,
-       PL_NV__40_invlist,
-       PL_NV__400_invlist,
-       PL_NV__4000_invlist,
-       PL_NV__40000_invlist,
-       PL_NV__400000_invlist,
-       PL_NV__41_invlist,
-       PL_NV__42_invlist,
-       PL_NV__43_invlist,
-       PL_NV__432000_invlist,
-       PL_NV__44_invlist,
-       PL_NV__45_invlist,
-       PL_NV__46_invlist,
-       PL_NV__47_invlist,
-       PL_NV__48_invlist,
-       PL_NV__49_invlist,
-       PL_NV__4_SLASH_5_invlist,
-       PL_NV__5_invlist,
-       PL_NV__50_invlist,
-       PL_NV__500_invlist,
-       PL_NV__5000_invlist,
-       PL_NV__50000_invlist,
-       PL_NV__500000_invlist,
-       PL_NV__5_SLASH_12_invlist,
-       PL_NV__5_SLASH_2_invlist,
-       PL_NV__5_SLASH_6_invlist,
-       PL_NV__5_SLASH_8_invlist,
-       PL_NV__6_invlist,
-       PL_NV__60_invlist,
-       PL_NV__600_invlist,
-       PL_NV__6000_invlist,
-       PL_NV__60000_invlist,
-       PL_NV__600000_invlist,
-       PL_NV__7_invlist,
-       PL_NV__70_invlist,
-       PL_NV__700_invlist,
-       PL_NV__7000_invlist,
-       PL_NV__70000_invlist,
-       PL_NV__700000_invlist,
-       PL_NV__7_SLASH_12_invlist,
-       PL_NV__7_SLASH_2_invlist,
-       PL_NV__7_SLASH_8_invlist,
-       PL_NV__8_invlist,
-       PL_NV__80_invlist,
-       PL_NV__800_invlist,
-       PL_NV__8000_invlist,
-       PL_NV__80000_invlist,
-       PL_NV__800000_invlist,
-       PL_NV__9_invlist,
-       PL_NV__90_invlist,
-       PL_NV__900_invlist,
-       PL_NV__9000_invlist,
-       PL_NV__90000_invlist,
-       PL_NV__900000_invlist,
-       PL_NV__9_SLASH_2_invlist,
-       PL_NV__NAN_invlist,
-       PL_NV___MINUS_1_SLASH_2_invlist,
-       PL_OCR_invlist,
-       PL_OGAM_invlist,
-       PL_OLCK_invlist,
-       PL_ORKH_invlist,
-       PL_ORNAMENTALDINGBATS_invlist,
-       PL_ORYA_invlist,
-       PL_OSGE_invlist,
-       PL_OSMA_invlist,
-       PL_P_invlist,
-       PL_PALM_invlist,
-       PL_PATSYN_invlist,
-       PL_PAUC_invlist,
-       PL_PC_invlist,
-       PL_PCM_invlist,
-       PL_PD_invlist,
-       PL_PE_invlist,
-       PL_PERM_invlist,
-       PL_PF_invlist,
-       PL_PHAG_invlist,
-       PL_PHAISTOS_invlist,
-       PL_PHLI_invlist,
-       PL_PHLP_invlist,
-       PL_PHNX_invlist,
-       PL_PHONETICEXT_invlist,
-       PL_PHONETICEXTSUP_invlist,
-       PL_PI_invlist,
-       PL_PLAYINGCARDS_invlist,
-       PL_PO_invlist,
-       PL_POSIXALNUM_invlist,
-       PL_POSIXALPHA_invlist,
-       PL_POSIXBLANK_invlist,
-       PL_POSIXCNTRL_invlist,
-       PL_POSIXDIGIT_invlist,
-       PL_POSIXGRAPH_invlist,
-       PL_POSIXLOWER_invlist,
-       PL_POSIXPRINT_invlist,
-       PL_POSIXPUNCT_invlist,
-       PL_POSIXSPACE_invlist,
-       PL_POSIXUPPER_invlist,
-       PL_POSIXWORD_invlist,
-       PL_POSIXXDIGIT_invlist,
-       PL_PRTI_invlist,
-       PL_PS_invlist,
-       PL_PUA_invlist,
-       PL_QAAI_invlist,
-       PL_QMARK_invlist,
-       PL_RADICAL_invlist,
-       PL_RI_invlist,
-       PL_RJNG_invlist,
-       PL_RUMI_invlist,
-       PL_RUNR_invlist,
-       PL_S_invlist,
-       PL_SAMR_invlist,
-       PL_SARB_invlist,
-       PL_SAUR_invlist,
-       PL_SB__AT_invlist,
-       PL_SB__CL_invlist,
-       PL_SB__EX_invlist,
-       PL_SB__FO_invlist,
-       PL_SB__LE_invlist,
-       PL_SB__LO_invlist,
-       PL_SB__SC_invlist,
-       PL_SB__SE_invlist,
-       PL_SB__SP_invlist,
-       PL_SB__ST_invlist,
-       PL_SB__UP_invlist,
-       PL_SB__XX_invlist,
-       PL_SC_invlist,
-       PL_SC__ADLM_invlist,
-       PL_SC__ARAB_invlist,
-       PL_SC__ARMN_invlist,
-       PL_SC__BENG_invlist,
-       PL_SC__BOPO_invlist,
-       PL_SC__BUGI_invlist,
-       PL_SC__BUHD_invlist,
-       PL_SC__CAKM_invlist,
-       PL_SC__COPT_invlist,
-       PL_SC__CPRT_invlist,
-       PL_SC__CYRL_invlist,
-       PL_SC__DEVA_invlist,
-       PL_SC__DUPL_invlist,
-       PL_SC__GEOR_invlist,
-       PL_SC__GLAG_invlist,
-       PL_SC__GRAN_invlist,
-       PL_SC__GREK_invlist,
-       PL_SC__GUJR_invlist,
-       PL_SC__GURU_invlist,
-       PL_SC__HAN_invlist,
-       PL_SC__HANG_invlist,
-       PL_SC__HANO_invlist,
-       PL_SC__HIRA_invlist,
-       PL_SC__JAVA_invlist,
-       PL_SC__KALI_invlist,
-       PL_SC__KANA_invlist,
-       PL_SC__KHOJ_invlist,
-       PL_SC__KNDA_invlist,
-       PL_SC__KTHI_invlist,
-       PL_SC__LATN_invlist,
-       PL_SC__LIMB_invlist,
-       PL_SC__LINA_invlist,
-       PL_SC__LINB_invlist,
-       PL_SC__MAHJ_invlist,
-       PL_SC__MAND_invlist,
-       PL_SC__MANI_invlist,
-       PL_SC__MLYM_invlist,
-       PL_SC__MODI_invlist,
-       PL_SC__MONG_invlist,
-       PL_SC__MULT_invlist,
-       PL_SC__MYMR_invlist,
-       PL_SC__ORYA_invlist,
-       PL_SC__PERM_invlist,
-       PL_SC__PHAG_invlist,
-       PL_SC__PHLP_invlist,
-       PL_SC__QAAI_invlist,
-       PL_SC__SHRD_invlist,
-       PL_SC__SIND_invlist,
-       PL_SC__SINH_invlist,
-       PL_SC__SYLO_invlist,
-       PL_SC__SYRC_invlist,
-       PL_SC__TAGB_invlist,
-       PL_SC__TAKR_invlist,
-       PL_SC__TALE_invlist,
-       PL_SC__TAML_invlist,
-       PL_SC__TELU_invlist,
-       PL_SC__TGLG_invlist,
-       PL_SC__THAA_invlist,
-       PL_SC__TIRH_invlist,
-       PL_SC__YI_invlist,
-       PL_SC__ZYYY_invlist,
-       PL_SD_invlist,
-       PL_SGNW_invlist,
-       PL_SHAW_invlist,
-       PL_SHORTHANDFORMATCONTROLS_invlist,
-       PL_SHRD_invlist,
-       PL_SIDD_invlist,
-       PL_SIND_invlist,
-       PL_SINH_invlist,
-       PL_SINHALAARCHAICNUMBERS_invlist,
-       PL_SK_invlist,
-       PL_SM_invlist,
-       PL_SMALLFORMS_invlist,
-       PL_SO_invlist,
-       PL_SORA_invlist,
-       PL_SOYO_invlist,
-       PL_SPECIALS_invlist,
-       PL_STERM_invlist,
-       PL_SUND_invlist,
-       PL_SUNDANESESUP_invlist,
-       PL_SUPARROWSA_invlist,
-       PL_SUPARROWSB_invlist,
-       PL_SUPARROWSC_invlist,
-       PL_SUPERANDSUB_invlist,
-       PL_SUPMATHOPERATORS_invlist,
-       PL_SUPPUAA_invlist,
-       PL_SUPPUAB_invlist,
-       PL_SUPPUNCTUATION_invlist,
-       PL_SUPSYMBOLSANDPICTOGRAPHS_invlist,
-       PL_SUTTONSIGNWRITING_invlist,
-       PL_SYLO_invlist,
-       PL_SYRC_invlist,
-       PL_SYRIACSUP_invlist,
-       PL_TAGB_invlist,
-       PL_TAGS_invlist,
-       PL_TAIXUANJING_invlist,
-       PL_TAKR_invlist,
-       PL_TALE_invlist,
-       PL_TALU_invlist,
-       PL_TAML_invlist,
-       PL_TANG_invlist,
-       PL_TANGUTCOMPONENTS_invlist,
-       PL_TAVT_invlist,
-       PL_TELU_invlist,
-       PL_TERM_invlist,
-       PL_TFNG_invlist,
-       PL_TGLG_invlist,
-       PL_THAA_invlist,
-       PL_THAI_invlist,
-       PL_TIBT_invlist,
-       PL_TIRH_invlist,
-       PL_TITLE_invlist,
-       PL_TRANSPORTANDMAP_invlist,
-       PL_UCAS_invlist,
-       PL_UCASEXT_invlist,
-       PL_UGAR_invlist,
-       PL_UIDEO_invlist,
-       PL_UPPERCASELETTER_invlist,
-       PL_VAI_invlist,
-       PL_VEDICEXT_invlist,
-       PL_VERTICALFORMS_invlist,
-       PL_VERTSPACE_invlist,
-       PL_VO__R_invlist,
-       PL_VO__TR_invlist,
-       PL_VO__TU_invlist,
-       PL_VO__U_invlist,
-       PL_VS_invlist,
-       PL_VSSUP_invlist,
-       PL_WARA_invlist,
-       PL_WB__DQ_invlist,
-       PL_WB__EB_invlist,
-       PL_WB__EBG_invlist,
-       PL_WB__EX_invlist,
-       PL_WB__EXTEND_invlist,
-       PL_WB__FO_invlist,
-       PL_WB__GAZ_invlist,
-       PL_WB__KA_invlist,
-       PL_WB__LE_invlist,
-       PL_WB__MB_invlist,
-       PL_WB__ML_invlist,
-       PL_WB__MN_invlist,
-       PL_WB__NL_invlist,
-       PL_WB__NU_invlist,
-       PL_WB__SQ_invlist,
-       PL_WB__XX_invlist,
-       PL_XIDC_invlist,
-       PL_XIDS_invlist,
-       PL_XPEO_invlist,
-       PL_XPOSIXALNUM_invlist,
-       PL_XPOSIXALPHA_invlist,
-       PL_XPOSIXBLANK_invlist,
-       PL_XPOSIXCNTRL_invlist,
-       PL_XPOSIXDIGIT_invlist,
-       PL_XPOSIXGRAPH_invlist,
-       PL_XPOSIXLOWER_invlist,
-       PL_XPOSIXPRINT_invlist,
-       PL_XPOSIXPUNCT_invlist,
-       PL_XPOSIXSPACE_invlist,
-       PL_XPOSIXUPPER_invlist,
-       PL_XPOSIXWORD_invlist,
-       PL_XPOSIXXDIGIT_invlist,
-       PL_XSUX_invlist,
-       PL_YI_invlist,
-       PL_YIJING_invlist,
-       PL_YIRADICALS_invlist,
-       PL_YISYLLABLES_invlist,
-       PL_Z_invlist,
-       PL_ZANB_invlist,
-       PL_ZL_invlist,
-       PL_ZP_invlist,
-       PL_ZS_invlist,
-       PL_ZYYY_invlist,
-       PL_ZZZZ_invlist,
-       PL__PERL_ANY_FOLDS_invlist,
-       PL__PERL_CHARNAME_BEGIN_invlist,
-       PL__PERL_CHARNAME_CONTINUE_invlist,
-       PL__PERL_FOLDS_TO_MULTI_CHAR_invlist,
-       PL__PERL_IDCONT_invlist,
-       PL__PERL_IDSTART_invlist,
-       PL__PERL_NCHAR_invlist,
-       PL__PERL_PATWS_invlist,
-       PL__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist,
-       PL__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist,
-       PL__PERL_QUOTEMETA_invlist,
-       PL__PERL_SURROGATE_invlist
+               UNI_ADLM_invlist,
+       UNI_AEGEANNUMBERS_invlist,
+       UNI_AGE__10_invlist,
+       UNI_AGE__11_invlist,
+       UNI_AGE__2_invlist,
+       UNI_AGE__2_DOT_1_invlist,
+       UNI_AGE__3_invlist,
+       UNI_AGE__3_DOT_1_invlist,
+       UNI_AGE__3_DOT_2_invlist,
+       UNI_AGE__4_invlist,
+       UNI_AGE__4_DOT_1_invlist,
+       UNI_AGE__5_invlist,
+       UNI_AGE__5_DOT_1_invlist,
+       UNI_AGE__5_DOT_2_invlist,
+       UNI_AGE__6_invlist,
+       UNI_AGE__6_DOT_1_invlist,
+       UNI_AGE__6_DOT_2_invlist,
+       UNI_AGE__6_DOT_3_invlist,
+       UNI_AGE__7_invlist,
+       UNI_AGE__8_invlist,
+       UNI_AGE__9_invlist,
+       UNI_AGE__NA_invlist,
+       UNI_AGHB_invlist,
+       UNI_AHOM_invlist,
+       UNI_ALCHEMICAL_invlist,
+       UNI_ALL_invlist,
+       UNI_ALPHABETICPF_invlist,
+       UNI_ANCIENTGREEKMUSIC_invlist,
+       UNI_ANCIENTGREEKNUMBERS_invlist,
+       UNI_ANCIENTSYMBOLS_invlist,
+       UNI_ANY_invlist,
+       UNI_ARAB_invlist,
+       UNI_ARABICEXTA_invlist,
+       UNI_ARABICMATH_invlist,
+       UNI_ARABICPFA_invlist,
+       UNI_ARABICPFB_invlist,
+       UNI_ARABICSUP_invlist,
+       UNI_ARMI_invlist,
+       UNI_ARMN_invlist,
+       UNI_ARROWS_invlist,
+       UNI_ASCII_invlist,
+       UNI_ASSIGNED_invlist,
+       UNI_AVST_invlist,
+       UNI_BALI_invlist,
+       UNI_BAMU_invlist,
+       UNI_BAMUMSUP_invlist,
+       UNI_BASS_invlist,
+       UNI_BATK_invlist,
+       UNI_BC__AL_invlist,
+       UNI_BC__AN_invlist,
+       UNI_BC__B_invlist,
+       UNI_BC__BN_invlist,
+       UNI_BC__CS_invlist,
+       UNI_BC__EN_invlist,
+       UNI_BC__ES_invlist,
+       UNI_BC__ET_invlist,
+       UNI_BC__FSI_invlist,
+       UNI_BC__L_invlist,
+       UNI_BC__LRE_invlist,
+       UNI_BC__LRI_invlist,
+       UNI_BC__LRO_invlist,
+       UNI_BC__NSM_invlist,
+       UNI_BC__ON_invlist,
+       UNI_BC__PDF_invlist,
+       UNI_BC__PDI_invlist,
+       UNI_BC__R_invlist,
+       UNI_BC__RLE_invlist,
+       UNI_BC__RLI_invlist,
+       UNI_BC__RLO_invlist,
+       UNI_BC__S_invlist,
+       UNI_BC__WS_invlist,
+       UNI_BENG_invlist,
+       UNI_BHKS_invlist,
+       UNI_BIDIC_invlist,
+       UNI_BIDIM_invlist,
+       UNI_BLOCKELEMENTS_invlist,
+       UNI_BOPO_invlist,
+       UNI_BOPOMOFOEXT_invlist,
+       UNI_BOXDRAWING_invlist,
+       UNI_BPT__C_invlist,
+       UNI_BPT__N_invlist,
+       UNI_BPT__O_invlist,
+       UNI_BRAH_invlist,
+       UNI_BRAI_invlist,
+       UNI_BUGI_invlist,
+       UNI_BUHD_invlist,
+       UNI_BYZANTINEMUSIC_invlist,
+       UNI_C_invlist,
+       UNI_CAKM_invlist,
+       UNI_CANS_invlist,
+       UNI_CARI_invlist,
+       UNI_CASED_invlist,
+       UNI_CASEDLETTER_invlist,
+       UNI_CCC__0_invlist,
+       UNI_CCC__1_invlist,
+       UNI_CCC__10_invlist,
+       UNI_CCC__103_invlist,
+       UNI_CCC__107_invlist,
+       UNI_CCC__11_invlist,
+       UNI_CCC__118_invlist,
+       UNI_CCC__12_invlist,
+       UNI_CCC__122_invlist,
+       UNI_CCC__129_invlist,
+       UNI_CCC__13_invlist,
+       UNI_CCC__130_invlist,
+       UNI_CCC__132_invlist,
+       UNI_CCC__14_invlist,
+       UNI_CCC__15_invlist,
+       UNI_CCC__16_invlist,
+       UNI_CCC__17_invlist,
+       UNI_CCC__18_invlist,
+       UNI_CCC__19_invlist,
+       UNI_CCC__20_invlist,
+       UNI_CCC__202_invlist,
+       UNI_CCC__21_invlist,
+       UNI_CCC__214_invlist,
+       UNI_CCC__216_invlist,
+       UNI_CCC__22_invlist,
+       UNI_CCC__23_invlist,
+       UNI_CCC__24_invlist,
+       UNI_CCC__25_invlist,
+       UNI_CCC__26_invlist,
+       UNI_CCC__27_invlist,
+       UNI_CCC__28_invlist,
+       UNI_CCC__29_invlist,
+       UNI_CCC__30_invlist,
+       UNI_CCC__31_invlist,
+       UNI_CCC__32_invlist,
+       UNI_CCC__33_invlist,
+       UNI_CCC__34_invlist,
+       UNI_CCC__35_invlist,
+       UNI_CCC__36_invlist,
+       UNI_CCC__7_invlist,
+       UNI_CCC__8_invlist,
+       UNI_CCC__84_invlist,
+       UNI_CCC__9_invlist,
+       UNI_CCC__91_invlist,
+       UNI_CCC__A_invlist,
+       UNI_CCC__AL_invlist,
+       UNI_CCC__AR_invlist,
+       UNI_CCC__B_invlist,
+       UNI_CCC__BL_invlist,
+       UNI_CCC__BR_invlist,
+       UNI_CCC__DA_invlist,
+       UNI_CCC__DB_invlist,
+       UNI_CCC__IS_invlist,
+       UNI_CCC__L_invlist,
+       UNI_CCC__R_invlist,
+       UNI_CE_invlist,
+       UNI_CF_invlist,
+       UNI_CHAM_invlist,
+       UNI_CHER_invlist,
+       UNI_CHEROKEESUP_invlist,
+       UNI_CHESSSYMBOLS_invlist,
+       UNI_CI_invlist,
+       UNI_CJK_invlist,
+       UNI_CJKCOMPAT_invlist,
+       UNI_CJKCOMPATFORMS_invlist,
+       UNI_CJKCOMPATIDEOGRAPHS_invlist,
+       UNI_CJKCOMPATIDEOGRAPHSSUP_invlist,
+       UNI_CJKEXTA_invlist,
+       UNI_CJKEXTB_invlist,
+       UNI_CJKEXTC_invlist,
+       UNI_CJKEXTD_invlist,
+       UNI_CJKEXTE_invlist,
+       UNI_CJKEXTF_invlist,
+       UNI_CJKRADICALSSUP_invlist,
+       UNI_CJKSTROKES_invlist,
+       UNI_CJKSYMBOLS_invlist,
+       UNI_CN_invlist,
+       UNI_CO_invlist,
+       UNI_COMPATJAMO_invlist,
+       UNI_COMPEX_invlist,
+       UNI_CONTROLPICTURES_invlist,
+       UNI_COPT_invlist,
+       UNI_COPTICEPACTNUMBERS_invlist,
+       UNI_COUNTINGROD_invlist,
+       UNI_CPRT_invlist,
+       UNI_CUNEIFORMNUMBERS_invlist,
+       UNI_CURRENCYSYMBOLS_invlist,
+       UNI_CWCF_invlist,
+       UNI_CWCM_invlist,
+       UNI_CWKCF_invlist,
+       UNI_CWL_invlist,
+       UNI_CWT_invlist,
+       UNI_CWU_invlist,
+       UNI_CYPRIOTSYLLABARY_invlist,
+       UNI_CYRILLICEXTA_invlist,
+       UNI_CYRILLICEXTB_invlist,
+       UNI_CYRILLICEXTC_invlist,
+       UNI_CYRILLICSUP_invlist,
+       UNI_CYRL_invlist,
+       UNI_DASH_invlist,
+       UNI_DEP_invlist,
+       UNI_DEVA_invlist,
+       UNI_DEVANAGARIEXT_invlist,
+       UNI_DI_invlist,
+       UNI_DIA_invlist,
+       UNI_DIACRITICALS_invlist,
+       UNI_DIACRITICALSEXT_invlist,
+       UNI_DIACRITICALSFORSYMBOLS_invlist,
+       UNI_DIACRITICALSSUP_invlist,
+       UNI_DINGBATS_invlist,
+       UNI_DOGR_invlist,
+       UNI_DOMINO_invlist,
+       UNI_DSRT_invlist,
+       UNI_DT__CAN_invlist,
+       UNI_DT__COM_invlist,
+       UNI_DT__ENC_invlist,
+       UNI_DT__FIN_invlist,
+       UNI_DT__FONT_invlist,
+       UNI_DT__FRA_invlist,
+       UNI_DT__INIT_invlist,
+       UNI_DT__ISO_invlist,
+       UNI_DT__MED_invlist,
+       UNI_DT__NAR_invlist,
+       UNI_DT__NB_invlist,
+       UNI_DT__NONCANON_invlist,
+       UNI_DT__NONE_invlist,
+       UNI_DT__SML_invlist,
+       UNI_DT__SQR_invlist,
+       UNI_DT__SUB_invlist,
+       UNI_DT__SUP_invlist,
+       UNI_DT__VERT_invlist,
+       UNI_DUPL_invlist,
+       UNI_EARLYDYNASTICCUNEIFORM_invlist,
+       UNI_EA__A_invlist,
+       UNI_EA__F_invlist,
+       UNI_EA__H_invlist,
+       UNI_EA__N_invlist,
+       UNI_EA__NA_invlist,
+       UNI_EA__W_invlist,
+       UNI_EGYP_invlist,
+       UNI_ELBA_invlist,
+       UNI_EMOTICONS_invlist,
+       UNI_ENCLOSEDALPHANUM_invlist,
+       UNI_ENCLOSEDALPHANUMSUP_invlist,
+       UNI_ENCLOSEDCJK_invlist,
+       UNI_ENCLOSEDIDEOGRAPHICSUP_invlist,
+       UNI_ETHI_invlist,
+       UNI_ETHIOPICEXT_invlist,
+       UNI_ETHIOPICEXTA_invlist,
+       UNI_ETHIOPICSUP_invlist,
+       UNI_EXT_invlist,
+       UNI_GCB__CN_invlist,
+       UNI_GCB__EX_invlist,
+       UNI_GCB__L_invlist,
+       UNI_GCB__PP_invlist,
+       UNI_GCB__SM_invlist,
+       UNI_GCB__T_invlist,
+       UNI_GCB__V_invlist,
+       UNI_GCB__XX_invlist,
+       UNI_GEOMETRICSHAPES_invlist,
+       UNI_GEOMETRICSHAPESEXT_invlist,
+       UNI_GEOR_invlist,
+       UNI_GEORGIANEXT_invlist,
+       UNI_GEORGIANSUP_invlist,
+       UNI_GLAG_invlist,
+       UNI_GLAGOLITICSUP_invlist,
+       UNI_GONG_invlist,
+       UNI_GONM_invlist,
+       UNI_GOTH_invlist,
+       UNI_GRAN_invlist,
+       UNI_GRBASE_invlist,
+       UNI_GREEKEXT_invlist,
+       UNI_GREK_invlist,
+       UNI_GREXT_invlist,
+       UNI_GUJR_invlist,
+       UNI_GURU_invlist,
+       UNI_HALFANDFULLFORMS_invlist,
+       UNI_HALFMARKS_invlist,
+       UNI_HAN_invlist,
+       UNI_HANG_invlist,
+       UNI_HANO_invlist,
+       UNI_HATR_invlist,
+       UNI_HEBR_invlist,
+       UNI_HIGHPUSURROGATES_invlist,
+       UNI_HIGHSURROGATES_invlist,
+       UNI_HIRA_invlist,
+       UNI_HLUW_invlist,
+       UNI_HMNG_invlist,
+       UNI_HST__NA_invlist,
+       UNI_HUNG_invlist,
+       UNI_HYPHEN_invlist,
+       UNI_IDC_invlist,
+       UNI_IDEO_invlist,
+       UNI_IDEOGRAPHICSYMBOLS_invlist,
+       UNI_IDS_invlist,
+       UNI_IDSB_invlist,
+       UNI_IDST_invlist,
+       UNI_INADLAM_invlist,
+       UNI_INAHOM_invlist,
+       UNI_INANATOLIANHIEROGLYPHS_invlist,
+       UNI_INARABIC_invlist,
+       UNI_INARMENIAN_invlist,
+       UNI_INAVESTAN_invlist,
+       UNI_INBALINESE_invlist,
+       UNI_INBAMUM_invlist,
+       UNI_INBASSAVAH_invlist,
+       UNI_INBATAK_invlist,
+       UNI_INBENGALI_invlist,
+       UNI_INBHAIKSUKI_invlist,
+       UNI_INBOPOMOFO_invlist,
+       UNI_INBRAHMI_invlist,
+       UNI_INBUGINESE_invlist,
+       UNI_INBUHID_invlist,
+       UNI_INCARIAN_invlist,
+       UNI_INCAUCASIANALBANIAN_invlist,
+       UNI_INCHAKMA_invlist,
+       UNI_INCHAM_invlist,
+       UNI_INCHEROKEE_invlist,
+       UNI_INCOPTIC_invlist,
+       UNI_INCUNEIFORM_invlist,
+       UNI_INCYRILLIC_invlist,
+       UNI_INDEVANAGARI_invlist,
+       UNI_INDICNUMBERFORMS_invlist,
+       UNI_INDICSIYAQNUMBERS_invlist,
+       UNI_INDOGRA_invlist,
+       UNI_INDUPLOYAN_invlist,
+       UNI_INEGYPTIANHIEROGLYPHS_invlist,
+       UNI_INELBASAN_invlist,
+       UNI_INETHIOPIC_invlist,
+       UNI_INGEORGIAN_invlist,
+       UNI_INGLAGOLITIC_invlist,
+       UNI_INGOTHIC_invlist,
+       UNI_INGRANTHA_invlist,
+       UNI_INGREEK_invlist,
+       UNI_INGUJARATI_invlist,
+       UNI_INGUNJALAGONDI_invlist,
+       UNI_INGURMUKHI_invlist,
+       UNI_INHANGUL_invlist,
+       UNI_INHANIFIROHINGYA_invlist,
+       UNI_INHANUNOO_invlist,
+       UNI_INHATRAN_invlist,
+       UNI_INHEBREW_invlist,
+       UNI_INHIRAGANA_invlist,
+       UNI_INIDC_invlist,
+       UNI_INIMPERIALARAMAIC_invlist,
+       UNI_ININSCRIPTIONALPAHLAVI_invlist,
+       UNI_ININSCRIPTIONALPARTHIAN_invlist,
+       UNI_INJAVANESE_invlist,
+       UNI_INKAITHI_invlist,
+       UNI_INKANNADA_invlist,
+       UNI_INKATAKANA_invlist,
+       UNI_INKHAROSHTHI_invlist,
+       UNI_INKHMER_invlist,
+       UNI_INKHOJKI_invlist,
+       UNI_INKHUDAWADI_invlist,
+       UNI_INLAO_invlist,
+       UNI_INLEPCHA_invlist,
+       UNI_INLIMBU_invlist,
+       UNI_INLINEARA_invlist,
+       UNI_INLYCIAN_invlist,
+       UNI_INLYDIAN_invlist,
+       UNI_INMAHAJANI_invlist,
+       UNI_INMAKASAR_invlist,
+       UNI_INMALAYALAM_invlist,
+       UNI_INMANDAIC_invlist,
+       UNI_INMANICHAEAN_invlist,
+       UNI_INMARCHEN_invlist,
+       UNI_INMASARAMGONDI_invlist,
+       UNI_INMEDEFAIDRIN_invlist,
+       UNI_INMEETEIMAYEK_invlist,
+       UNI_INMENDEKIKAKUI_invlist,
+       UNI_INMEROITICCURSIVE_invlist,
+       UNI_INMIAO_invlist,
+       UNI_INMODI_invlist,
+       UNI_INMONGOLIAN_invlist,
+       UNI_INMRO_invlist,
+       UNI_INMULTANI_invlist,
+       UNI_INMYANMAR_invlist,
+       UNI_INNABATAEAN_invlist,
+       UNI_INNEWA_invlist,
+       UNI_INNEWTAILUE_invlist,
+       UNI_INNKO_invlist,
+       UNI_INNUSHU_invlist,
+       UNI_INOGHAM_invlist,
+       UNI_INOLDHUNGARIAN_invlist,
+       UNI_INOLDITALIC_invlist,
+       UNI_INOLDPERMIC_invlist,
+       UNI_INOLDPERSIAN_invlist,
+       UNI_INOLDSOGDIAN_invlist,
+       UNI_INOLDTURKIC_invlist,
+       UNI_INORIYA_invlist,
+       UNI_INOSAGE_invlist,
+       UNI_INOSMANYA_invlist,
+       UNI_INPAHAWHHMONG_invlist,
+       UNI_INPAUCINHAU_invlist,
+       UNI_INPC__BOTTOM_invlist,
+       UNI_INPC__BOTTOMANDLEFT_invlist,
+       UNI_INPC__BOTTOMANDRIGHT_invlist,
+       UNI_INPC__LEFT_invlist,
+       UNI_INPC__LEFTANDRIGHT_invlist,
+       UNI_INPC__NA_invlist,
+       UNI_INPC__OVERSTRUCK_invlist,
+       UNI_INPC__RIGHT_invlist,
+       UNI_INPC__TOP_invlist,
+       UNI_INPC__TOPANDBOTTOM_invlist,
+       UNI_INPC__TOPANDBOTTOMANDRIGHT_invlist,
+       UNI_INPC__TOPANDLEFT_invlist,
+       UNI_INPC__TOPANDLEFTANDRIGHT_invlist,
+       UNI_INPC__TOPANDRIGHT_invlist,
+       UNI_INPHAGSPA_invlist,
+       UNI_INPHOENICIAN_invlist,
+       UNI_INPSALTERPAHLAVI_invlist,
+       UNI_INPUNCTUATION_invlist,
+       UNI_INREJANG_invlist,
+       UNI_INRUNIC_invlist,
+       UNI_INSAMARITAN_invlist,
+       UNI_INSAURASHTRA_invlist,
+       UNI_INSC__AVAGRAHA_invlist,
+       UNI_INSC__BINDU_invlist,
+       UNI_INSC__BRAHMIJOININGNUMBER_invlist,
+       UNI_INSC__CANTILLATIONMARK_invlist,
+       UNI_INSC__CONSONANT_invlist,
+       UNI_INSC__CONSONANTDEAD_invlist,
+       UNI_INSC__CONSONANTFINAL_invlist,
+       UNI_INSC__CONSONANTHEADLETTER_invlist,
+       UNI_INSC__CONSONANTINITIALPOSTFIXED_invlist,
+       UNI_INSC__CONSONANTKILLER_invlist,
+       UNI_INSC__CONSONANTMEDIAL_invlist,
+       UNI_INSC__CONSONANTPLACEHOLDER_invlist,
+       UNI_INSC__CONSONANTPRECEDINGREPHA_invlist,
+       UNI_INSC__CONSONANTPREFIXED_invlist,
+       UNI_INSC__CONSONANTSUBJOINED_invlist,
+       UNI_INSC__CONSONANTSUCCEEDINGREPHA_invlist,
+       UNI_INSC__CONSONANTWITHSTACKER_invlist,
+       UNI_INSC__GEMINATIONMARK_invlist,
+       UNI_INSC__INVISIBLESTACKER_invlist,
+       UNI_INSC__MODIFYINGLETTER_invlist,
+       UNI_INSC__NONJOINER_invlist,
+       UNI_INSC__NUKTA_invlist,
+       UNI_INSC__NUMBER_invlist,
+       UNI_INSC__NUMBERJOINER_invlist,
+       UNI_INSC__OTHER_invlist,
+       UNI_INSC__PUREKILLER_invlist,
+       UNI_INSC__REGISTERSHIFTER_invlist,
+       UNI_INSC__SYLLABLEMODIFIER_invlist,
+       UNI_INSC__TONELETTER_invlist,
+       UNI_INSC__TONEMARK_invlist,
+       UNI_INSC__VIRAMA_invlist,
+       UNI_INSC__VISARGA_invlist,
+       UNI_INSC__VOWEL_invlist,
+       UNI_INSC__VOWELDEPENDENT_invlist,
+       UNI_INSC__VOWELINDEPENDENT_invlist,
+       UNI_INSHARADA_invlist,
+       UNI_INSIDDHAM_invlist,
+       UNI_INSINHALA_invlist,
+       UNI_INSOGDIAN_invlist,
+       UNI_INSORASOMPENG_invlist,
+       UNI_INSOYOMBO_invlist,
+       UNI_INSUNDANESE_invlist,
+       UNI_INSYLOTINAGRI_invlist,
+       UNI_INSYRIAC_invlist,
+       UNI_INTAGALOG_invlist,
+       UNI_INTAGBANWA_invlist,
+       UNI_INTAILE_invlist,
+       UNI_INTAITHAM_invlist,
+       UNI_INTAIVIET_invlist,
+       UNI_INTAKRI_invlist,
+       UNI_INTAMIL_invlist,
+       UNI_INTANGUT_invlist,
+       UNI_INTELUGU_invlist,
+       UNI_INTHAANA_invlist,
+       UNI_INTHAI_invlist,
+       UNI_INTIBETAN_invlist,
+       UNI_INTIFINAGH_invlist,
+       UNI_INTIRHUTA_invlist,
+       UNI_INUGARITIC_invlist,
+       UNI_INVAI_invlist,
+       UNI_INVS_invlist,
+       UNI_INWARANGCITI_invlist,
+       UNI_INZANABAZARSQUARE_invlist,
+       UNI_IN__10_invlist,
+       UNI_IN__11_invlist,
+       UNI_IN__1_DOT_1_invlist,
+       UNI_IN__2_invlist,
+       UNI_IN__2_DOT_1_invlist,
+       UNI_IN__3_invlist,
+       UNI_IN__3_DOT_1_invlist,
+       UNI_IN__3_DOT_2_invlist,
+       UNI_IN__4_invlist,
+       UNI_IN__4_DOT_1_invlist,
+       UNI_IN__5_invlist,
+       UNI_IN__5_DOT_1_invlist,
+       UNI_IN__5_DOT_2_invlist,
+       UNI_IN__6_invlist,
+       UNI_IN__6_DOT_1_invlist,
+       UNI_IN__6_DOT_2_invlist,
+       UNI_IN__6_DOT_3_invlist,
+       UNI_IN__7_invlist,
+       UNI_IN__8_invlist,
+       UNI_IN__9_invlist,
+       UNI_IPAEXT_invlist,
+       UNI_ITAL_invlist,
+       UNI_JAMO_invlist,
+       UNI_JAMOEXTA_invlist,
+       UNI_JAMOEXTB_invlist,
+       UNI_JAVA_invlist,
+       UNI_JG__AFRICANFEH_invlist,
+       UNI_JG__AFRICANNOON_invlist,
+       UNI_JG__AFRICANQAF_invlist,
+       UNI_JG__AIN_invlist,
+       UNI_JG__ALAPH_invlist,
+       UNI_JG__ALEF_invlist,
+       UNI_JG__BEH_invlist,
+       UNI_JG__BETH_invlist,
+       UNI_JG__BURUSHASKIYEHBARREE_invlist,
+       UNI_JG__DAL_invlist,
+       UNI_JG__DALATHRISH_invlist,
+       UNI_JG__E_invlist,
+       UNI_JG__FARSIYEH_invlist,
+       UNI_JG__FE_invlist,
+       UNI_JG__FEH_invlist,
+       UNI_JG__FINALSEMKATH_invlist,
+       UNI_JG__GAF_invlist,
+       UNI_JG__GAMAL_invlist,
+       UNI_JG__HAH_invlist,
+       UNI_JG__HAMZAONHEHGOAL_invlist,
+       UNI_JG__HANIFIROHINGYAKINNAYA_invlist,
+       UNI_JG__HANIFIROHINGYAPA_invlist,
+       UNI_JG__HE_invlist,
+       UNI_JG__HEH_invlist,
+       UNI_JG__HEHGOAL_invlist,
+       UNI_JG__HETH_invlist,
+       UNI_JG__KAF_invlist,
+       UNI_JG__KAPH_invlist,
+       UNI_JG__KHAPH_invlist,
+       UNI_JG__KNOTTEDHEH_invlist,
+       UNI_JG__LAM_invlist,
+       UNI_JG__LAMADH_invlist,
+       UNI_JG__MALAYALAMBHA_invlist,
+       UNI_JG__MALAYALAMJA_invlist,
+       UNI_JG__MALAYALAMLLA_invlist,
+       UNI_JG__MALAYALAMLLLA_invlist,
+       UNI_JG__MALAYALAMNGA_invlist,
+       UNI_JG__MALAYALAMNNA_invlist,
+       UNI_JG__MALAYALAMNNNA_invlist,
+       UNI_JG__MALAYALAMNYA_invlist,
+       UNI_JG__MALAYALAMRA_invlist,
+       UNI_JG__MALAYALAMSSA_invlist,
+       UNI_JG__MALAYALAMTTA_invlist,
+       UNI_JG__MANICHAEANALEPH_invlist,
+       UNI_JG__MANICHAEANAYIN_invlist,
+       UNI_JG__MANICHAEANBETH_invlist,
+       UNI_JG__MANICHAEANDALETH_invlist,
+       UNI_JG__MANICHAEANDHAMEDH_invlist,
+       UNI_JG__MANICHAEANFIVE_invlist,
+       UNI_JG__MANICHAEANGIMEL_invlist,
+       UNI_JG__MANICHAEANHETH_invlist,
+       UNI_JG__MANICHAEANHUNDRED_invlist,
+       UNI_JG__MANICHAEANKAPH_invlist,
+       UNI_JG__MANICHAEANLAMEDH_invlist,
+       UNI_JG__MANICHAEANMEM_invlist,
+       UNI_JG__MANICHAEANNUN_invlist,
+       UNI_JG__MANICHAEANONE_invlist,
+       UNI_JG__MANICHAEANPE_invlist,
+       UNI_JG__MANICHAEANQOPH_invlist,
+       UNI_JG__MANICHAEANRESH_invlist,
+       UNI_JG__MANICHAEANSADHE_invlist,
+       UNI_JG__MANICHAEANSAMEKH_invlist,
+       UNI_JG__MANICHAEANTAW_invlist,
+       UNI_JG__MANICHAEANTEN_invlist,
+       UNI_JG__MANICHAEANTETH_invlist,
+       UNI_JG__MANICHAEANTHAMEDH_invlist,
+       UNI_JG__MANICHAEANTWENTY_invlist,
+       UNI_JG__MANICHAEANWAW_invlist,
+       UNI_JG__MANICHAEANYODH_invlist,
+       UNI_JG__MANICHAEANZAYIN_invlist,
+       UNI_JG__MEEM_invlist,
+       UNI_JG__MIM_invlist,
+       UNI_JG__NOJOININGGROUP_invlist,
+       UNI_JG__NOON_invlist,
+       UNI_JG__NUN_invlist,
+       UNI_JG__NYA_invlist,
+       UNI_JG__PE_invlist,
+       UNI_JG__QAF_invlist,
+       UNI_JG__QAPH_invlist,
+       UNI_JG__REH_invlist,
+       UNI_JG__REVERSEDPE_invlist,
+       UNI_JG__ROHINGYAYEH_invlist,
+       UNI_JG__SAD_invlist,
+       UNI_JG__SADHE_invlist,
+       UNI_JG__SEEN_invlist,
+       UNI_JG__SEMKATH_invlist,
+       UNI_JG__SHIN_invlist,
+       UNI_JG__STRAIGHTWAW_invlist,
+       UNI_JG__SWASHKAF_invlist,
+       UNI_JG__SYRIACWAW_invlist,
+       UNI_JG__TAH_invlist,
+       UNI_JG__TAW_invlist,
+       UNI_JG__TEHMARBUTA_invlist,
+       UNI_JG__TETH_invlist,
+       UNI_JG__WAW_invlist,
+       UNI_JG__YEH_invlist,
+       UNI_JG__YEHBARREE_invlist,
+       UNI_JG__YEHWITHTAIL_invlist,
+       UNI_JG__YUDH_invlist,
+       UNI_JG__YUDHHE_invlist,
+       UNI_JG__ZAIN_invlist,
+       UNI_JG__ZHAIN_invlist,
+       UNI_JOINC_invlist,
+       UNI_JT__C_invlist,
+       UNI_JT__D_invlist,
+       UNI_JT__L_invlist,
+       UNI_JT__R_invlist,
+       UNI_JT__T_invlist,
+       UNI_JT__U_invlist,
+       UNI_KALI_invlist,
+       UNI_KANA_invlist,
+       UNI_KANAEXTA_invlist,
+       UNI_KANASUP_invlist,
+       UNI_KANBUN_invlist,
+       UNI_KANGXI_invlist,
+       UNI_KATAKANAEXT_invlist,
+       UNI_KHAR_invlist,
+       UNI_KHMERSYMBOLS_invlist,
+       UNI_KHMR_invlist,
+       UNI_KHOJ_invlist,
+       UNI_KNDA_invlist,
+       UNI_KTHI_invlist,
+       UNI_L_invlist,
+       UNI_LANA_invlist,
+       UNI_LAO_invlist,
+       UNI_LATIN1_invlist,
+       UNI_LATINEXTA_invlist,
+       UNI_LATINEXTADDITIONAL_invlist,
+       UNI_LATINEXTB_invlist,
+       UNI_LATINEXTC_invlist,
+       UNI_LATINEXTD_invlist,
+       UNI_LATINEXTE_invlist,
+       UNI_LATN_invlist,
+       UNI_LB__AI_invlist,
+       UNI_LB__AL_invlist,
+       UNI_LB__B2_invlist,
+       UNI_LB__BA_invlist,
+       UNI_LB__BB_invlist,
+       UNI_LB__BK_invlist,
+       UNI_LB__CB_invlist,
+       UNI_LB__CJ_invlist,
+       UNI_LB__CL_invlist,
+       UNI_LB__CM_invlist,
+       UNI_LB__CP_invlist,
+       UNI_LB__CR_invlist,
+       UNI_LB__EB_invlist,
+       UNI_LB__EM_invlist,
+       UNI_LB__EX_invlist,
+       UNI_LB__GL_invlist,
+       UNI_LB__H2_invlist,
+       UNI_LB__H3_invlist,
+       UNI_LB__HL_invlist,
+       UNI_LB__HY_invlist,
+       UNI_LB__ID_invlist,
+       UNI_LB__IN_invlist,
+       UNI_LB__IS_invlist,
+       UNI_LB__LF_invlist,
+       UNI_LB__NL_invlist,
+       UNI_LB__NS_invlist,
+       UNI_LB__NU_invlist,
+       UNI_LB__OP_invlist,
+       UNI_LB__PO_invlist,
+       UNI_LB__PR_invlist,
+       UNI_LB__QU_invlist,
+       UNI_LB__SA_invlist,
+       UNI_LB__SG_invlist,
+       UNI_LB__SP_invlist,
+       UNI_LB__SY_invlist,
+       UNI_LB__WJ_invlist,
+       UNI_LB__XX_invlist,
+       UNI_LB__ZW_invlist,
+       UNI_LB__ZWJ_invlist,
+       UNI_LEPC_invlist,
+       UNI_LETTERLIKESYMBOLS_invlist,
+       UNI_LIMB_invlist,
+       UNI_LINA_invlist,
+       UNI_LINB_invlist,
+       UNI_LINEARBIDEOGRAMS_invlist,
+       UNI_LINEARBSYLLABARY_invlist,
+       UNI_LISU_invlist,
+       UNI_LM_invlist,
+       UNI_LO_invlist,
+       UNI_LOE_invlist,
+       UNI_LOWERCASELETTER_invlist,
+       UNI_LOWSURROGATES_invlist,
+       UNI_LYCI_invlist,
+       UNI_LYDI_invlist,
+       UNI_M_invlist,
+       UNI_MAHJ_invlist,
+       UNI_MAHJONG_invlist,
+       UNI_MAKA_invlist,
+       UNI_MAND_invlist,
+       UNI_MANI_invlist,
+       UNI_MARC_invlist,
+       UNI_MATH_invlist,
+       UNI_MATHALPHANUM_invlist,
+       UNI_MATHOPERATORS_invlist,
+       UNI_MAYANNUMERALS_invlist,
+       UNI_MC_invlist,
+       UNI_ME_invlist,
+       UNI_MEDF_invlist,
+       UNI_MEETEIMAYEKEXT_invlist,
+       UNI_MEND_invlist,
+       UNI_MERC_invlist,
+       UNI_MERO_invlist,
+       UNI_MIAO_invlist,
+       UNI_MISCARROWS_invlist,
+       UNI_MISCMATHSYMBOLSA_invlist,
+       UNI_MISCMATHSYMBOLSB_invlist,
+       UNI_MISCPICTOGRAPHS_invlist,
+       UNI_MISCSYMBOLS_invlist,
+       UNI_MISCTECHNICAL_invlist,
+       UNI_MLYM_invlist,
+       UNI_MN_invlist,
+       UNI_MODI_invlist,
+       UNI_MODIFIERLETTERS_invlist,
+       UNI_MODIFIERTONELETTERS_invlist,
+       UNI_MONG_invlist,
+       UNI_MONGOLIANSUP_invlist,
+       UNI_MRO_invlist,
+       UNI_MTEI_invlist,
+       UNI_MULT_invlist,
+       UNI_MUSIC_invlist,
+       UNI_MYANMAREXTA_invlist,
+       UNI_MYANMAREXTB_invlist,
+       UNI_MYMR_invlist,
+       UNI_N_invlist,
+       UNI_NARB_invlist,
+       UNI_NB_invlist,
+       UNI_NBAT_invlist,
+       UNI_NEWA_invlist,
+       UNI_NFCQC__M_invlist,
+       UNI_NFCQC__Y_invlist,
+       UNI_NFDQC__Y_invlist,
+       UNI_NFKCQC__N_invlist,
+       UNI_NFKCQC__Y_invlist,
+       UNI_NFKDQC__N_invlist,
+       UNI_NKO_invlist,
+       UNI_NL_invlist,
+       UNI_NO_invlist,
+       UNI_NSHU_invlist,
+       UNI_NT__DI_invlist,
+       UNI_NT__NU_invlist,
+       UNI_NUMBERFORMS_invlist,
+       UNI_NV__0_invlist,
+       UNI_NV__1_invlist,
+       UNI_NV__10_invlist,
+       UNI_NV__100_invlist,
+       UNI_NV__1000_invlist,
+       UNI_NV__10000_invlist,
+       UNI_NV__100000_invlist,
+       UNI_NV__1000000_invlist,
+       UNI_NV__10000000_invlist,
+       UNI_NV__100000000_invlist,
+       UNI_NV__10000000000_invlist,
+       UNI_NV__1000000000000_invlist,
+       UNI_NV__11_invlist,
+       UNI_NV__11_SLASH_12_invlist,
+       UNI_NV__11_SLASH_2_invlist,
+       UNI_NV__12_invlist,
+       UNI_NV__13_invlist,
+       UNI_NV__13_SLASH_2_invlist,
+       UNI_NV__14_invlist,
+       UNI_NV__15_invlist,
+       UNI_NV__15_SLASH_2_invlist,
+       UNI_NV__16_invlist,
+       UNI_NV__17_invlist,
+       UNI_NV__17_SLASH_2_invlist,
+       UNI_NV__18_invlist,
+       UNI_NV__19_invlist,
+       UNI_NV__1_SLASH_10_invlist,
+       UNI_NV__1_SLASH_12_invlist,
+       UNI_NV__1_SLASH_16_invlist,
+       UNI_NV__1_SLASH_160_invlist,
+       UNI_NV__1_SLASH_2_invlist,
+       UNI_NV__1_SLASH_20_invlist,
+       UNI_NV__1_SLASH_3_invlist,
+       UNI_NV__1_SLASH_4_invlist,
+       UNI_NV__1_SLASH_40_invlist,
+       UNI_NV__1_SLASH_5_invlist,
+       UNI_NV__1_SLASH_6_invlist,
+       UNI_NV__1_SLASH_7_invlist,
+       UNI_NV__1_SLASH_8_invlist,
+       UNI_NV__1_SLASH_9_invlist,
+       UNI_NV__2_invlist,
+       UNI_NV__20_invlist,
+       UNI_NV__200_invlist,
+       UNI_NV__2000_invlist,
+       UNI_NV__20000_invlist,
+       UNI_NV__200000_invlist,
+       UNI_NV__20000000_invlist,
+       UNI_NV__21_invlist,
+       UNI_NV__216000_invlist,
+       UNI_NV__22_invlist,
+       UNI_NV__23_invlist,
+       UNI_NV__24_invlist,
+       UNI_NV__25_invlist,
+       UNI_NV__26_invlist,
+       UNI_NV__27_invlist,
+       UNI_NV__28_invlist,
+       UNI_NV__29_invlist,
+       UNI_NV__2_SLASH_3_invlist,
+       UNI_NV__2_SLASH_5_invlist,
+       UNI_NV__3_invlist,
+       UNI_NV__30_invlist,
+       UNI_NV__300_invlist,
+       UNI_NV__3000_invlist,
+       UNI_NV__30000_invlist,
+       UNI_NV__300000_invlist,
+       UNI_NV__31_invlist,
+       UNI_NV__32_invlist,
+       UNI_NV__33_invlist,
+       UNI_NV__34_invlist,
+       UNI_NV__35_invlist,
+       UNI_NV__36_invlist,
+       UNI_NV__37_invlist,
+       UNI_NV__38_invlist,
+       UNI_NV__39_invlist,
+       UNI_NV__3_SLASH_16_invlist,
+       UNI_NV__3_SLASH_2_invlist,
+       UNI_NV__3_SLASH_20_invlist,
+       UNI_NV__3_SLASH_4_invlist,
+       UNI_NV__3_SLASH_5_invlist,
+       UNI_NV__3_SLASH_8_invlist,
+       UNI_NV__3_SLASH_80_invlist,
+       UNI_NV__4_invlist,
+       UNI_NV__40_invlist,
+       UNI_NV__400_invlist,
+       UNI_NV__4000_invlist,
+       UNI_NV__40000_invlist,
+       UNI_NV__400000_invlist,
+       UNI_NV__41_invlist,
+       UNI_NV__42_invlist,
+       UNI_NV__43_invlist,
+       UNI_NV__432000_invlist,
+       UNI_NV__44_invlist,
+       UNI_NV__45_invlist,
+       UNI_NV__46_invlist,
+       UNI_NV__47_invlist,
+       UNI_NV__48_invlist,
+       UNI_NV__49_invlist,
+       UNI_NV__4_SLASH_5_invlist,
+       UNI_NV__5_invlist,
+       UNI_NV__50_invlist,
+       UNI_NV__500_invlist,
+       UNI_NV__5000_invlist,
+       UNI_NV__50000_invlist,
+       UNI_NV__500000_invlist,
+       UNI_NV__5_SLASH_12_invlist,
+       UNI_NV__5_SLASH_2_invlist,
+       UNI_NV__5_SLASH_6_invlist,
+       UNI_NV__5_SLASH_8_invlist,
+       UNI_NV__6_invlist,
+       UNI_NV__60_invlist,
+       UNI_NV__600_invlist,
+       UNI_NV__6000_invlist,
+       UNI_NV__60000_invlist,
+       UNI_NV__600000_invlist,
+       UNI_NV__7_invlist,
+       UNI_NV__70_invlist,
+       UNI_NV__700_invlist,
+       UNI_NV__7000_invlist,
+       UNI_NV__70000_invlist,
+       UNI_NV__700000_invlist,
+       UNI_NV__7_SLASH_12_invlist,
+       UNI_NV__7_SLASH_2_invlist,
+       UNI_NV__7_SLASH_8_invlist,
+       UNI_NV__8_invlist,
+       UNI_NV__80_invlist,
+       UNI_NV__800_invlist,
+       UNI_NV__8000_invlist,
+       UNI_NV__80000_invlist,
+       UNI_NV__800000_invlist,
+       UNI_NV__9_invlist,
+       UNI_NV__90_invlist,
+       UNI_NV__900_invlist,
+       UNI_NV__9000_invlist,
+       UNI_NV__90000_invlist,
+       UNI_NV__900000_invlist,
+       UNI_NV__9_SLASH_2_invlist,
+       UNI_NV__NAN_invlist,
+       UNI_NV___MINUS_1_SLASH_2_invlist,
+       UNI_OCR_invlist,
+       UNI_OGAM_invlist,
+       UNI_OLCK_invlist,
+       UNI_ORKH_invlist,
+       UNI_ORNAMENTALDINGBATS_invlist,
+       UNI_ORYA_invlist,
+       UNI_OSGE_invlist,
+       UNI_OSMA_invlist,
+       UNI_P_invlist,
+       UNI_PALM_invlist,
+       UNI_PATSYN_invlist,
+       UNI_PAUC_invlist,
+       UNI_PC_invlist,
+       UNI_PCM_invlist,
+       UNI_PD_invlist,
+       UNI_PE_invlist,
+       UNI_PERM_invlist,
+       UNI_PF_invlist,
+       UNI_PHAG_invlist,
+       UNI_PHAISTOS_invlist,
+       UNI_PHLI_invlist,
+       UNI_PHLP_invlist,
+       UNI_PHNX_invlist,
+       UNI_PHONETICEXT_invlist,
+       UNI_PHONETICEXTSUP_invlist,
+       UNI_PI_invlist,
+       UNI_PLAYINGCARDS_invlist,
+       UNI_PO_invlist,
+       UNI_POSIXALNUM_invlist,
+       UNI_POSIXALPHA_invlist,
+       UNI_POSIXBLANK_invlist,
+       UNI_POSIXCNTRL_invlist,
+       UNI_POSIXDIGIT_invlist,
+       UNI_POSIXGRAPH_invlist,
+       UNI_POSIXLOWER_invlist,
+       UNI_POSIXPRINT_invlist,
+       UNI_POSIXPUNCT_invlist,
+       UNI_POSIXSPACE_invlist,
+       UNI_POSIXUPPER_invlist,
+       UNI_POSIXWORD_invlist,
+       UNI_POSIXXDIGIT_invlist,
+       UNI_PRTI_invlist,
+       UNI_PS_invlist,
+       UNI_PUA_invlist,
+       UNI_QAAI_invlist,
+       UNI_QMARK_invlist,
+       UNI_RADICAL_invlist,
+       UNI_RI_invlist,
+       UNI_RJNG_invlist,
+       UNI_ROHG_invlist,
+       UNI_RUMI_invlist,
+       UNI_RUNR_invlist,
+       UNI_S_invlist,
+       UNI_SAMR_invlist,
+       UNI_SARB_invlist,
+       UNI_SAUR_invlist,
+       UNI_SB__AT_invlist,
+       UNI_SB__CL_invlist,
+       UNI_SB__EX_invlist,
+       UNI_SB__FO_invlist,
+       UNI_SB__LE_invlist,
+       UNI_SB__LO_invlist,
+       UNI_SB__SC_invlist,
+       UNI_SB__SE_invlist,
+       UNI_SB__SP_invlist,
+       UNI_SB__ST_invlist,
+       UNI_SB__UP_invlist,
+       UNI_SB__XX_invlist,
+       UNI_SC_invlist,
+       UNI_SC__ADLM_invlist,
+       UNI_SC__ARAB_invlist,
+       UNI_SC__ARMN_invlist,
+       UNI_SC__BENG_invlist,
+       UNI_SC__BOPO_invlist,
+       UNI_SC__BUGI_invlist,
+       UNI_SC__BUHD_invlist,
+       UNI_SC__CAKM_invlist,
+       UNI_SC__COPT_invlist,
+       UNI_SC__CPRT_invlist,
+       UNI_SC__CYRL_invlist,
+       UNI_SC__DEVA_invlist,
+       UNI_SC__DOGR_invlist,
+       UNI_SC__DUPL_invlist,
+       UNI_SC__GEOR_invlist,
+       UNI_SC__GLAG_invlist,
+       UNI_SC__GONG_invlist,
+       UNI_SC__GRAN_invlist,
+       UNI_SC__GREK_invlist,
+       UNI_SC__GUJR_invlist,
+       UNI_SC__GURU_invlist,
+       UNI_SC__HAN_invlist,
+       UNI_SC__HANG_invlist,
+       UNI_SC__HANO_invlist,
+       UNI_SC__HIRA_invlist,
+       UNI_SC__JAVA_invlist,
+       UNI_SC__KALI_invlist,
+       UNI_SC__KANA_invlist,
+       UNI_SC__KHOJ_invlist,
+       UNI_SC__KNDA_invlist,
+       UNI_SC__KTHI_invlist,
+       UNI_SC__LATN_invlist,
+       UNI_SC__LIMB_invlist,
+       UNI_SC__LINA_invlist,
+       UNI_SC__LINB_invlist,
+       UNI_SC__MAHJ_invlist,
+       UNI_SC__MAND_invlist,
+       UNI_SC__MANI_invlist,
+       UNI_SC__MLYM_invlist,
+       UNI_SC__MODI_invlist,
+       UNI_SC__MONG_invlist,
+       UNI_SC__MULT_invlist,
+       UNI_SC__MYMR_invlist,
+       UNI_SC__ORYA_invlist,
+       UNI_SC__PERM_invlist,
+       UNI_SC__PHAG_invlist,
+       UNI_SC__PHLP_invlist,
+       UNI_SC__QAAI_invlist,
+       UNI_SC__ROHG_invlist,
+       UNI_SC__SHRD_invlist,
+       UNI_SC__SIND_invlist,
+       UNI_SC__SINH_invlist,
+       UNI_SC__SOGD_invlist,
+       UNI_SC__SYLO_invlist,
+       UNI_SC__SYRC_invlist,
+       UNI_SC__TAGB_invlist,
+       UNI_SC__TAKR_invlist,
+       UNI_SC__TALE_invlist,
+       UNI_SC__TAML_invlist,
+       UNI_SC__TELU_invlist,
+       UNI_SC__TGLG_invlist,
+       UNI_SC__THAA_invlist,
+       UNI_SC__TIRH_invlist,
+       UNI_SC__YI_invlist,
+       UNI_SC__ZYYY_invlist,
+       UNI_SD_invlist,
+       UNI_SGNW_invlist,
+       UNI_SHAW_invlist,
+       UNI_SHORTHANDFORMATCONTROLS_invlist,
+       UNI_SHRD_invlist,
+       UNI_SIDD_invlist,
+       UNI_SIND_invlist,
+       UNI_SINH_invlist,
+       UNI_SINHALAARCHAICNUMBERS_invlist,
+       UNI_SK_invlist,
+       UNI_SM_invlist,
+       UNI_SMALLFORMS_invlist,
+       UNI_SO_invlist,
+       UNI_SOGD_invlist,
+       UNI_SOGO_invlist,
+       UNI_SORA_invlist,
+       UNI_SOYO_invlist,
+       UNI_SPECIALS_invlist,
+       UNI_STERM_invlist,
+       UNI_SUND_invlist,
+       UNI_SUNDANESESUP_invlist,
+       UNI_SUPARROWSA_invlist,
+       UNI_SUPARROWSB_invlist,
+       UNI_SUPARROWSC_invlist,
+       UNI_SUPERANDSUB_invlist,
+       UNI_SUPMATHOPERATORS_invlist,
+       UNI_SUPPUAA_invlist,
+       UNI_SUPPUAB_invlist,
+       UNI_SUPPUNCTUATION_invlist,
+       UNI_SUPSYMBOLSANDPICTOGRAPHS_invlist,
+       UNI_SUTTONSIGNWRITING_invlist,
+       UNI_SYLO_invlist,
+       UNI_SYRC_invlist,
+       UNI_SYRIACSUP_invlist,
+       UNI_TAGB_invlist,
+       UNI_TAGS_invlist,
+       UNI_TAIXUANJING_invlist,
+       UNI_TAKR_invlist,
+       UNI_TALE_invlist,
+       UNI_TALU_invlist,
+       UNI_TAML_invlist,
+       UNI_TANG_invlist,
+       UNI_TANGUTCOMPONENTS_invlist,
+       UNI_TAVT_invlist,
+       UNI_TELU_invlist,
+       UNI_TERM_invlist,
+       UNI_TFNG_invlist,
+       UNI_TGLG_invlist,
+       UNI_THAA_invlist,
+       UNI_THAI_invlist,
+       UNI_TIBT_invlist,
+       UNI_TIRH_invlist,
+       UNI_TITLE_invlist,
+       UNI_TRANSPORTANDMAP_invlist,
+       UNI_UCAS_invlist,
+       UNI_UCASEXT_invlist,
+       UNI_UGAR_invlist,
+       UNI_UIDEO_invlist,
+       UNI_UPPERCASELETTER_invlist,
+       UNI_VAI_invlist,
+       UNI_VEDICEXT_invlist,
+       UNI_VERTICALFORMS_invlist,
+       UNI_VERTSPACE_invlist,
+       UNI_VO__R_invlist,
+       UNI_VO__TR_invlist,
+       UNI_VO__TU_invlist,
+       UNI_VO__U_invlist,
+       UNI_VS_invlist,
+       UNI_VSSUP_invlist,
+       UNI_WARA_invlist,
+       UNI_WB__DQ_invlist,
+       UNI_WB__EB_invlist,
+       UNI_WB__EX_invlist,
+       UNI_WB__EXTEND_invlist,
+       UNI_WB__FO_invlist,
+       UNI_WB__KA_invlist,
+       UNI_WB__LE_invlist,
+       UNI_WB__MB_invlist,
+       UNI_WB__ML_invlist,
+       UNI_WB__MN_invlist,
+       UNI_WB__NL_invlist,
+       UNI_WB__NU_invlist,
+       UNI_WB__SQ_invlist,
+       UNI_WB__WSEGSPACE_invlist,
+       UNI_WB__XX_invlist,
+       UNI_XIDC_invlist,
+       UNI_XIDS_invlist,
+       UNI_XPEO_invlist,
+       UNI_XPOSIXALNUM_invlist,
+       UNI_XPOSIXALPHA_invlist,
+       UNI_XPOSIXBLANK_invlist,
+       UNI_XPOSIXCNTRL_invlist,
+       UNI_XPOSIXDIGIT_invlist,
+       UNI_XPOSIXGRAPH_invlist,
+       UNI_XPOSIXLOWER_invlist,
+       UNI_XPOSIXPRINT_invlist,
+       UNI_XPOSIXPUNCT_invlist,
+       UNI_XPOSIXSPACE_invlist,
+       UNI_XPOSIXUPPER_invlist,
+       UNI_XPOSIXWORD_invlist,
+       UNI_XPOSIXXDIGIT_invlist,
+       UNI_XSUX_invlist,
+       UNI_YI_invlist,
+       UNI_YIJING_invlist,
+       UNI_YIRADICALS_invlist,
+       UNI_YISYLLABLES_invlist,
+       UNI_Z_invlist,
+       UNI_ZANB_invlist,
+       UNI_ZL_invlist,
+       UNI_ZP_invlist,
+       UNI_ZS_invlist,
+       UNI_ZYYY_invlist,
+       UNI_ZZZZ_invlist,
+       UNI__PERL_ANY_FOLDS_invlist,
+       UNI__PERL_CHARNAME_BEGIN_invlist,
+       UNI__PERL_CHARNAME_CONTINUE_invlist,
+       UNI__PERL_FOLDS_TO_MULTI_CHAR_invlist,
+       UNI__PERL_IDCONT_invlist,
+       UNI__PERL_IDSTART_invlist,
+       UNI__PERL_NCHAR_invlist,
+       UNI__PERL_PATWS_invlist,
+       UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist,
+       UNI__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist,
+       UNI__PERL_QUOTEMETA_invlist,
+       UNI__PERL_SURROGATE_invlist
 };
 
-#endif /* defined(PERL_IN_UTF8_C) */
 
-#if defined(PERL_IN_REGEXEC_C)
+/* Synonyms for perl properties */
+#define UNI_AHEX   UNI_POSIXXDIGIT
+#define UNI_ALNUM   UNI_XPOSIXALNUM
+#define UNI_ALPHA   UNI_XPOSIXALPHA
+#define UNI_ALPHABETIC   UNI_XPOSIXALPHA
+#define UNI_ASCIIHEXDIGIT   UNI_POSIXXDIGIT
+#define UNI_BASICLATIN   UNI_ASCII
+#define UNI_BLANK   UNI_XPOSIXBLANK
+#define UNI_CC   UNI_XPOSIXCNTRL
+#define UNI_CNTRL   UNI_XPOSIXCNTRL
+#define UNI_CONTROL   UNI_XPOSIXCNTRL
+#define UNI_DECIMALNUMBER   UNI_XPOSIXDIGIT
+#define UNI_DIGIT   UNI_XPOSIXDIGIT
+#define UNI_GRAPH   UNI_XPOSIXGRAPH
+#define UNI_HEX   UNI_XPOSIXXDIGIT
+#define UNI_HEXDIGIT   UNI_XPOSIXXDIGIT
+#define UNI_HORIZSPACE   UNI_XPOSIXBLANK
+#define UNI_LC   UNI_CASEDLETTER
+#define UNI_LL   UNI_LOWERCASELETTER
+#define UNI_LOWER   UNI_XPOSIXLOWER
+#define UNI_LOWERCASE   UNI_XPOSIXLOWER
+#define UNI_LT   UNI_TITLE
+#define UNI_LU   UNI_UPPERCASELETTER
+#define UNI_L_   UNI_CASEDLETTER
+#define UNI_L_AMP_   UNI_CASEDLETTER
+#define UNI_ND   UNI_XPOSIXDIGIT
+#define UNI_PERLSPACE   UNI_POSIXSPACE
+#define UNI_PERLWORD   UNI_POSIXWORD
+#define UNI_PRINT   UNI_XPOSIXPRINT
+#define UNI_SPACE   UNI_XPOSIXSPACE
+#define UNI_SPACEPERL   UNI_XPOSIXSPACE
+#define UNI_TITLECASE   UNI_TITLE
+#define UNI_TITLECASELETTER   UNI_TITLE
+#define UNI_UPPER   UNI_XPOSIXUPPER
+#define UNI_UPPERCASE   UNI_XPOSIXUPPER
+#define UNI_WHITESPACE   UNI_XPOSIXSPACE
+#define UNI_WORD   UNI_XPOSIXWORD
+#define UNI_WSPACE   UNI_XPOSIXSPACE
+#define UNI_XDIGIT   UNI_XPOSIXXDIGIT
+#define UNI_XPERLSPACE   UNI_XPOSIXSPACE
+
+
+#endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */
 
-#define GCB_NOBREAK      0
-#define GCB_BREAKABLE    1
-#define GCB_RI_then_RI   2
-#define GCB_EX_then_EM   3
+#if defined(PERL_IN_REGEXEC_C)
 
-static const U8 GCB_table[19][19] = {
-   /* 'edg' stands for 'EDGE' */
-/*        XX CR CN EB EBG EM EX GAZ  L LF LV LVT PP RI SM  T  V ZWJ edg */
-/* XX */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* CR */ { 1, 1, 1, 1,  1, 1, 1,  1, 1, 0, 1,  1, 1, 1, 1, 1, 1,  1,  1 },
-/* CN */ { 1, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1 },
-/* EB */ { 1, 1, 1, 1,  1, 0, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* EBG*/ { 1, 1, 1, 1,  1, 0, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* EM */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* EX */ { 1, 1, 1, 1,  1, 3, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* GAZ*/ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* L  */ { 1, 1, 1, 1,  1, 1, 0,  1, 0, 1, 0,  0, 1, 1, 0, 1, 0,  0,  1 },
-/* LF */ { 1, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1 },
-/* LV */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 0, 0,  0,  1 },
-/* LVT*/ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 0, 1,  0,  1 },
-/* PP */ { 0, 1, 1, 0,  0, 0, 0,  0, 0, 1, 0,  0, 0, 0, 0, 0, 0,  0,  1 },
-/* RI */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 2, 0, 1, 1,  0,  1 },
-/* SM */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* T  */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 0, 1,  0,  1 },
-/* V  */ { 1, 1, 1, 1,  1, 1, 0,  1, 1, 1, 1,  1, 1, 1, 0, 0, 0,  0,  1 },
-/* ZWJ*/ { 1, 1, 1, 1,  0, 1, 0,  0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0,  1 },
-/* edg*/ { 1, 1, 1, 1,  1, 1, 1,  1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  0 }
+#define GCB_NOBREAK                0
+#define GCB_BREAKABLE              1
+#define GCB_RI_then_RI             2
+#define GCB_EX_then_EM             3
+#define GCB_Maybe_Emoji_NonBreak   4
+
+static const U8 GCB_table[17][17] = {
+   /* 'XPG' stands for 'XPG_XX'; 'edg' stands for 'EDGE'; u stands
+    * for 'unused in this Unicode release (and the data in the row
+    * or column are garbage) */
+/*        XX CR CN EX  L LF LV LVT PP RI SM  T  V XPG ZWJ edg  u */
+/* XX */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0,  1, 1 },
+/* CR */ { 1, 1, 1, 1, 1, 0, 1,  1, 1, 1, 1, 1, 1,  1,  1,  1, 1 },
+/* CN */ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1,  1, 1 },
+/* EX */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0,  1, 3 },
+/* L  */ { 1, 1, 1, 0, 0, 1, 0,  0, 1, 1, 0, 1, 0,  1,  0,  1, 1 },
+/* LF */ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1,  1, 1 },
+/* LV */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1,  0,  1, 1 },
+/* LVT*/ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1,  0,  1, 1 },
+/* PP */ { 0, 1, 1, 0, 0, 1, 0,  0, 0, 0, 0, 0, 0,  0,  0,  1, 0 },
+/* RI */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 2, 0, 1, 1,  1,  0,  1, 1 },
+/* SM */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0,  1, 1 },
+/* T  */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1,  0,  1, 1 },
+/* V  */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1,  0,  1, 1 },
+/* XPG*/ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0,  1, 1 },
+/* ZWJ*/ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  4,  0,  1, 0 },
+/* edg*/ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1,  0, 1 },
+/* u  */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0,  1, 0 }
 };
 
 #define LB_NOBREAK                        0
@@ -374229,7 +383320,7 @@ static const U8 LB_table[39][39] = {
 /* RI */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 1, 1, 2, 0, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0,15, 0, 0,  0, 0,  1 },
 /* SP */ { 7, 7, 7, 7, 8, 0, 8, 8, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 0, 8,  7, 0,  1 },
 /* WJ */ { 0, 0, 0, 0, 2, 0, 2, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0,  1 },
-/* ZWJ*/ { 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 0, 0, 3, 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3,  0, 0,  1 },
+/* ZWJ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0,  1 },
 /* ZW */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1,  1, 0,  1 },
 /* edg*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0,  0 }
 };
@@ -374246,86 +383337,89 @@ static const U8 LB_table[39][39] = {
 #define WB_NU_then_MB_or_MN_or_SQ        14
 #define WB_RI_then_RI                    16
 
-static const U8 WB_table[24][24] = {
-   /* 'Ext' stands for 'Extend'; 'edg' stands for 'EDGE'; 'hs' stands for
-    * 'Perl_Tailored_HSpace'; 'unk' stands for 'UNKNOWN' */
-/*        XX LE CR DQ EB EBG EM Ext EX FO GAZ HL KA LF ML MN MB NL NU hs RI SQ ZWJ edg */
-/* XX */ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* LE */ { 1, 0, 1, 1, 1,  1, 1,  0, 0, 0,  1, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 9,  0,  1 },
-/* CR */ { 1, 1, 0, 1, 1,  1, 1,  1, 1, 1,  1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1 },
-/* DQ */ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* EB */ { 1, 1, 1, 1, 1,  1, 0,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* EBG*/ { 1, 1, 1, 1, 1,  1, 0,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* EM */ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* Ext*/ { 3, 3, 1, 3, 3,  3, 3,  0, 3, 0,  3, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  0,  1 },
-/* EX */ { 1, 0, 1, 1, 1,  1, 1,  0, 0, 0,  1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1,  0,  1 },
-/* FO */ { 3, 3, 1, 3, 3,  3, 3,  0, 3, 0,  3, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  0,  1 },
-/* GAZ*/ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* HL */ { 1, 0, 1, 7, 1,  1, 1,  0, 0, 0,  1, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 8,  0,  1 },
-/* KA */ { 1, 1, 1, 1, 1,  1, 1,  0, 0, 0,  1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* LF */ { 1, 1, 0, 1, 1,  1, 1,  1, 1, 1,  1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1 },
-/* ML */ { 1,11, 1, 1, 1,  1, 1,  0, 1, 0,  1,11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,  1 },
-/* MN */ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  0,  1 },
-/* MB */ { 1,11, 1, 1, 1,  1, 1,  0, 1, 0,  1,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  0,  1 },
-/* NL */ { 1, 1, 0, 1, 1,  1, 1,  1, 1, 1,  1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1 },
-/* NU */ { 1, 0, 1, 1, 1,  1, 1,  0, 0, 0,  1, 0, 1, 1, 1,15,15, 1, 0, 1, 1,15,  0,  1 },
-/* hs */ { 1, 1, 0, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 0, 1, 1, 1, 0, 1, 2, 1, 1,  0,  1 },
-/* RI */ { 1, 1, 1, 1, 1,  1, 1,  0, 1, 0,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1,16, 1,  0,  1 },
-/* SQ */ { 1,11, 1, 1, 1,  1, 1,  0, 1, 0,  1,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  0,  1 },
-/* ZWJ*/ { 3, 3, 1, 3, 3,  0, 3,  0, 3, 0,  0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  0,  1 },
-/* edg*/ { 1, 1, 1, 1, 1,  1, 1,  1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  0 }
+static const U8 WB_table[23][23] = {
+   /* 'Ext' stands for 'Extend'; 'XPG' stands for 'XPG_LE'; 'XPH' stands for 'XPG_XX';
+    * 'edg' stands for 'EDGE'; 'hs' stands for 'Perl_Tailored_HSpace'; u stands for
+    * 'unused in this Unicode release (and the data in the row or column are garbage)
+    * */
+/*        XX LE CR DQ Ext EX FO HL KA LF ML MN MB NL NU hs RI SQ XPG XPH ZWJ edg  u */
+/* XX */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0,  1, 1 },
+/* LE */ { 1, 0, 1, 1,  0, 0, 0, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 9,  1,  1,  0,  1, 1 },
+/* CR */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1,  1,  1, 1 },
+/* DQ */ { 1, 1, 1, 1,  0, 1, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0,  1, 1 },
+/* Ext*/ { 3, 3, 1, 3,  0, 3, 0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  3,  3,  0,  1, 3 },
+/* EX */ { 1, 0, 1, 1,  0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1,  0,  1,  0,  1, 1 },
+/* FO */ { 3, 3, 1, 3,  0, 3, 0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  3,  3,  0,  1, 3 },
+/* HL */ { 1, 0, 1, 7,  0, 0, 0, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 8,  0,  1,  0,  1, 1 },
+/* KA */ { 1, 1, 1, 1,  0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0,  1, 1 },
+/* LF */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1,  1,  1, 1 },
+/* ML */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 11,  1,  0,  1, 1 },
+/* MN */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  1,  1,  0,  1, 1 },
+/* MB */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1, 11,  1,  0,  1, 1 },
+/* NL */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1,  1,  1,  1, 1 },
+/* NU */ { 1, 0, 1, 1,  0, 0, 0, 0, 1, 1, 1,15,15, 1, 0, 1, 1,15,  0,  1,  0,  1, 1 },
+/* hs */ { 1, 1, 0, 1,  0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 2, 1, 1,  1,  1,  0,  1, 1 },
+/* RI */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,16, 1,  1,  1,  0,  1, 1 },
+/* SQ */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1, 11,  1,  0,  1, 1 },
+/* XPG*/ { 1, 0, 1, 1,  0, 0, 0, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 9,  0,  1,  0,  1, 1 },
+/* XPH*/ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0,  1, 1 },
+/* ZWJ*/ { 3, 3, 1, 3,  0, 3, 0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  0,  0,  0,  1, 0 },
+/* edg*/ { 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  1,  0, 1 },
+/* u  */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0,  1, 0 }
 };
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
 
 /* Generated from:
  * f0b404b165a72b0aaeca3ce517cd14ea1b501720c98719dadbb990f1952fc568 lib/Unicode/UCD.pm
- * ff4404ec64f308bdf7714c50f9fdf0d1d0bf3c34db4d0a67e58ef0c6f88e818f lib/unicore/ArabicShaping.txt
- * 292171a0a1c13d7e581e8781eb4cdf248243b1ab267354a63c7a14429dea2740 lib/unicore/BidiBrackets.txt
- * 8f2695cc42989a79a715ab0d2892bd0c998759180cfdfb998674447f48231940 lib/unicore/BidiMirroring.txt
- * 5ae1649a42ed8ae8cb885af79563f00a9ae17e602405a56ed8aca214da14eea7 lib/unicore/Blocks.txt
- * 97b43ed3f4b80572c2114200e5e43a6b923d984c74a6caaf27de5b8462c04cb0 lib/unicore/CaseFolding.txt
- * eedcf6932b4081ee65878454588c803af910a5aed7c8c67e3c38701cbee9b9e4 lib/unicore/CompositionExclusions.txt
- * 90e48995643f45b08f0ef67fb90de3bb18e26765272bcc0c35c840cbc10b37c1 lib/unicore/DAge.txt
- * e6ca152259189ec4bc2297e93c6c88f86e162cc52814198263497f3c9b46cbe9 lib/unicore/DCoreProperties.txt
- * 3e255ccdff4b00cfe0be53bbd583e4fe2e7d4039138579543548a5ecfce45242 lib/unicore/DNormalizationProps.txt
- * 9f34e2d3ea27ca82f4f14b62411861d1f07c4b9e296d54da112a09cad5b9a48d lib/unicore/EastAsianWidth.txt
- * 983810c739b56b9ff0fcb5db018c67d584ee515e8a5f4d9348c79ee85167ec37 lib/unicore/HangulSyllableType.txt
- * 7d514a779ee4baf91262bd83c400cb502c3e435dba4b880c876506be32b8e1d0 lib/unicore/IndicPositionalCategory.txt
- * f6acead8f84df5c72f3fb70dfc9375279926e4d8ef3480ffff3723095e9804aa lib/unicore/IndicSyllabicCategory.txt
- * c8ed526f70443535ca6b705980a08c774017ff17e921202dcb7b71ae554047b6 lib/unicore/Jamo.txt
- * 6b204c3727b77699d04a574b22b1e44facab038642095b8565b49762970d9bf8 lib/unicore/LineBreak.txt
- * f2357d2bd3526b9e830de72ab038dcfc65a2dff24bcb4c6325c92071eb341f88 lib/unicore/NameAliases.txt
- * 6c3e6bd1e58b640076a23b83318a8bf6a691d7fc2b2106114d77c5c5a898bced lib/unicore/NamedSequences.txt
- * 58dbf8fedbd5bf67a3bd5c10eda2f2acf2eae59df5f77884a6f158e98f75cf8c lib/unicore/PropList.txt
- * a6b0467c3cc7aa4e57d4e5cc7f6e9562b79cf4426dfe438517c28b368ed3e673 lib/unicore/PropValueAliases.txt
- * 9ca521224e08d30696516ae6bc3d4434659c45df16047c0d31e440783c163a3b lib/unicore/PropertyAliases.txt
- * 3fd0d744a816ddfd06809f92151ae4a73ec970ac2006806c269732d8951f3911 lib/unicore/ScriptExtensions.txt
- * d02e24e4c516e9090b6bc9c2d2c8f4c89510b6ed8c5e859d0a861b0dc5cf372d lib/unicore/Scripts.txt
- * e9947a0e86f27353f0e776403c4826675001210bd39d7114118a8864a57f7472 lib/unicore/SpecialCasing.txt
- * 52423e4d7492167b62f518f68d54db88930abbbff7f11edfcaec8f726498cab1 lib/unicore/UnicodeData.txt
- * f28caf260635cebf25fd58124bdc9aa22af08ba4d039ffc584365fb41a31cda5 lib/unicore/VerticalOrientation.txt
- * 718d174957712410bfad782b10d557e1047574d7ef1642d6bb122f8ca5662c82 lib/unicore/auxiliary/GCBTest.txt
- * 3b66caefc4fa877d0e50dbbbfa39658c86e29b26c6f206f68d7aec192d4c59b6 lib/unicore/auxiliary/GraphemeBreakProperty.txt
- * 2aad3836c37fc4c2fa2a24f21586fb3a931dacaf0a1c845a6dc6395f30bd79a7 lib/unicore/auxiliary/LBTest.txt
- * eacc03e39dddc60cc59ec9bd274b8ac8dfa25d61745ef0d5c8aa1c151a5b68ba lib/unicore/auxiliary/SBTest.txt
- * e45fa8195bb413b901cc1e3772dfea2cead86805d46a51e3480a5a256e8c24d9 lib/unicore/auxiliary/SentenceBreakProperty.txt
- * 95789f62e3b1e781dc9ed78f3983d39ff1a5e36ff0b497d6e610446df902b0f6 lib/unicore/auxiliary/WBTest.txt
- * c207e8ebd06ee591a27b1087f2971f4cd93e960103c453d85d1d9ba26fb8b202 lib/unicore/auxiliary/WordBreakProperty.txt
- * a3c0839826a30166b2bb06ba58df403547b8c3d9eae995ef889d20d115f4b223 lib/unicore/extracted/DBidiClass.txt
- * 280afe22f6c4d56566d17d6d1400f33465a979c96f3d99ff3bff9bd14d17e734 lib/unicore/extracted/DBinaryProperties.txt
- * db7fd6a5e6f068c47dbc3b74fb633fb1d09d17073410fe435295d05ce925c5f6 lib/unicore/extracted/DCombiningClass.txt
- * 8204c07a7c217bdf22525030ad7b4fb991edf463bffcca7e6dba46b9992e0d99 lib/unicore/extracted/DDecompositionType.txt
- * e343113719b660bdd81217ec101ce751f844fca0e8d6f15fb21c8ee7dfe7c14c lib/unicore/extracted/DEastAsianWidth.txt
- * 07c55b0ed7271fe1a5f4d68059291288b1a8ad61940602d18956fd87390c2d9e lib/unicore/extracted/DGeneralCategory.txt
- * d788b9362ec7681e98f8b9d6ef276546e1a6207dda05317ede55bd686b0940a9 lib/unicore/extracted/DJoinGroup.txt
- * ebbea3c93eeb7431378885aebac0490d77f6900239c9176f90b6fee030903d96 lib/unicore/extracted/DJoinType.txt
- * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt
- * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt
- * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt
- * 6aaacc29ce24746bcb2bf82a920fcf90e07cf92d75325199c50f40754d39bb72 lib/unicore/mktables
- * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version
+ * 0bc5023a4606962114c4eb3775fae072cad8fecef5894d0de06603b1c70cbb47 lib/unicore/ArabicShaping.txt
+ * 2c7e2fb0cb91b378f0fa9301e951946e4de68f2ab6afc68d21bcff57cd2a8ad8 lib/unicore/BidiBrackets.txt
+ * f6d297765469724af523737c80faba3c33518fade4c5dc599e3ab51846f56916 lib/unicore/BidiMirroring.txt
+ * 0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052 lib/unicore/Blocks.txt
+ * 64f117a4749dd4a1b6c54277f63f6cf1e0eb45d290cbedaf777fbe71b8880885 lib/unicore/CaseFolding.txt
+ * c84c326cea271347752edc89487c24d847fd453082dfa07d0e9e284a05a7dd0b lib/unicore/CompositionExclusions.txt
+ * eb115a5de9a32c9ad447d6ea1cddcadb53d47f6cbc2521f3fe0bebb040c39866 lib/unicore/DAge.txt
+ * 3406825d64564bf2a37031c36a3e0f99d708aa17595b81f8b539d0f3d1a3923f lib/unicore/DCoreProperties.txt
+ * aad8102473e2c40b74a4aba4474a7008959963a0e51a2ee0ed4f029c8432cc6b lib/unicore/DNormalizationProps.txt
+ * 7aa76ead56e8cd0c4055408ca3c4c268513cca8ce5d0f5ea422203f721d3caca lib/unicore/EastAsianWidth.txt
+ * 8945581393e75bbd16ecec72e749fbb252155e1c2145a86abf24fcb308a66e7d lib/unicore/EmojiData.txt
+ * f97d03f720230f3ff9b5c9ac89ff06bab512a91c89155bfecbf3b89fa8809ce6 lib/unicore/EquivalentUnifiedIdeograph.txt
+ * 60b094a1ba49e4fa6397d1995e093c8699d3064e469985fb910bbdcffe0c703a lib/unicore/HangulSyllableType.txt
+ * 902ac38970a235b415d9165f63271fb9016f709fe5fc0829b636ef608b41b0a9 lib/unicore/IndicPositionalCategory.txt
+ * 0da7a1c8f1a6426f6c7b2193aa09b3c88ce3bf97288b62a30fa012d92f3b7f63 lib/unicore/IndicSyllabicCategory.txt
+ * 714b385eb1c04559dcd1678bbc27ba7bea9964680224ce3dd23b969f9c8cd316 lib/unicore/Jamo.txt
+ * 371aa0d3043ff8e2d47c2aec5ca3d44517b4c5acefc1b6ba41a8c1ae1edff323 lib/unicore/LineBreak.txt
+ * 12617cec2de4f51d55e48ca14710b1109b8d7e58555d789c000f91d3eda1c585 lib/unicore/NameAliases.txt
+ * 8708deafbb5e650a3d87a898d1d044294f8d280233e0dfa32e3d2a9984153f4b lib/unicore/NamedSequences.txt
+ * 205baca4772f1935060f3d652d36956c2b7a193440428cc7bae5414e9e7198f3 lib/unicore/PropList.txt
+ * 2a9cb9afe6a36a1a73ce2cedb540abd3fbf29f6afcda702d07fcbf561162a17a lib/unicore/PropValueAliases.txt
+ * b370cf0c886b3c9fd679d7696a2b8026d2c959fd3857fc7f5b56cbbe31e34f6e lib/unicore/PropertyAliases.txt
+ * 3e13406523153c85cf0b53eb24f8fe5843fb673737e184c8478b69a06da15232 lib/unicore/ScriptExtensions.txt
+ * e9f3c0aa3c4f892b589c809cf4ae051a39921417cda6fefdbe43717b92db76d5 lib/unicore/Scripts.txt
+ * 9f5668c3a6f3bbb88e2c07234ecfb2ec5db39e8dc5d7d04b994f6df6dbfdb5dd lib/unicore/SpecialCasing.txt
+ * 4997a3196eb79b4d0d6b8384560f6aeb46a062693f0abd5ba736abbff7976099 lib/unicore/UnicodeData.txt
+ * 5f520f210e8ca4e8861c12ba34740e14d737d8ba5136c08d63aa5a5bc7f2bf2a lib/unicore/VerticalOrientation.txt
+ * 4b26c6077d85fe2eabd16b433bf957d95dc5459a8f2626075cf8d611d6f833cb lib/unicore/auxiliary/GCBTest.txt
+ * 62f0e8bf7406d84bafee8f998faf469b84ac0cb359526a4d5eb2f2d55caec55b lib/unicore/auxiliary/GraphemeBreakProperty.txt
+ * 1f40941482f80b58cdbc319f916b68718d33febfd5f326035bde73ecb043297c lib/unicore/auxiliary/LBTest.txt
+ * cfa8d39787eb3e0883a40960e940d5df8ee6cdcbc8e1be5809fa74df97de8238 lib/unicore/auxiliary/SBTest.txt
+ * 13f1769dce7c186ffb9dd830c31087f9917d1b108601aca37713514d9c6cffdd lib/unicore/auxiliary/SentenceBreakProperty.txt
+ * 7e782466e4f13d281a3c0be9598426b0ebfdec5441843e77cb31772b8193fb0a lib/unicore/auxiliary/WBTest.txt
+ * 6bdb70f837a40dde1336f88470766c5e0c5934fc235dca7126977817443ea961 lib/unicore/auxiliary/WordBreakProperty.txt
+ * 9431a818be21ed42ed254a5d3b100bc372de1cd354c4873a4c50cc01f56aec39 lib/unicore/extracted/DBidiClass.txt
+ * 1f671c893c88488cb917de2f43bcaab0b15539607eddde75ebd6dc1b236dcf0e lib/unicore/extracted/DBinaryProperties.txt
+ * 11c8bd81ecbede4d67c7b5b693a471647d5401956707c639ae053b836cc7f5da lib/unicore/extracted/DCombiningClass.txt
+ * 00de56bb71306f28d51c02f725dc65f4b2588eb8ccc00c829717c0d1ee9592d6 lib/unicore/extracted/DDecompositionType.txt
+ * 7c2d15889665823996fa81a9ecc490d080c99da808d7e91f14809af932530161 lib/unicore/extracted/DEastAsianWidth.txt
+ * 7ceab0dc8e24899a72bb1b91894e1c15e6a7c139939fefb1bcd46329f46d3758 lib/unicore/extracted/DGeneralCategory.txt
+ * 890455619a3dd3dd380a49b087063c72a2f730e5997b5232e30dffb9dc30bd85 lib/unicore/extracted/DJoinGroup.txt
+ * 4fd53b6fc72b633f8020a2f37e7ce1aa386ed530061b66a9d5cb11cbb3f07335 lib/unicore/extracted/DJoinType.txt
+ * 018e20fa2f469667cc7ccd8a3d4a4a8cce8ad9bdf5fce5b2f61137660ea1065f lib/unicore/extracted/DLineBreak.txt
+ * 88c30a794011f5e6dc62154342e8bab1bd4ce2d0c0ab06fb69ba47134dc75b23 lib/unicore/extracted/DNumType.txt
+ * dab1e84f48990e30635a4f489d33212b25d0e35d80839c08e33a8afe5736346c lib/unicore/extracted/DNumValues.txt
+ * aa29d36570237ec49c1fbd59d9cfafefcce690a286d3273ff4da49da1dfc88f2 lib/unicore/mktables
+ * 7bd6bcbe3813e0cd55e0998053d182b7bc8c97dcfd0b85028e9f7f55af4ad61b lib/unicore/version
  * 4bb677187a1a64e39d48f2e341b5ecb6c99857e49d7a79cf503bd8a3c709999b regen/charset_translations.pl
  * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl
- * 06e7b77f7033a8866ddc1a18d59dd946f784e081af4d4ba4f065a52f68924a5d regen/mk_invlists.pl
+ * 75b68d1ed0aa09110eacc421055c41bb1cc2d7cfbf23455f0a7bc9e2eb662b13 regen/mk_invlists.pl
  * ex: set ro: */
Unnamed repository; edit this file 'description' to name the repository.