Move Unicode \p{} definitions to regcomp.c

These are only used in compiling patterns.  They previously were placed
in utf8.c because they are large, and there is a copy of regcomp.c in
ext/re, so they would have use twice the space.

This commit changes things so that they only are used and defined in
regcomp.c, (not re_comp.c) so that duplication does not occur.  They are
accessed only from one function, and that is also moved from utf8.c to
regcomp.c, only compiled in regcomp.c, and referred to as an external by
re_comp.c

I had to change the names of the table.  Previously they started with
'PL_' in case any got exposed, but globvar.t mindlessly assumes that any
such variables in the file regcomp.c are globals, and wrongly complains.
It was easier to just change the prefix to 'UNI_' instead.

A few tables are used in regexec.c, and are duplicated in re_exec.c.
Things could be adjusted so that only one copy is used.  I tried this,
but the tables are far more intertwined in regexec.c functions than
the ones changed in this commit, as only a single function accesses
these.  Thus doing this would be a lot harder, and the payback isn't all
that much.  I started work to make them EXTCONSTs, and then discovered
the intertwining, but left in that work, unused.

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 701ce95..5100f2f 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,13 +27,13 @@ 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 */
+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;
@@ -1421,6 +1421,14 @@ static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        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
@@ -1962,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 */,
@@ -2039,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,
@@ -3425,12 +3434,16 @@ static const int Case_Folding_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -4837,6 +4850,17 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        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
@@ -5378,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 */,
@@ -5455,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,
@@ -6860,12 +6885,16 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -8268,6 +8297,17 @@ static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */
        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
@@ -8809,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 */,
@@ -8886,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,
@@ -10287,9 +10328,13 @@ static const int Case_Folding_invmap[] = { /* for EBCDIC 037 */
 
 #  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 */
+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;
@@ -11541,6 +11586,14 @@ static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        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
@@ -11564,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,
@@ -12819,12 +12873,16 @@ static const int Lowercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -14094,6 +14152,17 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        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
@@ -14117,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,
@@ -15390,12 +15460,16 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -16661,6 +16735,17 @@ static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        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
@@ -16684,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,
@@ -17953,9 +18039,13 @@ static const int Lowercase_Mapping_invmap[] = { /* for EBCDIC 037 */
 
 #  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;
@@ -18014,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;
@@ -18073,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;
@@ -18129,7 +18219,7 @@ 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 */
+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;
@@ -19905,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)
 
@@ -19934,7 +20024,7 @@ typedef enum {
        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,
@@ -21708,14 +21798,14 @@ 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 */
+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;
@@ -23492,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)
 
@@ -23524,7 +23614,7 @@ typedef enum {
        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,
@@ -25299,14 +25389,14 @@ 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 */
+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;
@@ -27083,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)
 
@@ -27115,7 +27205,7 @@ typedef enum {
        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,
@@ -28890,11 +28980,11 @@ 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 */
+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;
@@ -30198,6 +30288,14 @@ static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */
        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
@@ -30406,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 */,
@@ -30437,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,
@@ -31739,12 +31838,16 @@ static const int _Perl_IVCF_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -33062,6 +33165,17 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */
        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
@@ -33270,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 */,
@@ -33301,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,
@@ -34617,12 +34732,16 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -35940,6 +36059,17 @@ static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */
        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
@@ -36148,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 */,
@@ -36179,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,
@@ -37495,9 +37626,13 @@ static const int _Perl_IVCF_invmap[] = { /* for EBCDIC 037 */
 
 #  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 */
+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;
@@ -39859,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)
 
@@ -39907,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,
@@ -42267,14 +42402,14 @@ 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 */
+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;
@@ -44648,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)
 
@@ -44699,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,
@@ -47071,14 +47206,14 @@ 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 */
+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;
@@ -49452,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)
 
@@ -49503,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,
@@ -51875,11 +52010,11 @@ 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 */
+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;
@@ -54953,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)
 
@@ -54978,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,
@@ -58050,14 +58185,14 @@ 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 */
+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;
@@ -61155,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)
 
@@ -61183,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,
@@ -64279,14 +64414,14 @@ 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 */
+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;
@@ -67380,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)
 
@@ -67408,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,
@@ -70500,11 +70635,11 @@ 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 */
+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;
@@ -72125,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 */
 
@@ -72778,6 +72913,7 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
 
 /* 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 */,
