Update to Unicode 14.0.0.

* lib/gen-uni-tables.c (UC_JOINING_GROUP_THIN_YEH,
UC_JOINING_GROUP_VERTICAL_TAIL): New enum values.
(fill_arabicshaping, joining_group_as_c_identifier): Recognize these
joining groups.
* lib/unictype.in.h (UC_JOINING_GROUP_THIN_YEH,
UC_JOINING_GROUP_VERTICAL_TAIL): New enum values.
* lib/unictype/joininggroup_name.h: Add the THIN_YEH, VERTICAL_TAIL
joining groups.
* lib/unictype/joininggroup_byname.gperf: Likewise.

* lib/gen-uni-tables.c (LBP_ID1, LBP_ID2): New enum values.
(LBP_ID): Assign artificial value.
(get_lbp): Use the extended_pictographic property to assign LBP_ID1,
LBP_ID2 instead of LBP_ID. Update such that unilbrk/lbrkprop.txt comes
out as expected.
(debug_output_lbp): Print either LBP_ID1 or LBP_ID2 as LBP_ID.
(lbp_value_to_string): Handle LBP_ID1, LBP_ID2 instead of LBP_ID.
(output_lbrk_rules_as_tables): Treat LBP_ID as macro that maps to two
table rows/columns. In rule LB30b, use LBP_ID2 in addition to LBP_EB.
Remove redundant part of rule LB27.
* lib/unilbrk/lbrktables.h (LBP_ID1, LBP_ID2): New enum values.
(LBP_ID): Remove enum value.
(unilbrk_table): Update declaration.
* lib/unilbrk/u8-possible-linebreaks.c (u8_possible_linebreaks_loop):
Use LBP_ID1 instead of LBP_ID.
* lib/unilbrk/u16-possible-linebreaks.c (u16_possible_linebreaks_loop):
Likewise.
* lib/unilbrk/u32-possible-linebreaks.c (u32_possible_linebreaks_loop):
Likewise.
* tests/unilbrk/test-u8-possible-linebreaks.c (test_function): Add a
test of potential future emoji.
* tests/unilbrk/test-u16-possible-linebreaks.c (test_function):
Likewise.
* tests/unilbrk/test-u32-possible-linebreaks.c (test_function):
Likewise.

* lib/uniwidth/width.c (nonspacing_table_data, nonspacing_table_ind):
Update.
(uc_width): Assign width 2 to the characters 0x1AFF0..0x1AFF3,
0x1AFF5..0x1AFFB, 0x1AFFD..0x1AFFE, 0x1B120..0x1B122, 0x1F6DD..0x1F6DF,
0x1F7F0, 0x1FA7B..0x1FA7C, 0x1FAA9..0x1FAAC, 0x1FAB7..0x1FABA,
0x1FAC3..0x1FAC5, 0x1FAD7..0x1FAD9, 0x1FAE0..0x1FAE7, 0x1FAF0..0x1FAF6.
* tests/uniwidth/test-uc_width2.sh: Expect width 0 for the characters
0x0890..0x0891, 0x0898..0x089F, 0x08CA..0x0902, 0x0C3C, 0x180F,
0x1AC1..0x1ACE, 0x1DFA, 0x10F82..0x10F85, 0x11070, 0x11073..0x11074,
0x110C2, 0x1CF00..0x1CF2D, 0x1CF30..0x1CF46, 0x1E2AE. Expect ambiguous
width for the character 0x1734. Expect width 2 for the characters
0x1AFF0..0x1AFF3, 0x1AFF5..0x1AFFB, 0x1AFFD..0x1AFFE, 0x1B120..0x1B122,
0x1F6DD..0x1F6DF, 0x1F7F0, 0x1FA7B..0x1FA7C, 0x1FAA9..0x1FAAC,
0x1FAB7..0x1FABA, 0x1FAC3..0x1FAC5, 0x1FAD7..0x1FAD9, 0x1FAE0..0x1FAE7,
0x1FAF0..0x1FAF6.

* All generated files under lib/uni* and tests/uni*: Regenerate.
* tests/uniname/NameAliases.txt: Update.
* tests/uniname/UnicodeData.txt: Update.
* tests/uninorm/NormalizationTest.txt: Update.
* tests/unigbrk/GraphemeBreakTest.txt: Update.
* tests/uniwbrk/WordBreakTest.txt: Update.

