This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Change Unicode property abbrev to upcoming official
authorKarl Williamson <khw@cpan.org>
Thu, 30 Jan 2020 20:20:53 +0000 (13:20 -0700)
committerKarl Williamson <khw@cpan.org>
Thu, 30 Jan 2020 21:39:33 +0000 (14:39 -0700)
Unicode 12.0 used a new property file that was not from the Unicode
Character Database.  It only had a long property name.  I incorporated
it into our data, and rather than use the very long name all the time, I
created my own short name, since there was no official one.

Now, the upcoming 13.0 has moved the file to the UCD, and come up with a
short name that differs from the one I had.  This commit converts to use
Unicode's name.  This property is not exposed to user or XS space, so
there is no user impact.

charclass_invlists.h
lib/unicore/mktables
lib/unicore/uni_keywords.pl
regcharclass.h
regen/mk_invlists.pl
regexec.c
uni_keywords.h

index db5f37e..b490d39 100644 (file)
@@ -20360,17 +20360,17 @@ typedef enum {
        GCB_Control = 1,
        GCB_CR = 2,
        GCB_EDGE = 3,
-       GCB_Extend = 4,
-       GCB_L = 5,
-       GCB_LF = 6,
-       GCB_LV = 7,
-       GCB_LVT = 8,
-       GCB_Prepend = 9,
-       GCB_Regional_Indicator = 10,
-       GCB_SpacingMark = 11,
-       GCB_T = 12,
-       GCB_V = 13,
-       GCB_XPG_XX = 14,
+       GCB_ExtPict_XX = 4,
+       GCB_Extend = 5,
+       GCB_L = 6,
+       GCB_LF = 7,
+       GCB_LV = 8,
+       GCB_LVT = 9,
+       GCB_Prepend = 10,
+       GCB_Regional_Indicator = 11,
+       GCB_SpacingMark = 12,
+       GCB_T = 13,
+       GCB_V = 14,
        GCB_ZWJ = 15,
        GCB_E_Base = 16,
        GCB_E_Base_GAZ = 16,
@@ -20387,10 +20387,10 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -20806,97 +20806,97 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -20905,15 +20905,15 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for ASCII/Latin1 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -22095,60 +22095,60 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for ASCII/Latin1 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Regional_Indicator,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -23970,17 +23970,17 @@ typedef enum {
        GCB_Control = 1,
        GCB_CR = 2,
        GCB_EDGE = 3,
-       GCB_Extend = 4,
-       GCB_L = 5,
-       GCB_LF = 6,
-       GCB_LV = 7,
-       GCB_LVT = 8,
-       GCB_Prepend = 9,
-       GCB_Regional_Indicator = 10,
-       GCB_SpacingMark = 11,
-       GCB_T = 12,
-       GCB_V = 13,
-       GCB_XPG_XX = 14,
+       GCB_ExtPict_XX = 4,
+       GCB_Extend = 5,
+       GCB_L = 6,
+       GCB_LF = 7,
+       GCB_LV = 8,
+       GCB_LVT = 9,
+       GCB_Prepend = 10,
+       GCB_Regional_Indicator = 11,
+       GCB_SpacingMark = 12,
+       GCB_T = 13,
+       GCB_V = 14,
        GCB_ZWJ = 15,
        GCB_E_Base = 16,
        GCB_E_Base_GAZ = 16,
@@ -23995,9 +23995,9 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 1047 */
        GCB_LF,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Other,
@@ -24417,97 +24417,97 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -24516,15 +24516,15 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 1047 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -25706,60 +25706,60 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 1047 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Regional_Indicator,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -27581,17 +27581,17 @@ typedef enum {
        GCB_Control = 1,
        GCB_CR = 2,
        GCB_EDGE = 3,
-       GCB_Extend = 4,
-       GCB_L = 5,
-       GCB_LF = 6,
-       GCB_LV = 7,
-       GCB_LVT = 8,
-       GCB_Prepend = 9,
-       GCB_Regional_Indicator = 10,
-       GCB_SpacingMark = 11,
-       GCB_T = 12,
-       GCB_V = 13,
-       GCB_XPG_XX = 14,
+       GCB_ExtPict_XX = 4,
+       GCB_Extend = 5,
+       GCB_L = 6,
+       GCB_LF = 7,
+       GCB_LV = 8,
+       GCB_LVT = 9,
+       GCB_Prepend = 10,
+       GCB_Regional_Indicator = 11,
+       GCB_SpacingMark = 12,
+       GCB_T = 13,
+       GCB_V = 14,
        GCB_ZWJ = 15,
        GCB_E_Base = 16,
        GCB_E_Base_GAZ = 16,
@@ -27606,9 +27606,9 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 037 */
        GCB_LF,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Other,
@@ -28028,97 +28028,97 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 037 */
        GCB_Other,
        GCB_Control,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -28127,15 +28127,15 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 037 */
        GCB_Extend,
        GCB_Other,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Extend,
        GCB_Other,
@@ -29317,60 +29317,60 @@ static const GCB_enum _Perl_GCB_invmap[] = {  /* for EBCDIC 037 */
        GCB_Other,
        GCB_Extend,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Regional_Indicator,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Extend,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
-       GCB_XPG_XX,
+       GCB_ExtPict_XX,
        GCB_Other,
        GCB_Control,
        GCB_Extend,
@@ -86180,23 +86180,23 @@ typedef enum {
        WB_CR = 1,
        WB_Double_Quote = 2,
        WB_EDGE = 3,
-       WB_ExtendNumLet = 4,
-       WB_Extend = 5,
-       WB_Format = 6,
-       WB_Hebrew_Letter = 7,
-       WB_Perl_Tailored_HSpace = 8,
-       WB_Katakana = 9,
-       WB_ALetter = 10,
-       WB_LF = 11,
-       WB_MidNumLet = 12,
-       WB_MidLetter = 13,
-       WB_MidNum = 14,
-       WB_Newline = 15,
-       WB_Numeric = 16,
-       WB_Regional_Indicator = 17,
-       WB_Single_Quote = 18,
-       WB_XPG_LE = 19,
-       WB_XPG_XX = 20,
+       WB_ExtPict_LE = 4,
+       WB_ExtPict_XX = 5,
+       WB_ExtendNumLet = 6,
+       WB_Extend = 7,
+       WB_Format = 8,
+       WB_Hebrew_Letter = 9,
+       WB_Perl_Tailored_HSpace = 10,
+       WB_Katakana = 11,
+       WB_ALetter = 12,
+       WB_LF = 13,
+       WB_MidNumLet = 14,
+       WB_MidLetter = 15,
+       WB_MidNum = 16,
+       WB_Newline = 17,
+       WB_Numeric = 18,
+       WB_Regional_Indicator = 19,
+       WB_Single_Quote = 20,
        WB_ZWJ = 21,
        WB_E_Base = 22,
        WB_E_Base_GAZ = 22,
@@ -86236,11 +86236,11 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_Perl_Tailored_HSpace,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_ALetter,
        WB_Other,
        WB_Format,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -86956,13 +86956,13 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
@@ -86989,7 +86989,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -87000,7 +87000,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -87010,87 +87010,87 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -87140,11 +87140,11 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -87161,9 +87161,9 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_Katakana,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Katakana,
        WB_Other,
@@ -87988,65 +87988,65 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for ASCII/Latin1 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
-       WB_XPG_LE,
+       WB_ExtPict_XX,
+       WB_ExtPict_LE,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Regional_Indicator,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -89961,23 +89961,23 @@ typedef enum {
        WB_CR = 1,
        WB_Double_Quote = 2,
        WB_EDGE = 3,
-       WB_ExtendNumLet = 4,
-       WB_Extend = 5,
-       WB_Format = 6,
-       WB_Hebrew_Letter = 7,
-       WB_Perl_Tailored_HSpace = 8,
-       WB_Katakana = 9,
-       WB_ALetter = 10,
-       WB_LF = 11,
-       WB_MidNumLet = 12,
-       WB_MidLetter = 13,
-       WB_MidNum = 14,
-       WB_Newline = 15,
-       WB_Numeric = 16,
-       WB_Regional_Indicator = 17,
-       WB_Single_Quote = 18,
-       WB_XPG_LE = 19,
-       WB_XPG_XX = 20,
+       WB_ExtPict_LE = 4,
+       WB_ExtPict_XX = 5,
+       WB_ExtendNumLet = 6,
+       WB_Extend = 7,
+       WB_Format = 8,
+       WB_Hebrew_Letter = 9,
+       WB_Perl_Tailored_HSpace = 10,
+       WB_Katakana = 11,
+       WB_ALetter = 12,
+       WB_LF = 13,
+       WB_MidNumLet = 14,
+       WB_MidLetter = 15,
+       WB_MidNum = 16,
+       WB_Newline = 17,
+       WB_Numeric = 18,
+       WB_Regional_Indicator = 19,
+       WB_Single_Quote = 20,
        WB_ZWJ = 21,
        WB_E_Base = 22,
        WB_E_Base_GAZ = 22,
@@ -90034,10 +90034,10 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_MidLetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90760,13 +90760,13 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
@@ -90793,7 +90793,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90804,7 +90804,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90814,87 +90814,87 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -90944,11 +90944,11 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -90965,9 +90965,9 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Other,
        WB_Katakana,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Katakana,
        WB_Other,
@@ -91792,65 +91792,65 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 1047 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
-       WB_XPG_LE,
+       WB_ExtPict_XX,
+       WB_ExtPict_LE,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Regional_Indicator,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -93761,23 +93761,23 @@ typedef enum {
        WB_CR = 1,
        WB_Double_Quote = 2,
        WB_EDGE = 3,
-       WB_ExtendNumLet = 4,
-       WB_Extend = 5,
-       WB_Format = 6,
-       WB_Hebrew_Letter = 7,
-       WB_Perl_Tailored_HSpace = 8,
-       WB_Katakana = 9,
-       WB_ALetter = 10,
-       WB_LF = 11,
-       WB_MidNumLet = 12,
-       WB_MidLetter = 13,
-       WB_MidNum = 14,
-       WB_Newline = 15,
-       WB_Numeric = 16,
-       WB_Regional_Indicator = 17,
-       WB_Single_Quote = 18,
-       WB_XPG_LE = 19,
-       WB_XPG_XX = 20,
+       WB_ExtPict_LE = 4,
+       WB_ExtPict_XX = 5,
+       WB_ExtendNumLet = 6,
+       WB_Extend = 7,
+       WB_Format = 8,
+       WB_Hebrew_Letter = 9,
+       WB_Perl_Tailored_HSpace = 10,
+       WB_Katakana = 11,
+       WB_ALetter = 12,
+       WB_LF = 13,
+       WB_MidNumLet = 14,
+       WB_MidLetter = 15,
+       WB_MidNum = 16,
+       WB_Newline = 17,
+       WB_Numeric = 18,
+       WB_Regional_Indicator = 19,
+       WB_Single_Quote = 20,
        WB_ZWJ = 21,
        WB_E_Base = 22,
        WB_E_Base_GAZ = 22,
@@ -93832,10 +93832,10 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_MidLetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Format,
@@ -94556,13 +94556,13 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Format,
        WB_ExtendNumLet,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
        WB_MidNum,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ExtendNumLet,
        WB_Other,
@@ -94589,7 +94589,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -94600,7 +94600,7 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -94610,87 +94610,87 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_ALetter,
        WB_Other,
@@ -94740,11 +94740,11 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_ALetter,
        WB_Other,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Katakana,
        WB_Other,
        WB_ALetter,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Extend,
        WB_Katakana,
@@ -94761,9 +94761,9 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Other,
        WB_Katakana,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Katakana,
        WB_Other,
@@ -95588,65 +95588,65 @@ static const WB_enum _Perl_WB_invmap[] = {  /* for EBCDIC 037 */
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_ALetter,
        WB_Other,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
-       WB_XPG_LE,
+       WB_ExtPict_XX,
+       WB_ExtPict_LE,
        WB_ALetter,
-       WB_XPG_LE,
+       WB_ExtPict_LE,
        WB_ALetter,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Regional_Indicator,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Extend,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
-       WB_XPG_XX,
+       WB_ExtPict_XX,
        WB_Other,
        WB_Format,
        WB_Other,
@@ -394993,27 +394993,27 @@ UNI_wb_values
 #define GCB_Maybe_Emoji_NonBreak   4
 
 static const U8 GCB_table[17][17] = {
-   /* 'edg' stands for 'EDGE'; 'XPG' stands for 'XPG_XX'; u stands
-    * for 'unused in this Unicode release (and the data in its row
-    * and column are garbage) */
-/*        XX CN CR edg EX  L LF LV LVT PP RI SM  T  V XPG ZWJ  u */
-/* XX */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0, 1 },
-/* CN */ { 1, 1, 1,  1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1, 1 },
-/* CR */ { 1, 1, 1,  1, 1, 1, 0, 1,  1, 1, 1, 1, 1, 1,  1,  1, 1 },
-/* edg*/ { 1, 1, 1,  0, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1, 1 },
-/* EX */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0, 3 },
-/* L  */ { 1, 1, 1,  1, 0, 0, 1, 0,  0, 1, 1, 0, 1, 0,  1,  0, 1 },
-/* LF */ { 1, 1, 1,  1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1,  1, 1 },
-/* LV */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1,  0, 1 },
-/* LVT*/ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1,  0, 1 },
-/* PP */ { 0, 1, 1,  1, 0, 0, 1, 0,  0, 0, 0, 0, 0, 0,  0,  0, 0 },
-/* RI */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 2, 0, 1, 1,  1,  0, 1 },
-/* SM */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0, 1 },
-/* T  */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1,  0, 1 },
-/* V  */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1,  0, 1 },
-/* XPG*/ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0, 1 },
-/* ZWJ*/ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  4,  0, 0 },
-/* u  */ { 1, 1, 1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1,  0, 0 }
+   /* 'edg' stands for 'EDGE'; 'EPX' stands for 'ExtPict_XX'; u
+    * stands for 'unused in this Unicode release (and the data in
+    * its row and column are garbage) */
+/*        XX CN CR edg EPX EX  L LF LV LVT PP RI SM  T  V ZWJ  u */
+/* XX */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 1 },
+/* CN */ { 1, 1, 1,  1,  1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1, 1 },
+/* CR */ { 1, 1, 1,  1,  1, 1, 1, 0, 1,  1, 1, 1, 1, 1, 1,  1, 1 },
+/* edg*/ { 1, 1, 1,  0,  1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1, 1 },
+/* EPX*/ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 1 },
+/* EX */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 3 },
+/* L  */ { 1, 1, 1,  1,  1, 0, 0, 1, 0,  0, 1, 1, 0, 1, 0,  0, 1 },
+/* LF */ { 1, 1, 1,  1,  1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1, 1 },
+/* LV */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  0, 1 },
+/* LVT*/ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  0, 1 },
+/* PP */ { 0, 1, 1,  1,  0, 0, 0, 1, 0,  0, 0, 0, 0, 0, 0,  0, 0 },
+/* RI */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 2, 0, 1, 1,  0, 1 },
+/* SM */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 1 },
+/* T  */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  0, 1 },
+/* V  */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  0, 1 },
+/* ZWJ*/ { 1, 1, 1,  1,  4, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 0 },
+/* u  */ { 1, 1, 1,  1,  1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  0, 0 }
 };
 
 #define LB_NOBREAK                        0