@@ -72834,6 +72970,7 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
 /* 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 */
@@ -72987,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,
@@ -74606,14 +74743,14 @@ 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 */
+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;
@@ -76260,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 \
@@ -76919,6 +77056,7 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
 
 /* 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 */,
@@ -76975,6 +77113,7 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
 /* 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 */
@@ -77128,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,
@@ -78773,14 +78912,14 @@ 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 */
+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;
@@ -80423,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 \
@@ -81082,6 +81221,7 @@ static const SCX_enum * const SCX_AUX_TABLE_ptrs[] = {
 
 /* 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 */,
@@ -81138,6 +81278,7 @@ static const U8 SCX_AUX_TABLE_lengths[] = {
 /* 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 */
@@ -81291,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,
@@ -82932,11 +83073,11 @@ 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 */
+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;
@@ -84757,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)
 
@@ -84793,7 +84934,7 @@ typedef enum {
        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,
@@ -86612,14 +86753,14 @@ 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 */
+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;
@@ -88463,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)
 
@@ -88502,7 +88643,7 @@ typedef enum {
        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,
@@ -90344,14 +90485,14 @@ 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 */
+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;
@@ -92191,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)
 
@@ -92230,7 +92371,7 @@ typedef enum {
        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,
@@ -94068,11 +94209,11 @@ 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 */
+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;
@@ -95353,7 +95494,15 @@ static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */
        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,
@@ -96632,12 +96781,16 @@ static const int Simple_Case_Folding_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -97936,7 +98089,18 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */
        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,
@@ -99233,12 +99397,16 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -100533,7 +100701,18 @@ static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */
        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,
@@ -101826,9 +102005,13 @@ static const int Simple_Case_Folding_invmap[] = { /* for EBCDIC 037 */
 
 #  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 */
+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;
@@ -103157,6 +103340,14 @@ static const UV Titlecase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        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
@@ -103502,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 */,
@@ -103551,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,
@@ -104878,12 +105070,16 @@ static const int Titlecase_Mapping_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -106228,6 +106424,17 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        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
@@ -106573,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 */,
@@ -106622,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,
@@ -107965,12 +108173,16 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -109313,6 +109525,17 @@ static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 037 */
        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
@@ -109658,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 */,
@@ -109707,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,
@@ -111048,9 +111272,13 @@ static const int Titlecase_Mapping_invmap[] = { /* for EBCDIC 037 */
 
 #  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 */
+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;
@@ -112430,6 +112658,14 @@ static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */
        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
@@ -112964,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 */,
@@ -113040,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,
@@ -114418,12 +114655,16 @@ static const int Uppercase_Mapping_invmap[] = { /* for ASCII/Latin1 */
 
 #  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 */
+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;
@@ -115819,6 +116060,17 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */
        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
@@ -116353,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 */,
@@ -116429,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,
@@ -117823,12 +118076,16 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 1047 */
 
 #  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 */
+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;
@@ -119222,6 +119479,17 @@ static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */
        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
@@ -119756,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 */,
@@ -119832,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,
@@ -121224,9 +121493,13 @@ static const int Uppercase_Mapping_invmap[] = { /* for EBCDIC 037 */
 
 #  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;
@@ -121243,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;
@@ -121312,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;
@@ -121380,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;
@@ -121396,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;
@@ -121464,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;
@@ -121529,7 +121802,7 @@ static const UV PL_ASCII_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
+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;
@@ -122854,7 +123127,7 @@ static const UV PL_ASSIGNED_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CASED_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -123147,7 +123420,7 @@ 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 */
+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;
@@ -123466,7 +123739,7 @@ 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 */
+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;
@@ -123778,7 +124051,7 @@ static const UV PL_CASED_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -124053,7 +124326,7 @@ 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 */
+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;
@@ -124360,7 +124633,7 @@ 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 */
+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;
@@ -124660,7 +124933,7 @@ static const UV PL_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -125951,7 +126224,7 @@ 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 */
+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;
@@ -127256,7 +127529,7 @@ 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 */
+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;
@@ -128558,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;
@@ -128579,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;
@@ -128608,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;
@@ -128634,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;
@@ -128653,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;
@@ -128680,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;
@@ -128704,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;
@@ -128723,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;
@@ -128742,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;
@@ -128758,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;
@@ -128776,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;
@@ -128816,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;
@@ -128853,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;
@@ -128870,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;
@@ -128887,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;
@@ -128901,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;
@@ -128918,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;
@@ -128961,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;
@@ -129003,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;
@@ -129020,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;
@@ -129041,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;
@@ -129059,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;
@@ -129076,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;
@@ -129121,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;
@@ -129165,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;
@@ -129188,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;
@@ -129223,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;
@@ -129257,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;
@@ -129276,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;
@@ -129299,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;
@@ -129319,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;
@@ -129336,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;
@@ -129357,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;
@@ -129375,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;
@@ -129398,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;
@@ -129429,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;
@@ -129457,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;
@@ -129478,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;
@@ -129499,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;
@@ -129515,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;
@@ -129545,7 +129818,7 @@ static const UV PL_TITLE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -130822,7 +131095,7 @@ 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 */
+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;
@@ -132117,7 +132390,7 @@ 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 */
+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;
@@ -133405,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;
@@ -133426,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;
@@ -133449,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;
@@ -133469,7 +133742,7 @@ static const UV PL_VERTSPACE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -134910,7 +135183,7 @@ 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 */
+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;
@@ -136375,7 +136648,7 @@ 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 */
+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;
@@ -137833,7 +138106,7 @@ static const UV PL_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -139200,7 +139473,7 @@ 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 */
+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;
@@ -140593,7 +140866,7 @@ 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 */
+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;
@@ -141979,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;
@@ -142010,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;
@@ -142039,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;
@@ -142065,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;
@@ -142083,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;
@@ -142101,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;
@@ -142116,7 +142389,7 @@ static const UV PL_XPOSIXCNTRL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -142245,7 +142518,7 @@ 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 */
+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;
@@ -142374,7 +142647,7 @@ 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 */
+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;
@@ -142500,7 +142773,7 @@ static const UV PL_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -143841,7 +144114,7 @@ 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 */
+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;
@@ -145182,7 +145455,7 @@ 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 */
+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;
@@ -146520,7 +146793,7 @@ static const UV PL_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -147825,7 +148098,7 @@ 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 */
+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;
@@ -149138,7 +149411,7 @@ 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 */
+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;
@@ -150448,7 +150721,7 @@ static const UV PL_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -151783,7 +152056,7 @@ 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 */
+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;
@@ -153118,7 +153391,7 @@ 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 */
+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;
@@ -154450,7 +154723,7 @@ static const UV PL_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -154811,7 +155084,7 @@ 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 */
+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;
@@ -155180,7 +155453,7 @@ 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 */
+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;
@@ -155548,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;
@@ -155583,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;
@@ -155620,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;
@@ -155654,7 +155927,7 @@ static const UV PL_XPOSIXSPACE_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -156941,7 +157214,7 @@ 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 */
+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;
@@ -158246,7 +158519,7 @@ 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 */
+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;
@@ -159544,7 +159817,7 @@ static const UV PL_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -160981,7 +161254,7 @@ 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 */
+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;
@@ -162442,7 +162715,7 @@ 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 */
+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;
@@ -163896,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;
@@ -163923,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;
@@ -163950,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;
@@ -163974,7 +164247,7 @@ 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 */
+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;
@@ -164251,7 +164524,7 @@ 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 */
+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;
@@ -164560,7 +164833,7 @@ 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 */
+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;
@@ -164862,7 +165135,7 @@ 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 */
+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;
@@ -166087,7 +166360,7 @@ 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 */
+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;
@@ -167338,7 +167611,7 @@ 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 */
+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;
@@ -168582,7 +168855,7 @@ 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 */
+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;
@@ -170031,7 +170304,7 @@ 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 */
+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;
@@ -171506,7 +171779,7 @@ 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 */
+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;
@@ -172974,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;
@@ -173047,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;
@@ -173120,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;
@@ -173190,7 +173463,7 @@ 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 */
+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;
@@ -174633,7 +174906,7 @@ 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 */
+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;
@@ -176100,7 +176373,7 @@ 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 */
+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;
@@ -177560,7 +177833,7 @@ 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 */
+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;
@@ -178791,7 +179064,7 @@ 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 */
+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;
@@ -180048,7 +180321,7 @@ 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 */
+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;
@@ -181296,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;
@@ -181329,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;
@@ -181362,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;
@@ -181454,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;
@@ -181560,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;
@@ -181659,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;
@@ -181675,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;
@@ -181685,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;
@@ -181773,7 +182046,7 @@ static const UV PL_AGE__10_invlist[] = { /* for all charsets */
        0x2EBE1
 };
 
-static const UV PL_AGE__11_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;
@@ -181899,7 +182172,7 @@ static const UV PL_AGE__11_invlist[] = { /* for all charsets */
        0x1FA6E
 };
 
-static const UV PL_AGE__2_invlist[] = { /* for all charsets */
+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;
@@ -181965,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;
@@ -181977,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;
@@ -182227,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;
@@ -182307,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;
@@ -182433,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;
@@ -182595,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;
@@ -182775,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;
@@ -182853,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;
@@ -183039,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;
@@ -183227,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;
@@ -183447,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;
@@ -183633,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;
@@ -183643,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;
@@ -183655,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;
@@ -183945,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;
@@ -184071,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;
@@ -184183,7 +184456,7 @@ static const UV PL_AGE__9_invlist[] = { /* for all charsets */
        0x1F992
 };
 
-static const UV PL_AGE__NA_invlist[] = { /* for all charsets */
+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;
@@ -185526,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;
@@ -185538,7 +185811,7 @@ 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;
@@ -185552,7 +185825,7 @@ static const UV PL_AHOM_invlist[] = { /* for all charsets */
        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;
@@ -185562,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;
@@ -185570,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;
@@ -185580,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;
@@ -185590,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;
@@ -185600,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;
@@ -185610,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;
@@ -185619,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;
@@ -185731,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;
@@ -185741,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;
@@ -185751,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;
@@ -185761,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;
@@ -185771,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;
@@ -185781,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;
@@ -185793,7 +186066,7 @@ static const UV PL_ARMI_invlist[] = { /* for all charsets */
        0x10860
 };
 
-static const UV PL_ARMN_invlist[] = { /* for all charsets */
+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;
@@ -185809,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;
@@ -185819,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;
@@ -185831,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;
@@ -185843,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;
@@ -185855,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;
@@ -185865,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;
@@ -185877,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;
@@ -185889,7 +186162,7 @@ static const UV PL_BATK_invlist[] = { /* for all charsets */
        0x1C00
 };
 
-static const UV PL_BC__AL_invlist[] = { /* for all charsets */
+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;
@@ -185951,7 +186224,7 @@ static const UV PL_BC__AL_invlist[] = { /* for all charsets */
        0x1EF00
 };
 
-static const UV PL_BC__AN_invlist[] = { /* for all charsets */
+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;
@@ -185975,7 +186248,7 @@ static const UV PL_BC__AN_invlist[] = { /* for all charsets */
 
 #  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;
@@ -186000,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;
@@ -186025,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;
@@ -186047,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;
@@ -186125,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;
@@ -186209,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;
@@ -186290,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;
@@ -186331,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;
@@ -186374,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;
@@ -186414,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;
@@ -186453,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;
@@ -186492,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;
@@ -186528,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;
@@ -186561,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;
@@ -186594,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;
@@ -186624,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;
@@ -186683,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;
@@ -186750,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;
@@ -186812,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;
@@ -186824,7 +187097,7 @@ 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 */
+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;
@@ -187722,7 +187995,7 @@ 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 */
+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;
@@ -188646,7 +188919,7 @@ 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 */
+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;
@@ -189561,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;
@@ -189571,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;
@@ -189581,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;
@@ -189591,7 +189864,7 @@ static const UV PL_BC__LRO_invlist[] = { /* for all charsets */
        0x202E
 };
 
-static const UV PL_BC__NSM_invlist[] = { /* for all charsets */
+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;
@@ -190219,7 +190492,7 @@ 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 */
+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;
@@ -190592,7 +190865,7 @@ 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 */
+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;
@@ -190973,7 +191246,7 @@ 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 */
+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;
@@ -191345,7 +191618,7 @@ static const UV PL_BC__ON_invlist[] = { /* for EBCDIC 037 */
 
 #  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;
@@ -191355,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;
@@ -191365,7 +191638,7 @@ static const UV PL_BC__PDI_invlist[] = { /* for all charsets */
        0x206A
 };
 
-static const UV PL_BC__R_invlist[] = { /* for all charsets */
+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;
@@ -191447,7 +191720,7 @@ static const UV PL_BC__R_invlist[] = { /* for all charsets */
        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;
@@ -191457,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;
@@ -191467,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;
@@ -191479,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;
@@ -191500,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;
@@ -191521,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;
@@ -191539,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;
@@ -191568,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;
@@ -191597,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;
@@ -191621,7 +191894,7 @@ static const UV PL_BC__WS_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_BENG_invlist[] = { /* for all charsets */
+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;
@@ -191679,7 +191952,7 @@ static const UV PL_BENG_invlist[] = { /* for all charsets */
        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;
@@ -191695,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;
@@ -191713,7 +191986,7 @@ static const UV PL_BIDIC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_BIDIM_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -191954,7 +192227,7 @@ 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 */
+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;
@@ -192193,7 +192466,7 @@ 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 */
+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;
@@ -192425,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;
@@ -192435,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;
@@ -192467,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;
@@ -192477,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;
@@ -192489,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;
@@ -192624,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;
@@ -192759,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;
@@ -192891,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;
@@ -192964,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;
@@ -193039,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;
@@ -193109,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;
@@ -193244,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;
@@ -193379,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;
@@ -193509,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;
@@ -193523,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;
@@ -193533,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;
@@ -193547,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;
@@ -193559,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;
@@ -193571,7 +193844,7 @@ static const UV PL_BYZANTINEMUSIC_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_C_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -194906,7 +195179,7 @@ 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 */
+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;
@@ -196241,7 +196514,7 @@ 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 */
+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;
@@ -197571,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;
@@ -197587,7 +197860,7 @@ static const UV PL_CAKM_invlist[] = { /* for all charsets */
        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;
@@ -197599,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;
@@ -197609,7 +197882,7 @@ static const UV PL_CARI_invlist[] = { /* for all charsets */
        0x102D1
 };
 
-static const UV PL_CCC__0_invlist[] = { /* for all charsets */
+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;
@@ -197967,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;
@@ -197997,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;
@@ -198007,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;
@@ -198017,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;
@@ -198027,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;
@@ -198037,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;
@@ -198047,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;
@@ -198057,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;
@@ -198067,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;
@@ -198077,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;
@@ -198087,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;
@@ -198101,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;
@@ -198111,7 +198384,7 @@ static const UV PL_CCC__132_invlist[] = { /* for all charsets */
        0xF75
 };
 
-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;
@@ -198121,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;
@@ -198131,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;
@@ -198141,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;
@@ -198151,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;
@@ -198163,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;
@@ -198173,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;
@@ -198183,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;
@@ -198197,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;
@@ -198207,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;
@@ -198217,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;
@@ -198233,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;
@@ -198243,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;
@@ -198253,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;
@@ -198263,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;
@@ -198273,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;
@@ -198283,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;
@@ -198295,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;
@@ -198307,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;
@@ -198319,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;
@@ -198331,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;
@@ -198343,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;
@@ -198355,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;
@@ -198365,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;
@@ -198375,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;
@@ -198385,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;
@@ -198395,7 +198668,7 @@ static const UV PL_CCC__36_invlist[] = { /* for all charsets */
        0x712
 };
 
-static const UV PL_CCC__7_invlist[] = { /* for all charsets */
+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;
@@ -198451,7 +198724,7 @@ static const UV PL_CCC__7_invlist[] = { /* for all charsets */
        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;
@@ -198461,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;
@@ -198471,7 +198744,7 @@ static const UV PL_CCC__84_invlist[] = { /* for all charsets */
        0xC56
 };
 
-static const UV PL_CCC__9_invlist[] = { /* for all charsets */
+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;
@@ -198579,7 +198852,7 @@ static const UV PL_CCC__9_invlist[] = { /* for all charsets */
        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;
@@ -198589,7 +198862,7 @@ static const UV PL_CCC__91_invlist[] = { /* for all charsets */
        0xC57
 };
 
-static const UV PL_CCC__A_invlist[] = { /* for all charsets */
+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;
@@ -198827,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;
@@ -198843,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;
@@ -198861,7 +199134,7 @@ static const UV PL_CCC__AR_invlist[] = { /* for all charsets */
        0x302D
 };
 
-static const UV PL_CCC__B_invlist[] = { /* for all charsets */
+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;
@@ -199023,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;
@@ -199033,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;
@@ -199049,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;
@@ -199063,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;
@@ -199079,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;
@@ -199089,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;
@@ -199099,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;
@@ -199109,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;
@@ -199185,7 +199458,7 @@ static const UV PL_CE_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CF_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -199238,7 +199511,7 @@ 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 */
+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;
@@ -199291,7 +199564,7 @@ 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 */
+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;
@@ -199339,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;
@@ -199355,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;
@@ -199369,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;
@@ -199379,7 +199652,7 @@ static const UV PL_CHEROKEESUP_invlist[] = { /* for all charsets */
        0xABC0
 };
 
-static const UV PL_CHESSSYMBOLS_invlist[] = { /* for all charsets */
+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;
@@ -199391,7 +199664,7 @@ static const UV PL_CHESSSYMBOLS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CI_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -200194,7 +200467,7 @@ 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 */
+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;
@@ -200995,7 +201268,7 @@ 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 */
+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;
@@ -201789,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;
@@ -201799,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;
@@ -201809,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;
@@ -201819,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;
@@ -201829,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;
@@ -201839,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;
@@ -201849,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;
@@ -201859,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;
@@ -201869,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;
@@ -201879,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;
@@ -201889,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;
@@ -201899,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;
@@ -201909,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;
@@ -201919,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;
@@ -201929,7 +202202,7 @@ static const UV PL_CJKSYMBOLS_invlist[] = { /* for all charsets */
        0x3040
 };
 
-static const UV PL_CN_invlist[] = { /* for all charsets */
+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;
@@ -203252,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;
@@ -203266,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;
@@ -203276,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;
@@ -203430,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;
@@ -203440,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;
@@ -203456,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;
@@ -203466,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;
@@ -203476,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;
@@ -203502,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;
@@ -203512,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;
@@ -203524,7 +203797,7 @@ static const UV PL_CURRENCYSYMBOLS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWCF_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -204753,7 +205026,7 @@ 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 */
+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;
@@ -206002,7 +206275,7 @@ 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 */
+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;
@@ -207244,7 +207517,7 @@ static const UV PL_CWCF_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWCM_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -207501,7 +207774,7 @@ 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 */
+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;
@@ -207790,7 +208063,7 @@ 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 */
+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;
@@ -208072,7 +208345,7 @@ static const UV PL_CWCM_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWKCF_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -209725,7 +209998,7 @@ 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 */
+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;
@@ -211388,7 +211661,7 @@ 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 */
+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;
@@ -213046,7 +213319,7 @@ static const UV PL_CWKCF_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWL_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -214249,7 +214522,7 @@ 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 */
+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;
@@ -215470,7 +215743,7 @@ 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 */
+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;
@@ -216684,7 +216957,7 @@ static const UV PL_CWL_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWT_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -217919,7 +218192,7 @@ 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 */
+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;
@@ -219168,7 +219441,7 @@ 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 */
+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;
@@ -220414,7 +220687,7 @@ static const UV PL_CWT_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_CWU_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -221651,7 +221924,7 @@ 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 */
+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;
@@ -222902,7 +223175,7 @@ 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 */
+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;
@@ -224148,7 +224421,7 @@ static const UV PL_CWU_invlist[] = { /* for EBCDIC 037 */
 
 #  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;
@@ -224158,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;
@@ -224168,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;
@@ -224178,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;
@@ -224188,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;
@@ -224198,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;
@@ -224224,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;
@@ -224281,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;
@@ -224338,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;
@@ -224390,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;
@@ -224414,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;
@@ -224434,7 +224707,7 @@ static const UV PL_DEVA_invlist[] = { /* for all charsets */
        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;
@@ -224446,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;
@@ -224495,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;
@@ -224544,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;
@@ -224590,7 +224863,7 @@ static const UV PL_DI_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_DIA_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -224931,7 +225204,7 @@ 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 */
+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;
@@ -225272,7 +225545,7 @@ 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 */
+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;
@@ -225606,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;
@@ -225616,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;
@@ -225626,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;
@@ -225636,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;
@@ -225646,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;
@@ -225656,7 +225929,7 @@ static const UV PL_DINGBATS_invlist[] = { /* for all charsets */
        0x27C0
 };
 
-static const UV PL_DOGR_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;
@@ -225670,7 +225943,7 @@ static const UV PL_DOGR_invlist[] = { /* for all charsets */
        0x1183C
 };
 
-static const UV PL_DOMINO_invlist[] = { /* for all charsets */
+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;
@@ -225680,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;
@@ -225692,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;
@@ -226169,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;
@@ -226650,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;
@@ -227128,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;
@@ -227291,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;
@@ -227454,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;
@@ -227610,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;
@@ -227634,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;
@@ -227868,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;
@@ -228012,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;
@@ -228033,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;
@@ -228054,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;
@@ -228070,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;
@@ -228228,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;
@@ -228432,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;
@@ -228548,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;
@@ -228570,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;
@@ -228595,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;
@@ -228620,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;
@@ -228642,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;
@@ -229029,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;
@@ -229422,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;
@@ -229810,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;
@@ -230605,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;
@@ -231398,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;
@@ -232188,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;
@@ -232202,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;
@@ -232228,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;
@@ -232246,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;
@@ -232309,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;
@@ -232374,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;
@@ -232434,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;
@@ -232452,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;
@@ -232472,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;
@@ -232845,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;
@@ -233222,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;
@@ -233592,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;
@@ -233606,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;
@@ -233630,7 +233903,7 @@ 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 */
+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;
@@ -234181,7 +234454,7 @@ 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 */
+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;
@@ -234730,7 +235003,7 @@ 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 */
+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;
@@ -235276,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;
@@ -235305,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;
@@ -235356,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;
@@ -235400,7 +235673,7 @@ static const UV PL_EA__NA_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_EA__W_invlist[] = { /* for all charsets */
+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;
@@ -235620,7 +235893,7 @@ static const UV PL_EA__W_invlist[] = { /* for all charsets */
        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;
@@ -235630,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;
@@ -235640,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;
@@ -235650,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;
@@ -235660,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;
@@ -235670,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;
@@ -235680,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;
@@ -235690,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;
@@ -235700,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;
@@ -235772,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;
@@ -235782,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;
@@ -235792,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;
@@ -235804,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;
@@ -235877,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;
@@ -235950,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;
@@ -236020,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;
@@ -236072,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;
@@ -236124,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;
@@ -236171,7 +236444,7 @@ static const UV PL_GCB__CN_invlist[] = { /* for EBCDIC 037 */
 
 #  endif       /* EBCDIC 037 */
 
-static const UV PL_GCB__EX_invlist[] = { /* for all charsets */
+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;
@@ -236843,7 +237116,7 @@ static const UV PL_GCB__EX_invlist[] = { /* for all charsets */
        0xE01F0
 };
 
-static const UV PL_GCB__L_invlist[] = { /* for all charsets */
+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;
@@ -236855,7 +237128,7 @@ static const UV PL_GCB__L_invlist[] = { /* for all charsets */
        0xA97D
 };
 
-static const UV PL_GCB__PP_invlist[] = { /* for all charsets */
+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;
@@ -236885,7 +237158,7 @@ static const UV PL_GCB__PP_invlist[] = { /* for all charsets */
        0x11D47
 };
 
-static const UV PL_GCB__SM_invlist[] = { /* for all charsets */
+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;
@@ -237195,7 +237468,7 @@ static const UV PL_GCB__SM_invlist[] = { /* for all charsets */
        0x1D16E
 };
 
-static const UV PL_GCB__T_invlist[] = { /* for all charsets */
+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;
@@ -237207,7 +237480,7 @@ static const UV PL_GCB__T_invlist[] = { /* for all charsets */
        0xD7FC
 };
 
-static const UV PL_GCB__V_invlist[] = { /* for all charsets */
+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;
@@ -237221,7 +237494,7 @@ static const UV PL_GCB__V_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_GCB__XX_invlist[] = { /* for 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;
@@ -237829,7 +238102,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for ASCII/Latin1 */
      && '^' == 95 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
+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;
@@ -238437,7 +238710,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 1047 */
      && '^' == 176 && '~' == 161 && '!' == 90 && '#' == 123 && '|' == 79 \
      && '$' == 91 && '@' == 124 && '`' == 121
 
-static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
+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;
@@ -239040,7 +239313,7 @@ static const UV PL_GCB__XX_invlist[] = { /* for EBCDIC 037 */
 
 #  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;
@@ -239050,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;
@@ -239060,7 +239333,7 @@ static const UV PL_GEOMETRICSHAPESEXT_invlist[] = { /* for all charsets */
        0x1F800
 };
 
-static const UV PL_GEOR_invlist[] = { /* for all charsets */
+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;
@@ -239088,7 +239361,7 @@ static const UV PL_GEOR_invlist[] = { /* for all charsets */
        0x2D2E
 };
 
-static const UV PL_GEORGIANEXT_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;
@@ -239098,7 +239371,7 @@ static const UV PL_GEORGIANEXT_invlist[] = { /* for all charsets */
        0x1CC0
 };
 
-static const UV PL_GEORGIANSUP_invlist[] = { /* for all charsets */
+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;
@@ -239108,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;
@@ -239138,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;
@@ -239148,7 +239421,7 @@ static const UV PL_GLAGOLITICSUP_invlist[] = { /* for all charsets */
        0x1E030
 };
 
-static const UV PL_GONG_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;
@@ -239170,7 +239443,7 @@ static const UV PL_GONG_invlist[] = { /* for all charsets */
        0x11DAA
 };
 
-static const UV PL_GONM_invlist[] = { /* for all charsets */
+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;
@@ -239192,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;
@@ -239202,7 +239475,7 @@ static const UV PL_GOTH_invlist[] = { /* for all charsets */
        0x1034B
 };
 
-static const UV PL_GRAN_invlist[] = { /* for all charsets */
+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;
@@ -239258,7 +239531,7 @@ static const UV PL_GRAN_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_GRBASE_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -240885,7 +241158,7 @@ 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 */
+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;
@@ -242512,7 +242785,7 @@ 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 */
+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;
@@ -244134,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;
@@ -244144,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;
@@ -244228,7 +244501,7 @@ static const UV PL_GREK_invlist[] = { /* for all charsets */
        0x1D246
 };
 
-static const UV PL_GREXT_invlist[] = { /* for all charsets */
+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;
@@ -244898,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;
@@ -244940,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;
@@ -244986,7 +245259,7 @@ static const UV PL_GURU_invlist[] = { /* for all charsets */
        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;
@@ -244996,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;
@@ -245006,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;
@@ -245078,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;
@@ -245128,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;
@@ -245138,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;
@@ -245152,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;
@@ -245178,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;
@@ -245188,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;
@@ -245198,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;
@@ -245236,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;
@@ -245246,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;
@@ -245264,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;
@@ -245282,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;
@@ -245298,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;
@@ -245333,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;
@@ -245368,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;
@@ -245400,7 +245673,7 @@ static const UV PL_HYPHEN_invlist[] = { /* for EBCDIC 037 */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_IDC_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -246829,7 +247102,7 @@ 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 */
+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;
@@ -248282,7 +248555,7 @@ 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 */
+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;
@@ -249726,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;
@@ -249766,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;
@@ -249778,7 +250051,7 @@ static const UV PL_IDEOGRAPHICSYMBOLS_invlist[] = { /* for all charsets */
 
 #  if 'A' == 65 /* ASCII/Latin1 */
 
-static const UV PL_IDS_invlist[] = { /* for ASCII/Latin1 */
+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;
@@ -250991,7 +251264,7 @@ 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 */
+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;
@@ -252230,7 +252503,7 @@ 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 */
+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;
@@ -253460,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;
@@ -253472,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;
@@ -253482,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;
@@ -254065,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;
@@ -255390,7 +255663,7 @@ static const UV PL_IN__10_invlist[] = { /* for all charsets */
        0x110000
 };
 
-static const UV PL_IN__11_invlist[] = { /* for all charsets */
+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;
@@ -256733,7 +257006,7 @@ static const UV PL_IN__11_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;
@@ -257364,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;
@@ -257995,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;
@@ -258740,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;
@@ -259551,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;
@@ -260352,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;
@@ -261183,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;
@@ -262050,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;
@@ -262937,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;
@@ -263854,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;
@@ -264851,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;
@@ -265880,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;
@@ -266985,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;
@@ -268090,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;
@@ -269195,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;
@@ -270422,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;
@@ -271675,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;
@@ -272978,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;
@@ -272988,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;
@@ -272998,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;
@@ -273008,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;
@@ -273018,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;
@@ -273028,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;
@@ -273038,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;
@@ -273048,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;
@@ -273058,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;
@@ -273068,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;
@@ -273078,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;
@@ -273088,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;
@@ -273098,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;
@@ -273108,7 +273381,7 @@ static const UV PL_INBOPOMOFO_invlist[] = { /* for all charsets */
        0x3130
 };
 
-static const UV PL_INBRAHMI_invlist[] = { /* for al