* All the affected modules: Bump required libunistring version.

1 files changed, 105 insertions, 41 deletions

diff --git a/lib/unigbrk/gbrkprop.h b/lib/unigbrk/gbrkprop.h
index e7c483c112..f509376e4e 100644
--- a/lib/unigbrk/gbrkprop.h
+++ b/lib/unigbrk/gbrkprop.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Grapheme break property of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 13.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 14.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
   {
     int level1[15];
     short level2[3 << 9];
-    unsigned char level3[122 << 7];
+    unsigned char level3[124 << 7];
   }
 unigbrkprop =
 {
@@ -111,17 +111,17 @@ unigbrkprop =
        -1,    -1,    -1,  8960,    -1,  9088,  9216,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,  9344,  9472,    -1,    -1,
-       -1,    -1,  9600,    -1,    -1,  9728,  9856,    -1,
-     9984, 10112, 10240, 10368, 10496, 10624, 10752,    -1,
-    10880, 11008,    -1, 11136, 11264, 11392, 11520,    -1,
-    11648,    -1, 11776, 11904, 12032, 12160,    -1,    -1,
-    12288, 12416, 12544, 12672,    -1, 12800,    -1,    -1,
+       -1,    -1,  9600,    -1,    -1,  9728,  9856,  9984,
+    10112, 10240, 10368, 10496, 10624, 10752, 10880,    -1,
+    11008, 11136,    -1, 11264, 11392, 11520, 11648,    -1,
+    11776,    -1, 11904, 12032, 12160, 12288,    -1,    -1,
+    12416, 12544, 12672, 12800,    -1, 12928,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    12928,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    13056,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -134,8 +134,8 @@ unigbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1, 13056, 13184,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1, 13312, 13440,
+       -1,    -1,    -1,    -1,    -1, 13184, 13312,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 13440, 13568,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -155,27 +155,27 @@ unigbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 13568,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 13696,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 13824,    -1,
+       -1,    -1, 13952, 14080, 14208,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 13696, 13824, 13952,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 14336, 14464,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 14080, 14208,    -1,    -1,
+    14592,    -1, 13312,    -1,    -1, 14720,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    14336,    -1, 13184,    -1,    -1, 14464,    -1,    -1,
+       -1, 14848, 14976,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 14592, 14720,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1, 15104,    -1,    -1,    -1, 15232,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1, 14848,    -1,    -1,    -1, 14976,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    15104, 15232, 15360, 15488, 15232, 15232, 15232, 15232,
-    15232, 15232, 15232, 15232, 15232, 15232, 15232, 15232,
-    15232, 15232, 15232, 15232, 15232, 15232, 15232, 15232,
-    15232, 15232, 15232, 15232, 15232, 15232, 15232, 15232,
+    15360, 15488, 15616, 15744, 15488, 15488, 15488, 15488,
+    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
+    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
+    15488, 15488, 15488, 15488, 15488, 15488, 15488, 15488,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -562,7 +562,10 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_PREPEND, GBP_PREPEND, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -573,12 +576,9 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
@@ -797,7 +797,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_SPACINGMARK, GBP_SPACINGMARK, GBP_SPACINGMARK,
     GBP_SPACINGMARK, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
@@ -1203,7 +1203,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
-    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_SPACINGMARK, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1211,7 +1211,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
-    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_SPACINGMARK, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1265,7 +1265,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
-    GBP_EXTEND, GBP_EXTEND, GBP_CONTROL, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_CONTROL, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1406,10 +1406,10 @@ unigbrkprop =
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
-    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1580,7 +1580,7 @@ unigbrkprop =
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
-    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -2734,6 +2734,38 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_SPACINGMARK, GBP_EXTEND, GBP_SPACINGMARK, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -2762,8 +2794,8 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
+    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_SPACINGMARK, GBP_OTHER,
@@ -2782,7 +2814,7 @@ unigbrkprop =
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_SPACINGMARK,
     GBP_SPACINGMARK, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_PREPEND, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_PREPEND, GBP_OTHER, GBP_OTHER,
@@ -3126,7 +3158,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
-    GBP_SPACINGMARK, GBP_SPACINGMARK, GBP_EXTEND, GBP_EXTEND,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_SPACINGMARK, GBP_EXTEND,
     GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3662,6 +3694,38 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3865,7 +3929,7 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,