@@ -395084,34 +395084,34 @@ static const U8 LB_table[39][39] = {
 #define WB_RI_then_RI                    16
 
 static const U8 WB_table[23][23] = {
-   /* 'edg' stands for 'EDGE'; 'Ext' stands for 'Extend'; 'hs' stands for
-    * 'Perl_Tailored_HSpace'; 'XPG' stands for 'XPG_LE'; 'XPH' stands for 'XPG_XX'; u
-    * stands for 'unused in this Unicode release (and the data in its row and column
+   /* 'edg' stands for 'EDGE'; 'EPL' stands for 'ExtPict_LE'; 'EPX' stands for
+    * 'ExtPict_XX'; 'Ext' stands for 'Extend'; 'hs' stands for 'Perl_Tailored_HSpace';
+    * stands for 'unused in this Unicode release (and the data in its row and column
     * are garbage) */
-/*        XX CR DQ edg EX Ext FO HL hs KA LE LF MB ML MN NL NU RI SQ XPG XPH ZWJ  u */
-/* XX */ { 1, 1, 1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0, 1 },
-/* CR */ { 1, 0, 1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1,  1,  1, 1 },
-/* DQ */ { 1, 1, 1,  1, 1,  0, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0, 1 },
-/* edg*/ { 1, 1, 1,  0, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  1, 1 },
-/* EX */ { 1, 1, 1,  1, 0,  0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1,  0,  1,  0, 1 },
-/* Ext*/ { 3, 1, 3,  1, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  3,  3,  0, 3 },
-/* FO */ { 3, 1, 3,  1, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  3,  3,  0, 3 },
-/* HL */ { 1, 1, 7,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 8,  0,  1,  0, 1 },
-/* hs */ { 1, 0, 1,  1, 1,  0, 0, 1, 2, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1,  1,  0, 1 },
-/* KA */ { 1, 1, 1,  1, 0,  0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0, 1 },
-/* LE */ { 1, 1, 1,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 9,  1,  1,  0, 1 },
-/* LF */ { 1, 0, 1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1,  1,  1, 1 },
-/* MB */ { 1, 1, 1,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1,13, 1, 1, 11,  1,  0, 1 },
-/* ML */ { 1, 1, 1,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1, 1, 1, 1, 11,  1,  0, 1 },
-/* MN */ { 1, 1, 1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,13, 1, 1,  1,  1,  0, 1 },
-/* NL */ { 1, 0, 1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1,  1,  1, 1 },
-/* NU */ { 1, 1, 1,  1, 0,  0, 0, 0, 1, 1, 0, 1,15, 1,15, 1, 0, 1,15,  0,  1,  0, 1 },
-/* RI */ { 1, 1, 1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,16, 1,  1,  1,  0, 1 },
-/* SQ */ { 1, 1, 1,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1,13, 1, 1, 11,  1,  0, 1 },
-/* XPG*/ { 1, 1, 1,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 9,  0,  1,  0, 1 },
-/* XPH*/ { 1, 1, 1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0, 1 },
-/* ZWJ*/ { 3, 1, 3,  1, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  0,  0,  0, 0 },
-/* u  */ { 1, 1, 1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,  1,  0, 0 }
+/*        XX CR DQ edg EPL EPX EX Ext FO HL hs KA LE LF MB ML MN NL NU RI SQ ZWJ  u */
+/* XX */ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0, 1 },
+/* CR */ { 1, 0, 1,  1,  1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1, 1 },
+/* DQ */ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0, 1 },
+/* edg*/ { 1, 1, 1,  0,  1,  1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1, 1 },
+/* EPL*/ { 1, 1, 1,  1,  0,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 9,  0, 1 },
+/* EPX*/ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0, 1 },
+/* EX */ { 1, 1, 1,  1,  0,  1, 0,  0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1,  0, 1 },
+/* Ext*/ { 3, 1, 3,  1,  3,  3, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  0, 3 },
+/* FO */ { 3, 1, 3,  1,  3,  3, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  0, 3 },
+/* HL */ { 1, 1, 7,  1,  0,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 8,  0, 1 },
+/* hs */ { 1, 0, 1,  1,  1,  1, 1,  0, 0, 1, 2, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  0, 1 },
+/* KA */ { 1, 1, 1,  1,  1,  1, 0,  0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0, 1 },
+/* LE */ { 1, 1, 1,  1,  1,  1, 0,  0, 0, 0, 1, 1, 0, 1, 9, 9, 1, 1, 0, 1, 9,  0, 1 },
+/* LF */ { 1, 0, 1,  1,  1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1, 1 },
+/* MB */ { 1, 1, 1,  1, 11,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1,13, 1, 1,  0, 1 },
+/* ML */ { 1, 1, 1,  1, 11,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1, 1, 1, 1,  0, 1 },
+/* MN */ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,13, 1, 1,  0, 1 },
+/* NL */ { 1, 0, 1,  1,  1,  1, 1,  1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,  1, 1 },
+/* NU */ { 1, 1, 1,  1,  0,  1, 0,  0, 0, 0, 1, 1, 0, 1,15, 1,15, 1, 0, 1,15,  0, 1 },
+/* RI */ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,16, 1,  0, 1 },
+/* SQ */ { 1, 1, 1,  1, 11,  1, 1,  0, 0,11, 1, 1,11, 1, 1, 1, 1, 1,13, 1, 1,  0, 1 },
+/* ZWJ*/ { 3, 1, 3,  1,  0,  0, 3,  0, 0, 3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 3,  0, 0 },
+/* u  */ { 1, 1, 1,  1,  1,  1, 1,  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0, 0 }
 };
 
 #endif /* defined(PERL_IN_REGEXEC_C) */
@@ -395170,9 +395170,9 @@ static const U8 WB_table[23][23] = {
  * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt
  * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt
  * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt
- * 498da0b9ef6a52bfd71bda5771005bbe4cfc37b456d9d350cd840991eb80c8b1 lib/unicore/mktables
+ * 4fb7a1a372a4accb33aca190dc4d210cd68f5607f45e5a37d84b710ef056a542 lib/unicore/mktables
  * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version
  * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl
  * 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl
- * e9a592b418a84dce6d70d67180ae0fdfc08496c4030e6f52e19cd45d0f27fbbd regen/mk_invlists.pl
+ * ffb4395ffaf29673516afee98e454a12752081982090ab443bdb8b37d219cdf4 regen/mk_invlists.pl
  * ex: set ro: */
index 6be1f41..6d48dca 100644 (file)
@@ -13520,7 +13520,7 @@ sub  filter_script_extensions_line {
 }
 
 sub setup_emojidata {
-    my $prop_ref = Property->new('XPG',
+    my $prop_ref = Property->new('ExtPict',
                                  Full_Name => 'Extended_Pictographic',
     );
     $prop_ref->set_fate($PLACEHOLDER,
@@ -15556,7 +15556,7 @@ END
     # created equivalence class whose name is a combination of the property
     # and the old class name, leaving unchanged everything that doesn't match
     # the non-UCD property.
-    my $pictographic_emoji = property_ref('XPG');
+    my $pictographic_emoji = property_ref('ExtPict');
     if (defined $pictographic_emoji) {
         foreach my $base_property (property_ref('GCB'),
                                    property_ref('WB'))
@@ -15566,7 +15566,7 @@ END
                 foreach my $i ($range->start .. $range->end) {
                     my $current = $property->value_of($i);
                     $current = $property->table($current)->short_name;
-                    $property->add_map($i, $i, 'XPG_' . $current,
+                    $property->add_map($i, $i, 'ExtPict_' . $current,
                                        Replace => $UNCONDITIONALLY);
                 }
             }
index 20ce838..fb4ce62 100644 (file)
 # 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt
 # 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt
 # 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt
-# 498da0b9ef6a52bfd71bda5771005bbe4cfc37b456d9d350cd840991eb80c8b1 lib/unicore/mktables
+# 4fb7a1a372a4accb33aca190dc4d210cd68f5607f45e5a37d84b710ef056a542 lib/unicore/mktables
 # a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version
 # 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl
 # 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl
-# e9a592b418a84dce6d70d67180ae0fdfc08496c4030e6f52e19cd45d0f27fbbd regen/mk_invlists.pl
+# ffb4395ffaf29673516afee98e454a12752081982090ab443bdb8b37d219cdf4 regen/mk_invlists.pl
 # ex: set ro:
index 1bd317c..c490787 100644 (file)
  * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt
  * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt
  * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt
- * 498da0b9ef6a52bfd71bda5771005bbe4cfc37b456d9d350cd840991eb80c8b1 lib/unicore/mktables
+ * 4fb7a1a372a4accb33aca190dc4d210cd68f5607f45e5a37d84b710ef056a542 lib/unicore/mktables
  * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version
  * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl
  * f9a393e7add8c7c2728356473ce5b52246d51295b2da0c48fb6f0aa21799e2bb regen/regcharclass.pl
index a4bc575..faf7d88 100644 (file)
@@ -1375,7 +1375,7 @@ sub output_GCB_table() {
 
     # Post 11.0: GB11  \p{Extended_Pictographic} Extend* ZWJ
     #                                               × \p{Extended_Pictographic}
-    $gcb_table[$gcb_enums{'ZWJ'}][$gcb_enums{'XPG_XX'}] =
+    $gcb_table[$gcb_enums{'ZWJ'}][$gcb_enums{'ExtPict_XX'}] =
                                          $gcb_actions{GCB_Maybe_Emoji_NonBreak};
 
     # This and the rule GB10 obsolete starting with Unicode 11.0, can be left
@@ -2136,7 +2136,7 @@ sub output_WB_table() {
     # WB13b  ExtendNumLet  ×  (ALetter | Hebrew_Letter | Numeric | Katakana)
     $wb_table[$wb_enums{'ExtendNumLet'}][$wb_enums{'ALetter'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'ExtendNumLet'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'ExtendNumLet'}][$wb_enums{'ExtPict_LE'}]
                                                 = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'ExtendNumLet'}][$wb_enums{'Hebrew_Letter'}]
                                                 = $wb_actions{'WB_NOBREAK'};
@@ -2149,7 +2149,7 @@ sub output_WB_table() {
     #        × ExtendNumLet
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'ExtendNumLet'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'ExtendNumLet'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'ExtendNumLet'}]
                                                 = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'ExtendNumLet'}]
                                                 = $wb_actions{'WB_NOBREAK'};
@@ -2187,7 +2187,7 @@ sub output_WB_table() {
     # WB10  Numeric  ×  (ALetter | Hebrew_Letter)
     $wb_table[$wb_enums{'Numeric'}][$wb_enums{'ALetter'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'Numeric'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'Numeric'}][$wb_enums{'ExtPict_LE'}]
                                                 = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'Numeric'}][$wb_enums{'Hebrew_Letter'}]
                                                 = $wb_actions{'WB_NOBREAK'};
@@ -2195,7 +2195,7 @@ sub output_WB_table() {
     # WB9  (ALetter | Hebrew_Letter)  ×  Numeric
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'Numeric'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'Numeric'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'Numeric'}]
                                                 = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'Numeric'}]
                                                 = $wb_actions{'WB_NOBREAK'};
@@ -2221,19 +2221,19 @@ sub output_WB_table() {
     #       × (ALetter | Hebrew_Letter)
     $wb_table[$wb_enums{'MidNumLet'}][$wb_enums{'ALetter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
-    $wb_table[$wb_enums{'MidNumLet'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'MidNumLet'}][$wb_enums{'ExtPict_LE'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
     $wb_table[$wb_enums{'MidNumLet'}][$wb_enums{'Hebrew_Letter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
     $wb_table[$wb_enums{'MidLetter'}][$wb_enums{'ALetter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
-    $wb_table[$wb_enums{'MidLetter'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'MidLetter'}][$wb_enums{'ExtPict_LE'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
     $wb_table[$wb_enums{'MidLetter'}][$wb_enums{'Hebrew_Letter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
     $wb_table[$wb_enums{'Single_Quote'}][$wb_enums{'ALetter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
-    $wb_table[$wb_enums{'Single_Quote'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'Single_Quote'}][$wb_enums{'ExtPict_LE'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
     $wb_table[$wb_enums{'Single_Quote'}][$wb_enums{'Hebrew_Letter'}]
                             += $wb_actions{'WB_MB_or_ML_or_SQ_then_LE_or_HL'};
@@ -2242,19 +2242,19 @@ sub output_WB_table() {
     #       | Single_Quote) (ALetter | Hebrew_Letter)
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'MidNumLet'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'MidNumLet'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'MidNumLet'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'MidNumLet'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'MidLetter'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'MidLetter'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'MidLetter'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'MidLetter'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'Single_Quote'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'Single_Quote'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'Single_Quote'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'Single_Quote'}]
                             += $wb_actions{'WB_LE_or_HL_then_MB_or_ML_or_SQ'};
@@ -2263,19 +2263,19 @@ sub output_WB_table() {
     # WB5  (ALetter | Hebrew_Letter)  ×  (ALetter | Hebrew_Letter)
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'ALetter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'ALetter'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'ALetter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'ALetter'}][$wb_enums{'Hebrew_Letter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'Hebrew_Letter'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'Hebrew_Letter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'ALetter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'ExtPict_LE'}]
                                                     = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'Hebrew_Letter'}][$wb_enums{'Hebrew_Letter'}]
                                                     = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'XPG_LE'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'ExtPict_LE'}][$wb_enums{'ExtPict_LE'}]
                                                     = $wb_actions{'WB_NOBREAK'};
 
     # Ignore Format and Extend characters, except after sot, CR, LF, and
@@ -2316,9 +2316,9 @@ sub output_WB_table() {
                                                 = $wb_actions{'WB_NOBREAK'};
     $wb_table[$wb_enums{'ZWJ'}][$wb_enums{'E_Base_GAZ'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'ZWJ'}][$wb_enums{'XPG_XX'}]
+    $wb_table[$wb_enums{'ZWJ'}][$wb_enums{'ExtPict_XX'}]
                                                 = $wb_actions{'WB_NOBREAK'};
-    $wb_table[$wb_enums{'ZWJ'}][$wb_enums{'XPG_LE'}]
+    $wb_table[$wb_enums{'ZWJ'}][$wb_enums{'ExtPict_LE'}]
                                                 = $wb_actions{'WB_NOBREAK'};
 
     # Break before and after newlines
@@ -2426,10 +2426,10 @@ no warnings 'qw';
 my @props;
 push @props, sort { prop_name_for_cmp($a) cmp prop_name_for_cmp($b) } qw(
                     &UpperLatin1
-                    _Perl_GCB,EDGE,E_Base,E_Base_GAZ,E_Modifier,Glue_After_Zwj,LV,Prepend,Regional_Indicator,SpacingMark,ZWJ,XPG_XX
+                    _Perl_GCB,EDGE,E_Base,E_Base_GAZ,E_Modifier,Glue_After_Zwj,LV,Prepend,Regional_Indicator,SpacingMark,ZWJ,ExtPict_XX
                     _Perl_LB,EDGE,Close_Parenthesis,Hebrew_Letter,Next_Line,Regional_Indicator,ZWJ,Contingent_Break,E_Base,E_Modifier,H2,H3,JL,JT,JV,Word_Joiner
                     _Perl_SB,EDGE,SContinue,CR,Extend,LF
-                    _Perl_WB,Perl_Tailored_HSpace,EDGE,UNKNOWN,CR,Double_Quote,E_Base,E_Base_GAZ,E_Modifier,Extend,Glue_After_Zwj,Hebrew_Letter,LF,MidNumLet,Newline,Regional_Indicator,Single_Quote,ZWJ,XPG_XX,XPG_LE
+                    _Perl_WB,Perl_Tailored_HSpace,EDGE,UNKNOWN,CR,Double_Quote,E_Base,E_Base_GAZ,E_Modifier,Extend,Glue_After_Zwj,Hebrew_Letter,LF,MidNumLet,Newline,Regional_Indicator,Single_Quote,ZWJ,ExtPict_XX,ExtPict_LE
                     _Perl_SCX,Latin,Inherited,Unknown,Kore,Jpan,Hanb,INVALID
                     Lowercase_Mapping
                     Titlecase_Mapping
index 2ff6bb3..59e8fdd 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -4588,7 +4588,7 @@ S_isGCB(pTHX_ const GCB_enum before, const GCB_enum after, const U8 * const strb
                 }
                 while (prev == GCB_Extend);
 
-                return prev != GCB_XPG_XX;
+                return prev != GCB_ExtPict_XX;
             }
 
         default:
index 95b333b..734ed9d 100644 (file)
@@ -7283,10 +7283,10 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) {
  * 78e2600e24fa7d5ab62117de50b382f8b31b08401c37a0782c38dacb340b64e7 lib/unicore/extracted/DLineBreak.txt
  * 1bde4ad73e271c6349fbd1972e54f38bba5cc1900c28f678e79b9e8909b31793 lib/unicore/extracted/DNumType.txt
  * 6278722699123f3890e4b1cc42011e96d8960e4958a3b93484361530983d2611 lib/unicore/extracted/DNumValues.txt
- * 498da0b9ef6a52bfd71bda5771005bbe4cfc37b456d9d350cd840991eb80c8b1 lib/unicore/mktables
+ * 4fb7a1a372a4accb33aca190dc4d210cd68f5607f45e5a37d84b710ef056a542 lib/unicore/mktables
  * a712c758275b460d18fa77a26ed3589689bb3f69dcc1ea99b913e32db92a5cd2 lib/unicore/version
  * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl
  * 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl
- * e9a592b418a84dce6d70d67180ae0fdfc08496c4030e6f52e19cd45d0f27fbbd regen/mk_invlists.pl
+ * ffb4395ffaf29673516afee98e454a12752081982090ab443bdb8b37d219cdf4 regen/mk_invlists.pl
  * cf1d68efb7d919d302c4005641eae8d36da6d7850816ad374b0c00b45e609f43 regen/mph.pl
  * ex: set ro: */