Update to Unicode 10.0.0.

* lib/gen-uni-tables.c (PROP_REGIONAL_INDICATOR): New enum value. (fill_properties): Recognize property "Regional_Indicator". (is_property_regional_indicator): New function. (output_properties): Also output the data for regional_indicator. (UC_JOINING_GROUP_MALAYALAM_*): New enum values. (fill_arabicshaping, joining_group_as_c_identifier): Recognize these joining groups. * lib/unictype/pr_regional_indicator.c: New file. * modules/unictype/property-regional-indicator: New file. * modules/unictype/property-regional-indicator-tests: New file. * modules/unictype/property-all (Depends-on): Add unictype/property-regional-indicator. * lib/unictype.in.h (UC_JOINING_GROUP_MALAYALAM_*): New enum values. * lib/unictype/joininggroup_name.h: Add the MALAYALAM_* joining groups. * lib/unictype/joininggroup_byname.gperf: Likewise. * lib/uniwidth/width.c (nonspacing_table_data, nonspacing_table_ind): Update. * tests/uniwidth/test-uc_width2.sh: Update. * 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.
author: Bruno Haible <bruno@clisp.org> 2021-12-26 17:48:24 +0100
committer: Bruno Haible <bruno@clisp.org> 2021-12-26 17:48:24 +0100
commit: 499a4fa2a470c5ad52fabc4cb9f70e8230b79a44 (patch)
tree: a1774b973e94b4ddffbdf50f5603993be202855a
parent: 39685a37f6e2ee6b4329da607a30073f466d2262 (diff)
download: gnulib-499a4fa2a470c5ad52fabc4cb9f70e8230b79a44.tar.gz
427 files changed, 7249 insertions, 4468 deletions
diff --git a/ChangeLog b/ChangeLog
index 153e36296d..02ab2f2704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2021-12-26  Bruno Haible  <bruno@clisp.org>
 
+	Update to Unicode 10.0.0.
+
+	* lib/gen-uni-tables.c (PROP_REGIONAL_INDICATOR): New enum value.
+	(fill_properties): Recognize property "Regional_Indicator".
+	(is_property_regional_indicator): New function.
+	(output_properties): Also output the data for regional_indicator.
+	(UC_JOINING_GROUP_MALAYALAM_*): New enum values.
+	(fill_arabicshaping, joining_group_as_c_identifier): Recognize these
+	joining groups.
+
+	* lib/unictype/pr_regional_indicator.c: New file.
+	* modules/unictype/property-regional-indicator: New file.
+	* modules/unictype/property-regional-indicator-tests: New file.
+	* modules/unictype/property-all (Depends-on): Add
+	unictype/property-regional-indicator.
+
+	* lib/unictype.in.h (UC_JOINING_GROUP_MALAYALAM_*): New enum values.
+	* lib/unictype/joininggroup_name.h: Add the MALAYALAM_* joining groups.
+	* lib/unictype/joininggroup_byname.gperf: Likewise.
+
+	* lib/uniwidth/width.c (nonspacing_table_data, nonspacing_table_ind):
+	Update.
+	* tests/uniwidth/test-uc_width2.sh: Update.
+
+	* 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.
+
+2021-12-26  Bruno Haible  <bruno@clisp.org>
+
 	pselect: Fix compilation error in C++ mode on AIX 7.
 	* lib/sys_select.in.h (pselect): Use _GL_CXXALIAS_SYS_CAST instead of
 	_GL_CXXALIAS_SYS.
diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c
index e98d843cd0..29b928a9bf 100644
--- a/lib/gen-uni-tables.c
+++ b/lib/gen-uni-tables.c
@@ -18,21 +18,21 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Usage example:
-     $ gen-uni-tables /usr/local/share/www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/PropList.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/DerivedCoreProperties.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/ArabicShaping.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/Scripts.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/Blocks.txt \
+     $ gen-uni-tables /usr/local/share/www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/PropList.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/DerivedCoreProperties.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/ArabicShaping.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/Scripts.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/Blocks.txt \
                       /usr/local/share/www.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/EastAsianWidth.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/LineBreak.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/auxiliary/WordBreakProperty.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/SpecialCasing.txt \
-                      /usr/local/share/www.unicode.org/Public/9.0.0/ucd/CaseFolding.txt \
-                      9.0.0
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/EastAsianWidth.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/LineBreak.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/auxiliary/WordBreakProperty.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/CompositionExclusions.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/SpecialCasing.txt \
+                      /usr/local/share/www.unicode.org/Public/10.0.0/ucd/CaseFolding.txt \
+                      10.0.0
  */
 
 #include <assert.h>
@@ -2716,6 +2716,7 @@ enum
   PROP_PATTERN_WHITE_SPACE,
   PROP_PATTERN_SYNTAX,
   PROP_PREPENDED_CONCATENATION_MARK,
+  PROP_REGIONAL_INDICATOR,
   /* DerivedCoreProperties.txt */
   PROP_MATH,
   PROP_ALPHABETIC,
@@ -2822,6 +2823,7 @@ fill_properties (const char *proplist_filename)
       PROP ("Pattern_White_Space", PROP_PATTERN_WHITE_SPACE)
       PROP ("Pattern_Syntax", PROP_PATTERN_SYNTAX)
       PROP ("Prepended_Concatenation_Mark", PROP_PREPENDED_CONCATENATION_MARK)
+      PROP ("Regional_Indicator", PROP_REGIONAL_INDICATOR)
       /* DerivedCoreProperties.txt */
       PROP ("Math", PROP_MATH)
       PROP ("Alphabetic", PROP_ALPHABETIC)
@@ -3712,6 +3714,13 @@ is_property_ignorable_control (unsigned int ch)
          && ch != 0x0000;
 }
 
+/* See PropList.txt, UCD.html.  */
+static bool
+is_property_regional_indicator (unsigned int ch)
+{
+  return ((unicode_properties[ch] & (1ULL << PROP_REGIONAL_INDICATOR)) != 0);
+}
+
 /* ------------------------------------------------------------------------- */
 
 /* Output all properties.  */
@@ -3808,6 +3817,7 @@ output_properties (const char *version)
   PROPERTY(diacritic)
   PROPERTY(extender)
   PROPERTY(ignorable_control)
+  PROPERTY(regional_indicator)
 #undef PROPERTY
 }
 
@@ -3917,7 +3927,18 @@ enum
   UC_JOINING_GROUP_MANICHAEAN_HUNDRED,    /* Manichaean_Hundred */
   UC_JOINING_GROUP_AFRICAN_FEH,           /* African_Feh */
   UC_JOINING_GROUP_AFRICAN_QAF,           /* African_Qaf */
-  UC_JOINING_GROUP_AFRICAN_NOON           /* African_Noon */
+  UC_JOINING_GROUP_AFRICAN_NOON,          /* African_Noon */
+  UC_JOINING_GROUP_MALAYALAM_NGA,         /* Malayalam_Nga */
+  UC_JOINING_GROUP_MALAYALAM_JA,          /* Malayalam_Ja */
+  UC_JOINING_GROUP_MALAYALAM_NYA,         /* Malayalam_Nya */
+  UC_JOINING_GROUP_MALAYALAM_TTA,         /* Malayalam_Tta */
+  UC_JOINING_GROUP_MALAYALAM_NNA,         /* Malayalam_Nna */
+  UC_JOINING_GROUP_MALAYALAM_NNNA,        /* Malayalam_Nnna */
+  UC_JOINING_GROUP_MALAYALAM_BHA,         /* Malayalam_Bha */
+  UC_JOINING_GROUP_MALAYALAM_RA,          /* Malayalam_Ra */
+  UC_JOINING_GROUP_MALAYALAM_LLA,         /* Malayalam_Lla */
+  UC_JOINING_GROUP_MALAYALAM_LLLA,        /* Malayalam_Llla */
+  UC_JOINING_GROUP_MALAYALAM_SSA          /* Malayalam_Ssa */
 };
 
 static uint8_t unicode_joining_group[0x110000];
@@ -4084,6 +4105,17 @@ fill_arabicshaping (const char *arabicshaping_filename)
       TRY(UC_JOINING_GROUP_AFRICAN_FEH,           "AFRICAN FEH")
       TRY(UC_JOINING_GROUP_AFRICAN_QAF,           "AFRICAN QAF")
       TRY(UC_JOINING_GROUP_AFRICAN_NOON,          "AFRICAN NOON")
+      TRY(UC_JOINING_GROUP_MALAYALAM_NGA,         "MALAYALAM NGA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_JA,          "MALAYALAM JA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_NYA,         "MALAYALAM NYA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_TTA,         "MALAYALAM TTA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_NNA,         "MALAYALAM NNA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_NNNA,        "MALAYALAM NNNA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_BHA,         "MALAYALAM BHA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_RA,          "MALAYALAM RA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_LLA,         "MALAYALAM LLA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_LLLA,        "MALAYALAM LLLA")
+      TRY(UC_JOINING_GROUP_MALAYALAM_SSA,         "MALAYALAM SSA")
 #undef TRY
       else
         {
@@ -4408,6 +4440,17 @@ joining_group_as_c_identifier (int joining_group)
   TRY(UC_JOINING_GROUP_AFRICAN_FEH)
   TRY(UC_JOINING_GROUP_AFRICAN_QAF)
   TRY(UC_JOINING_GROUP_AFRICAN_NOON)
+  TRY(UC_JOINING_GROUP_MALAYALAM_NGA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_JA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_NYA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_TTA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_NNA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_NNNA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_BHA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_RA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_LLA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_LLLA)
+  TRY(UC_JOINING_GROUP_MALAYALAM_SSA)
 #undef TRY
   abort ();
 }
@@ -10515,22 +10558,27 @@ main (int argc, char * argv[])
  * compile-command: "\
  *   gcc -O -Wall gen-uni-tables.c -Iunictype -o gen-uni-tables &&      \\
  *   ./gen-uni-tables                                                   \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/UnicodeData.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/PropList.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/DerivedCoreProperties.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/ArabicShaping.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/Scripts.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/Blocks.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/UnicodeData.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/PropList.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/DerivedCoreProperties.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/ArabicShaping.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/Scripts.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/Blocks.txt \\
  *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/3.0.1/PropList-3.0.1.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/EastAsianWidth.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/LineBreak.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/auxiliary/WordBreakProperty.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/CompositionExclusions.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/SpecialCasing.txt \\
- *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/9.0.0/ucd/CaseFolding.txt \\
- *        9.0.0                                                         \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/EastAsianWidth.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/LineBreak.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/auxiliary/WordBreakProperty.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/CompositionExclusions.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/SpecialCasing.txt \\
+ *        /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/CaseFolding.txt \\
+ *        10.0.0                                                         \\
  *   && diff unilbrk/lbrkprop_org.txt unilbrk/lbrkprop.txt              \\
- *   && diff uniwbrk/wbrkprop_org.txt uniwbrk/wbrkprop.txt"
+ *   && diff uniwbrk/wbrkprop_org.txt uniwbrk/wbrkprop.txt              \\
+ *   && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/NameAliases.txt ../tests/uniname/NameAliases.txt \\
+ *   && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/UnicodeData.txt ../tests/uniname/UnicodeData.txt \\
+ *   && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/NormalizationTest.txt ../tests/uninorm/NormalizationTest.txt \\
+ *   && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/auxiliary/GraphemeBreakTest.txt ../tests/unigbrk/GraphemeBreakTest.txt \\
+ *   && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/10.0.0/ucd/auxiliary/WordBreakTest.txt ../tests/uniwbrk/WordBreakTest.txt"
  * End:
  */
diff --git a/lib/unicase/cased.h b/lib/unicase/cased.h
index 7f5f148b91..eb697d627d 100644
--- a/lib/unicase/cased.h
+++ b/lib/unicase/cased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unicase/ignorable.h b/lib/unicase/ignorable.h
index eb452417cd..0eb6b771a9 100644
--- a/lib/unicase/ignorable.h
+++ b/lib/unicase/ignorable.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[44 << 4];
+    unsigned int level3[45 << 4];
   }
 u_casing_property_case_ignorable =
 {
@@ -199,8 +199,8 @@ u_casing_property_case_ignorable =
        16 +   384 * sizeof (short) / sizeof (int) +   496,
        16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
@@ -239,10 +239,9 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
@@ -280,7 +279,8 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -290,31 +290,31 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
        16 +   384 * sizeof (short) / sizeof (int) +   608,
+       16 +   384 * sizeof (short) / sizeof (int) +   624,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   624,
+       16 +   384 * sizeof (short) / sizeof (int) +   640,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   640,
+       16 +   384 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   656,
+       16 +   384 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   672,
+       16 +   384 * sizeof (short) / sizeof (int) +   688,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   688,
+       16 +   384 * sizeof (short) / sizeof (int) +   704,
        -1,
        -1,
        -1,
@@ -465,12 +465,12 @@ u_casing_property_case_ignorable =
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0002000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x0000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
-    0x00000006U, 0x10000000U, 0x000021BEU, 0x0000000CU,
+    0x00000006U, 0x10000000U, 0x000021BEU, 0xFC00000CU,
     0x00000002U, 0x90000000U, 0x0040201EU, 0x0000000CU,
     0x00000004U, 0x00000000U, 0x00002001U, 0x00000000U,
     0x00000001U, 0xC0000000U, 0x00603DC1U, 0x0000000CU,
     0x00000002U, 0x90000000U, 0x00003040U, 0x0000000CU,
-    0x00000002U, 0x00000000U, 0x0000201EU, 0x0000000CU,
+    0x00000003U, 0x18000000U, 0x0000201EU, 0x0000000CU,
     0x00000000U, 0x00000000U, 0x005C0400U, 0x00000000U,
     0x00000000U, 0x07F20000U, 0x00007FC0U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F40U, 0x00000000U,
@@ -499,7 +499,7 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x00CFF000U, 0x00000000U, 0x3F000000U,
     0x00000000U, 0x00000000U, 0xFFF70000U, 0x031021FDU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -576,9 +576,13 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000067EU, 0x79F80000U, 0x0E7E0080U, 0x00000000U,
+    0x037FFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xBF7F0000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x006DFCFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
@@ -587,7 +591,7 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x60000000U, 0x0000000FU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unicase/special-casing-table.gperf b/lib/unicase/special-casing-table.gperf
index 08d6c627c0..d7504d4827 100644
--- a/lib/unicase/special-casing-table.gperf
+++ b/lib/unicase/special-casing-table.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Special casing rules of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unicase/tocasefold.h b/lib/unicase/tocasefold.h
index 460830c8fc..deb1689859 100644
--- a/lib/unicase/tocasefold.h
+++ b/lib/unicase/tocasefold.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unicase/tolower.h b/lib/unicase/tolower.h
index c2743e68e8..f7f88fd13e 100644
--- a/lib/unicase/tolower.h
+++ b/lib/unicase/tolower.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unicase/totitle.h b/lib/unicase/totitle.h
index 1f4bdf9b02..9b60a4485e 100644
--- a/lib/unicase/totitle.h
+++ b/lib/unicase/totitle.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unicase/toupper.h b/lib/unicase/toupper.h
index 34168941ae..edc9b63d45 100644
--- a/lib/unicase/toupper.h
+++ b/lib/unicase/toupper.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype.in.h b/lib/unictype.in.h
index e4a0a56b68..ac6a4c322d 100644
--- a/lib/unictype.in.h
+++ b/lib/unictype.in.h
@@ -554,7 +554,18 @@ enum
   UC_JOINING_GROUP_MANICHAEAN_HUNDRED,    /* Manichaean_Hundred */
   UC_JOINING_GROUP_AFRICAN_FEH,           /* African_Feh */
   UC_JOINING_GROUP_AFRICAN_QAF,           /* African_Qaf */
-  UC_JOINING_GROUP_AFRICAN_NOON           /* African_Noon */
+  UC_JOINING_GROUP_AFRICAN_NOON,          /* African_Noon */
+  UC_JOINING_GROUP_MALAYALAM_NGA,         /* Malayalam_Nga */
+  UC_JOINING_GROUP_MALAYALAM_JA,          /* Malayalam_Ja */
+  UC_JOINING_GROUP_MALAYALAM_NYA,         /* Malayalam_Nya */
+  UC_JOINING_GROUP_MALAYALAM_TTA,         /* Malayalam_Tta */
+  UC_JOINING_GROUP_MALAYALAM_NNA,         /* Malayalam_Nna */
+  UC_JOINING_GROUP_MALAYALAM_NNNA,        /* Malayalam_Nnna */
+  UC_JOINING_GROUP_MALAYALAM_BHA,         /* Malayalam_Bha */
+  UC_JOINING_GROUP_MALAYALAM_RA,          /* Malayalam_Ra */
+  UC_JOINING_GROUP_MALAYALAM_LLA,         /* Malayalam_Lla */
+  UC_JOINING_GROUP_MALAYALAM_LLLA,        /* Malayalam_Llla */
+  UC_JOINING_GROUP_MALAYALAM_SSA          /* Malayalam_Ssa */
 };
 
 /* Return the name of a joining group.  */
diff --git a/lib/unictype/bidi_of.h b/lib/unictype/bidi_of.h
index ff7fe99738..6347db8ec3 100644
--- a/lib/unictype/bidi_of.h
+++ b/lib/unictype/bidi_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Bidi categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[17];
     short level2[4 << 9];
-    unsigned short level3[151 * 40 + 1];
+    unsigned short level3[155 * 40 + 1];
   }
 u_bidi_category =
 {
@@ -107,8 +107,9 @@ u_bidi_category =
     12544, 12544, 12544, 12544, 13184, 12544, 12544, 12544,
     13312, 13440, 13568, 13696, 13824, 13952, 14080,    -1,
     14208, 14336,    -1, 14464, 14592, 14720, 14848,    -1,
+       -1,    -1,    -1,    -1, 14976, 15104,    -1,    -1,
+    15232, 15360, 15488,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    14976, 15104,    -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,
@@ -126,9 +127,9 @@ u_bidi_category =
        -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, 15616, 15744,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 15872,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1, 15232, 15360,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 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,
@@ -147,24 +148,24 @@ u_bidi_category =
        -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, 16000,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 15616,    -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, 16128, 16256, 16384,    -1, 16512,    -1,
+       -1,    -1,    -1,    -1,    -1, 16640, 16768, 16896,
+       -1,    -1,    -1,    -1, 17024, 17152,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 15744, 15872, 16000,    -1, 16128,    -1,
-       -1,    -1,    -1,    -1,    -1, 16256, 16384, 16512,
-       -1,    -1,    -1,    -1, 16640, 16768,    -1,    -1,
+    17280,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    16896,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    12544, 17408, 17536,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 17664, 17792,    -1,    -1,
+    17920, 18048, 18176,    -1, 18304,    -1,  6656,  6656,
+     6656,  6656,  6656,  6656,  6656, 18432, 18560, 18688,
+    18816, 18944, 19072, 19200,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 19328,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    12544, 17024, 17152,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 17280, 17408,    -1,    -1,
-    17536, 17664, 17792,    -1,    -1,    -1,  6656,  6656,
-     6656,  6656,  6656,  6656,  6656, 17920, 18048, 18176,
-    18304, 18432, 18560, 18688,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 18816,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -227,12 +228,12 @@ u_bidi_category =
        -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, 19328,
+    19456, 19456, 19584, 19712, 19456, 19456, 19456, 19456,
+    19456, 19456, 19456, 19456, 19456, 19456, 19456, 19456,
+    19456, 19456, 19456, 19456, 19456, 19456, 19456, 19456,
+    19456, 19456, 19456, 19456, 19456, 19456, 19456, 19456,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 18816,
-    18944, 18944, 19072, 19200, 18944, 18944, 18944, 18944,
-    18944, 18944, 18944, 18944, 18944, 18944, 18944, 18944,
-    18944, 18944, 18944, 18944, 18944, 18944, 18944, 18944,
-    18944, 18944, 18944, 18944, 18944, 18944, 18944, 18944,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -291,8 +292,7 @@ u_bidi_category =
        -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, 18816
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 19328
   },
   {
     0x39ce, 0x9ce7, 0x0e73, 0x183e, 0x739f, 0x39ce, 0x9ce7, 0xce73,
@@ -353,8 +353,8 @@ u_bidi_category =
     0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0x4631, 0xad6b,
     0xd68d, 0x6b5a, 0xb5ad, 0x5a36, 0xa36b, 0xd6b5, 0x18da, 0x8c63,
     0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
-    0x18c6, 0x8c63, 0xc631, 0xa318, 0x36b5, 0x18c6, 0x8c63, 0xc631,
-    0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
+    0x18c6, 0x8c63, 0xc631, 0xa318, 0x36b5, 0x18c6, 0x1084, 0x0842,
+    0x8421, 0x3190, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
     0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318,
     0x318c, 0x18c6, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0642, 0x8421, 0x4210, 0x18c8, 0x8c63, 0xc631, 0x6318, 0x318c,
@@ -379,7 +379,7 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xd000, 0x0000, 0xb5a0, 0x1ad6, 0x0d68, 0x0000,
     0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
-    0x0000, 0x0000, 0x0000, 0x0140, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0140, 0x0000, 0x0000, 0xd6b4, 0x6b5a,
     0x01a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xd000, 0x6800, 0xb5a0, 0x00d6, 0x0000, 0x0000,
@@ -400,9 +400,9 @@ u_bidi_category =
     0x0000, 0x0000, 0xd000, 0x0000, 0x0000, 0x0000, 0x0000, 0xd000,
     0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x01a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x01ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xb5a0, 0x00d6, 0x0000, 0x0000,
+    0x0000, 0x0000, 0xd680, 0x0000, 0xb5a0, 0x00d6, 0x0000, 0x0000,
     0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -524,7 +524,7 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
-    0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x1ad6, 0x0000, 0xd680, 0x6b5a,
+    0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd681, 0x6b5a,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x9024, 0x0252, 0x0000, 0x0000, 0x0000,
@@ -537,7 +537,7 @@ u_bidi_category =
     0xd5a4, 0xe73a, 0x739c, 0x0008, 0x1080, 0x0842, 0x24a5, 0x04a5,
     0x2108, 0x1084, 0x0842, 0x24a5, 0x04a5, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
-    0x94a5, 0x4a52, 0xa529, 0x0294, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x94a5, 0x4a52, 0xa529, 0x5294, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
     0xad6b, 0xd6b5, 0x6b5a, 0x000d, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0252, 0xa529, 0x5204, 0x0002, 0x0000, 0x0000, 0x8120, 0x1294,
@@ -569,7 +569,7 @@ u_bidi_category =
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
     0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529,
-    0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x04a5,
+    0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x0004, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529, 0x5294, 0x004a,
@@ -593,7 +593,7 @@ u_bidi_category =
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0x2529, 0x5200,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x0002, 0x94a4, 0x4a52, 0xa529, 0x1294, 0x2948,
-    0x94a5, 0x0252, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x94a5, 0x4a52, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x2000, 0x94a5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -612,7 +612,7 @@ u_bidi_category =
     0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
-    0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0x0129, 0x0000, 0x0000,
+    0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x0002,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
@@ -880,6 +880,16 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0xb5a0, 0x5ad6, 0xa003, 0x0035, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000,
+    0x5ad6, 0x0d6b, 0xd680, 0x035a, 0x0000, 0x0000, 0x0068, 0x0000,
+    0x0000, 0xb5a0, 0x5ad6, 0xa003, 0x06b5, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0xd6b4, 0x6b5a, 0xb5ad, 0x5ad6, 0xad03,
+    0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb5ad,
     0x5ad6, 0xad03, 0xd6b5, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -891,6 +901,11 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb5a0,
+    0x5ad6, 0x0003, 0xd034, 0x681a, 0xb5ad, 0x1ad6, 0x0068, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -995,11 +1010,16 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0948, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0x2529,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
-    0x94a5, 0x4a52, 0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529,
-    0x5294, 0x294a, 0x0001, 0x4a52, 0xa529, 0x0004, 0x0000, 0x0000,
+    0x94a5, 0x4a52, 0x0129, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529,
+    0x5294, 0x294a, 0x0001, 0x4a52, 0xa529, 0x1294, 0x0000, 0x0000,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
@@ -1020,16 +1040,16 @@ u_bidi_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529, 0x5294,
-    0x294a, 0x04a5, 0x4a52, 0xa529, 0x0094, 0x0000, 0x0000, 0x0012,
-    0xa529, 0x5294, 0x294a, 0x04a5, 0x4a52, 0xa529, 0x5294, 0x094a,
-    0x0000, 0x4a52, 0xa529, 0x5294, 0x294a, 0x04a5, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0252, 0x0000, 0x0000,
+    0x4a52, 0xa529, 0x5294, 0x094a, 0x0000, 0x4a52, 0xa529, 0x5294,
+    0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
+    0xa529, 0x5294, 0x294a, 0x04a5, 0x4a52, 0xa529, 0x5294, 0x294a,
+    0x0001, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529,
+    0x5294, 0x094a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x0094,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0012, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529,
+    0x0004, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/lib/unictype/blocks.h b/lib/unictype/blocks.h
index ac68c22285..59530066b6 100644
--- a/lib/unictype/blocks.h
+++ b/lib/unictype/blocks.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Unicode blocks.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -46,6 +46,7 @@ static const uc_block_t blocks[] =
   { 0x07C0, 0x07FF, "NKo" },
   { 0x0800, 0x083F, "Samaritan" },
   { 0x0840, 0x085F, "Mandaic" },
+  { 0x0860, 0x086F, "Syriac Supplement" },
   { 0x08A0, 0x08FF, "Arabic Extended-A" },
   { 0x0900, 0x097F, "Devanagari" },
   { 0x0980, 0x09FF, "Bengali" },
@@ -248,9 +249,12 @@ static const uc_block_t blocks[] =
   { 0x11680, 0x116CF, "Takri" },
   { 0x11700, 0x1173F, "Ahom" },
   { 0x118A0, 0x118FF, "Warang Citi" },
+  { 0x11A00, 0x11A4F, "Zanabazar Square" },
+  { 0x11A50, 0x11AAF, "Soyombo" },
   { 0x11AC0, 0x11AFF, "Pau Cin Hau" },
   { 0x11C00, 0x11C6F, "Bhaiksuki" },
   { 0x11C70, 0x11CBF, "Marchen" },
+  { 0x11D00, 0x11D5F, "Masaram Gondi" },
   { 0x12000, 0x123FF, "Cuneiform" },
   { 0x12400, 0x1247F, "Cuneiform Numbers and Punctuation" },
   { 0x12480, 0x1254F, "Early Dynastic Cuneiform" },
@@ -265,6 +269,8 @@ static const uc_block_t blocks[] =
   { 0x17000, 0x187FF, "Tangut" },
   { 0x18800, 0x18AFF, "Tangut Components" },
   { 0x1B000, 0x1B0FF, "Kana Supplement" },
+  { 0x1B100, 0x1B12F, "Kana Extended-A" },
+  { 0x1B170, 0x1B2FF, "Nushu" },
   { 0x1BC00, 0x1BC9F, "Duployan" },
   { 0x1BCA0, 0x1BCAF, "Shorthand Format Controls" },
   { 0x1D000, 0x1D0FF, "Byzantine Musical Symbols" },
@@ -295,6 +301,7 @@ static const uc_block_t blocks[] =
   { 0x2A700, 0x2B73F, "CJK Unified Ideographs Extension C" },
   { 0x2B740, 0x2B81F, "CJK Unified Ideographs Extension D" },
   { 0x2B820, 0x2CEAF, "CJK Unified Ideographs Extension E" },
+  { 0x2CEB0, 0x2EBEF, "CJK Unified Ideographs Extension F" },
   { 0x2F800, 0x2FA1F, "CJK Compatibility Ideographs Supplement" },
   { 0xE0000, 0xE007F, "Tags" },
   { 0xE0100, 0xE01EF, "Variation Selectors Supplement" },
@@ -313,638 +320,638 @@ static const uint16_t blocks_level1[640 * 2] =
     9,  12,
    12,  13,
    13,  17,
-   17,  20,
-   20,  22,
-   22,  24,
-   24,  26,
-   26,  28,
-   28,  30,
-   30,  32,
-   32,  33,
-   33,  35,
-   35,  36,
+   17,  21,
+   21,  23,
+   23,  25,
+   25,  27,
+   27,  29,
+   29,  31,
+   31,  33,
+   33,  34,
+   34,  36,
    36,  37,
-   36,  39,
-   39,  40,
-   39,  40,
-   39,  42,
-   42,  47,
-   47,  49,
-   49,  53,
-   53,  56,
-   56,  59,
-   59,  64,
-   64,  67,
-   67,  68,
+   37,  38,
+   37,  40,
+   40,  41,
+   40,  41,
+   40,  43,
+   43,  48,
+   48,  50,
+   50,  54,
+   54,  57,
+   57,  60,
+   60,  65,
+   65,  68,
    68,  69,
-   69,  73,
-   73,  76,
-   76,  77,
+   69,  70,
+   70,  74,
+   74,  77,
    77,  78,
-   78,  81,
-   81,  84,
-   84,  85,
-   85,  88,
-   88,  89,
-   89,  91,
-   91,  92,
+   78,  79,
+   79,  82,
+   82,  85,
+   85,  86,
+   86,  89,
+   89,  90,
+   90,  92,
    92,  93,
-   93,  96,
-   96, 100,
-  100, 102,
-  102, 104,
-  104, 107,
-  107, 113,
-  113, 114,
+   93,  94,
+   94,  97,
+   97, 101,
+  101, 103,
+  103, 105,
+  105, 108,
+  108, 114,
   114, 115,
   115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 116,
-  115, 117,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  117, 118,
-  118, 119,
-  118, 119,
-  118, 119,
-  118, 119,
-  118, 121,
-  121, 122,
-  121, 124,
-  124, 126,
-  126, 131,
-  131, 136,
-  136, 140,
-  140, 144,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 145,
-  144, 146,
-  146, 147,
-  146, 147,
-  146, 147,
-  146, 148,
-  148, 149,
-  148, 149,
-  148, 149,
-  148, 149,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
-  149, 150,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 117,
+  116, 118,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  118, 119,
+  119, 120,
+  119, 120,
+  119, 120,
+  119, 120,
+  119, 122,
+  122, 123,
+  122, 125,
+  125, 127,
+  127, 132,
+  132, 137,
+  137, 141,
+  141, 145,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 146,
+  145, 147,
+  147, 148,
+  147, 148,
+  147, 148,
+  147, 149,
   149, 150,
   149, 150,
   149, 150,
   149, 150,
   150, 151,
   150, 151,
-  151, 153,
-  152, 153,
-  152, 153,
-  153, 159,
-  159, 161,
-  161, 163,
-  163, 167,
-  167, 170,
-  170, 175,
-  175, 179,
-  179, 181,
-  181, 182,
-  181, 182,
-  182, 187,
-  187, 191,
-  191, 195,
-  195, 199,
-  199, 201,
-  201, 201,
-  201, 202,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  150, 151,
+  151, 152,
+  151, 152,
+  152, 154,
+  153, 154,
+  153, 154,
+  154, 160,
+  160, 162,
+  162, 164,
+  164, 168,
+  168, 171,
+  171, 176,
+  176, 180,
+  180, 182,
+  182, 183,
+  182, 183,
+  183, 188,
+  188, 192,
+  192, 196,
+  196, 200,
+  200, 202,
   202, 202,
-  202, 205,
-  205, 209,
-  209, 212,
-  212, 213,
-  213, 215,
-  215, 216,
-  216, 219,
-  219, 220,
+  202, 203,
+  203, 203,
+  203, 206,
+  206, 210,
+  210, 213,
+  213, 214,
+  214, 216,
+  216, 217,
+  217, 220,
   220, 221,
-  221, 221,
   221, 222,
   222, 222,
-  222, 224,
-  224, 224,
-  224, 224,
-  224, 224,
-  224, 225,
-  224, 225,
-  224, 225,
-  224, 225,
+  222, 225,
+  225, 225,
   225, 227,
-  226, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 227,
-  227, 228,
-  227, 228,
-  227, 228,
   227, 228,
-  227, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
-  228, 228,
   228, 228,
   228, 228,
   228, 229,
   228, 229,
   228, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 229,
-  229, 230,
-  229, 230,
-  229, 232,
+  228, 229,
+  229, 231,
+  230, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 231,
+  231, 232,
+  231, 232,
+  231, 232,
+  231, 232,
+  231, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 232,
+  232, 233,
+  232, 233,
   232, 233,
   233, 233,
   233, 233,
   233, 233,
-  233, 235,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  235, 236,
-  236, 237,
-  236, 237,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 233,
+  233, 234,
+  233, 234,
+  233, 236,
   236, 237,
   237, 237,
   237, 237,
   237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 237,
-  237, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 238,
-  238, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
-  240, 240,
+  237, 239,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  239, 240,
+  240, 241,
   240, 241,
+  240, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
+  241, 241,
   241, 242,
-  242, 243,
-  243, 245,
-  245, 246,
-  245, 246,
-  245, 246,
-  245, 246,
-  246, 247,
+  242, 244,
+  243, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 244,
+  244, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
+  246, 246,
   246, 247,
-  246, 247,
-  247, 247,
-  247, 247,
-  247, 247,
-  247, 247,
-  247, 247,
   247, 248,
-  248, 248,
-  248, 248,
-  248, 248,
-  248, 248,
-  248, 248,
-  248, 248,
-  248, 248,
   248, 249,
-  249, 250,
-  250, 250,
-  250, 250,
-  250, 250,
-  250, 250,
-  250, 251,
-  251, 251,
-  251, 254,
+  249, 251,
+  251, 252,
+  251, 252,
+  251, 252,
+  251, 252,
+  252, 253,
+  252, 253,
+  252, 253,
+  253, 253,
+  253, 253,
+  253, 253,
+  253, 253,
+  253, 253,
+  253, 254,
+  254, 254,
+  254, 254,
+  254, 254,
+  254, 254,
+  254, 254,
+  254, 254,
+  254, 254,
   254, 255,
   255, 256,
+  256, 256,
+  256, 256,
+  256, 256,
+  256, 256,
   256, 257,
-  256, 257,
-  256, 257,
+  257, 257,
   257, 260,
-  260, 262,
+  260, 261,
+  261, 262,
+  262, 263,
+  262, 263,
   262, 263,
-  263, 264,
-  264, 264,
-  264, 264,
-  264, 264,
-  264, 264,
-  264, 264,
-  264, 264,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265,
-  264, 265
+  263, 266,
+  266, 268,
+  268, 269,
+  269, 270,
+  270, 270,
+  270, 270,
+  270, 270,
+  270, 270,
+  270, 270,
+  270, 270,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271,
+  270, 271
 };
-#define blocks_upper_first_index 264
-#define blocks_upper_last_index 273
+#define blocks_upper_first_index 270
+#define blocks_upper_last_index 280
diff --git a/lib/unictype/categ_C.h b/lib/unictype/categ_C.h
index 75e5257755..cc8c09053a 100644
--- a/lib/unictype/categ_C.h
+++ b/lib/unictype/categ_C.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[17];
     short level2[5 << 7];
-    unsigned int level3[78 << 4];
+    unsigned int level3[79 << 4];
   }
 u_categ_C =
 {
@@ -77,15 +77,15 @@ u_categ_C =
        18 +   640 * sizeof (short) / sizeof (int) +   208,
        18 +   640 * sizeof (short) / sizeof (int) +   224,
        18 +   640 * sizeof (short) / sizeof (int) +   240,
+       -1,
        18 +   640 * sizeof (short) / sizeof (int) +   256,
-       18 +   640 * sizeof (short) / sizeof (int) +   272,
        -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   272,
        18 +   640 * sizeof (short) / sizeof (int) +   288,
        18 +   640 * sizeof (short) / sizeof (int) +   304,
        18 +   640 * sizeof (short) / sizeof (int) +   320,
        18 +   640 * sizeof (short) / sizeof (int) +   336,
-       18 +   640 * sizeof (short) / sizeof (int) +   352,
        -1,
        -1,
        -1,
@@ -98,7 +98,7 @@ u_categ_C =
        -1,
        -1,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +   368,
+       18 +   640 * sizeof (short) / sizeof (int) +   352,
        -1,
        -1,
        -1,
@@ -139,13 +139,13 @@ u_categ_C =
        -1,
        -1,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +   384,
+       18 +   640 * sizeof (short) / sizeof (int) +   368,
        -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   384,
        18 +   640 * sizeof (short) / sizeof (int) +   400,
        18 +   640 * sizeof (short) / sizeof (int) +   416,
        18 +   640 * sizeof (short) / sizeof (int) +   432,
-       18 +   640 * sizeof (short) / sizeof (int) +   448,
        -1,
        -1,
        -1,
@@ -167,22 +167,23 @@ u_categ_C =
        -1,
        -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   448,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   464,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
        18 +   640 * sizeof (short) / sizeof (int) +   480,
        18 +   640 * sizeof (short) / sizeof (int) +   496,
        18 +   640 * sizeof (short) / sizeof (int) +   512,
@@ -202,48 +203,47 @@ u_categ_C =
        18 +   640 * sizeof (short) / sizeof (int) +   736,
        18 +   640 * sizeof (short) / sizeof (int) +   752,
        18 +   640 * sizeof (short) / sizeof (int) +   768,
-       18 +   640 * sizeof (short) / sizeof (int) +   784,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   784,
        18 +   640 * sizeof (short) / sizeof (int) +   800,
-       18 +   640 * sizeof (short) / sizeof (int) +   816,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   816,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   832,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   848,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   864,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -255,67 +255,67 @@ u_categ_C =
        -1,
        -1,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +   896,
+       18 +   640 * sizeof (short) / sizeof (int) +   880,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   896,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   912,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
        18 +   640 * sizeof (short) / sizeof (int) +   928,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   944,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   960,
        18 +   640 * sizeof (short) / sizeof (int) +   976,
        18 +   640 * sizeof (short) / sizeof (int) +   992,
        18 +   640 * sizeof (short) / sizeof (int) +  1008,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +  1024,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +  1040,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +  1056,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +  1072,
        18 +   640 * sizeof (short) / sizeof (int) +  1088,
        18 +   640 * sizeof (short) / sizeof (int) +  1104,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +  1120,
        18 +   640 * sizeof (short) / sizeof (int) +  1136,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -420,286 +420,286 @@ u_categ_C =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +  1200,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +  1216,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       -1,
        18 +   640 * sizeof (short) / sizeof (int) +  1232,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
-       18 +   640 * sizeof (short) / sizeof (int) +   480
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +  1248,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
+       18 +   640 * sizeof (short) / sizeof (int) +   464
   },
   {
     0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x80000000U,
@@ -718,17 +718,17 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x20000000U, 0x00000000U,
     0x0000C000U, 0x00000000U, 0x00001800U, 0x00000000U,
     0x00000000U, 0xFFFC0000U, 0x00000000U, 0xF8000000U,
-    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFFFFFU,
+    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFF800U,
     0xFFFFFFFFU, 0xC0200000U, 0x000FFFFFU, 0x00000004U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xF0000030U,
+    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xC0000030U,
     0x00067811U, 0x2C920200U, 0xA1FDC678U, 0xFFC0003FU,
-    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0xFDFC0030U,
+    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0x01FC0030U,
     0x00066011U, 0x0C120200U, 0x4F3FC660U, 0xFF000030U,
     0x29C23813U, 0x3C0038E7U, 0xFF7EC238U, 0xF800003FU,
     0x00022010U, 0x1C000200U, 0xF89FC220U, 0x00FF0030U,
     0x00022010U, 0x0C100200U, 0xBF9FC220U, 0xFFF90030U,
-    0x00022011U, 0x18000000U, 0x000F0220U, 0x00000030U,
+    0x00022010U, 0x00000000U, 0x000F0220U, 0x00000030U,
     0x03800013U, 0xD0040000U, 0x00A07B80U, 0xFFE3003FU,
     0x00000001U, 0x78000000U, 0xF0000000U, 0xFFFFFFFFU,
     0x010FDA69U, 0xC4001351U, 0x0C00C0A0U, 0xFFFFFFFFU,
@@ -755,21 +755,17 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x0000F000U, 0xE0000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0FF00000U,
     0x00000000U, 0x07000000U, 0x00001C00U, 0x00000000U,
-    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC800000U,
+    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x07C00000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x04000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0C00000U, 0x00000000U, 0x5500C0C0U, 0xC0000000U,
     0x00000000U, 0x00200000U, 0x10300020U, 0x80230000U,
     0x0000F800U, 0x00007C00U, 0x00000000U, 0x000CFFFFU,
-    0xE0008000U, 0x80000000U, 0x0000FFFFU, 0xFFFE0000U,
+    0xE0008000U, 0x00000000U, 0x0000FFFFU, 0xFFFE0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000F000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
     0x00000000U, 0xFFFFFF80U, 0xFFFFF800U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -777,18 +773,18 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00300000U,
-    0x00C00000U, 0x1C000000U, 0xFFFC0200U, 0xFFFF0FFFU,
+    0x00C00000U, 0x1C000000U, 0xFFF80200U, 0xFFFF0FFFU,
     0x00000000U, 0x00008000U, 0x80000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x01F00000U,
     0x00000000U, 0x0000DF40U, 0x00000000U, 0x7FFE7F00U,
     0xFF800000U, 0x80808080U, 0x80808080U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFE0U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU,
     0x04000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFC00000U, 0xF000FFFFU,
     0x00000000U, 0x00000000U, 0x00000001U, 0x00000000U,
     0x01800000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x0000001FU, 0x0001C000U, 0x00000000U, 0x00000000U,
+    0x0000001FU, 0x00018000U, 0x00000000U, 0x00000000U,
     0x00008000U, 0xF8000000U, 0x00000000U, 0x0000FFF0U,
     0x80000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
@@ -801,7 +797,7 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFC00000U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFF800U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000E000U, 0x00000000U, 0x0000FF80U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -848,7 +844,7 @@ u_categ_C =
     0xF0008000U, 0xFFFFFFFEU, 0x0000FFFFU, 0xC0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xE0000000U, 0x00000000U, 0xFFFE0000U, 0xF0000000U,
-    0x00000000U, 0x0000FFF0U, 0x0000F800U, 0xF8000000U,
+    0x00000000U, 0x00001FF0U, 0x0000F800U, 0xF8000000U,
     0x40000000U, 0x00000000U, 0xFFC000F0U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0000000U, 0x0000FC00U, 0x00F00000U, 0xF0000000U,
@@ -894,13 +890,13 @@ u_categ_C =
     0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x7FF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0xFE000000U,
+    0x00000000U, 0x00000000U, 0x0000FF00U, 0x00000000U,
+    0x20000030U, 0xFFFFFFF8U, 0x00000000U, 0xFE000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000200U, 0x00800000U, 0x0000FFC0U, 0x0000E000U,
     0x00030000U, 0xFF800100U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000480U, 0x4B800000U, 0xFC00FF00U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -925,7 +921,7 @@ u_categ_C =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x0000FFE0U, 0x80000000U,
-    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU,
+    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFCU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -934,8 +930,12 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x80000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xF0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0xE000F800U,
@@ -978,18 +978,18 @@ u_categ_C =
     0xFFF00000U, 0x00018000U, 0x00010001U, 0xFFC00000U,
     0x0000E000U, 0x00008000U, 0x00000000U, 0x0000F000U,
     0x00000000U, 0xFFFFE000U, 0xFFFFFFFFU, 0x0000003FU,
-    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFFFU,
+    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFC0U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF80000U, 0xFF80E000U,
+    0x00000000U, 0x00000000U, 0xFFE00000U, 0xFE00E000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0xFFE00000U, 0xFFFFFFFFU,
     0x0000F000U, 0x00000000U, 0xFC00FF00U, 0x00000000U,
     0x0000FF00U, 0xFFFFC000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0x8000FFFFU, 0x8006FF00U, 0x8000F000U, 0xFFFFFFFFU,
-    0xFFFC0000U, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0x0000F000U, 0x80000000U, 0x0000E000U, 0xFFFFF000U,
+    0xFF000000U, 0xFFFFFFFFU, 0x0000FFFEU, 0xFFFFFF80U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFF800000U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -1003,9 +1003,13 @@ u_categ_C =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x0000FFFCU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFEU,
     0xC0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/lib/unictype/categ_Cc.h b/lib/unictype/categ_Cc.h
index 4aec4ff24e..12fd9b9801 100644
--- a/lib/unictype/categ_Cc.h
+++ b/lib/unictype/categ_Cc.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Cf.h b/lib/unictype/categ_Cf.h
index 62c3f8f53c..4bc1c6ee5c 100644
--- a/lib/unictype/categ_Cf.h
+++ b/lib/unictype/categ_Cf.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Cn.h b/lib/unictype/categ_Cn.h
index 3bb5393cf1..1c923b6344 100644
--- a/lib/unictype/categ_Cn.h
+++ b/lib/unictype/categ_Cn.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[17];
     short level2[6 << 7];
-    unsigned int level3[77 << 4];
+    unsigned int level3[78 << 4];
   }
 u_categ_Cn =
 {
@@ -77,15 +77,15 @@ u_categ_Cn =
        18 +   768 * sizeof (short) / sizeof (int) +   192,
        18 +   768 * sizeof (short) / sizeof (int) +   208,
        18 +   768 * sizeof (short) / sizeof (int) +   224,
+       -1,
        18 +   768 * sizeof (short) / sizeof (int) +   240,
-       18 +   768 * sizeof (short) / sizeof (int) +   256,
        -1,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   256,
        18 +   768 * sizeof (short) / sizeof (int) +   272,
        18 +   768 * sizeof (short) / sizeof (int) +   288,
        18 +   768 * sizeof (short) / sizeof (int) +   304,
        18 +   768 * sizeof (short) / sizeof (int) +   320,
-       18 +   768 * sizeof (short) / sizeof (int) +   336,
        -1,
        -1,
        -1,
@@ -98,7 +98,7 @@ u_categ_Cn =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   352,
+       18 +   768 * sizeof (short) / sizeof (int) +   336,
        -1,
        -1,
        -1,
@@ -139,13 +139,13 @@ u_categ_Cn =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   368,
+       18 +   768 * sizeof (short) / sizeof (int) +   352,
        -1,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   368,
        18 +   768 * sizeof (short) / sizeof (int) +   384,
        18 +   768 * sizeof (short) / sizeof (int) +   400,
        18 +   768 * sizeof (short) / sizeof (int) +   416,
-       18 +   768 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
@@ -167,7 +167,7 @@ u_categ_Cn =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   448,
+       18 +   768 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
@@ -185,6 +185,7 @@ u_categ_Cn =
        -1,
        -1,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   448,
        18 +   768 * sizeof (short) / sizeof (int) +   464,
        18 +   768 * sizeof (short) / sizeof (int) +   480,
        18 +   768 * sizeof (short) / sizeof (int) +   496,
@@ -203,47 +204,46 @@ u_categ_Cn =
        18 +   768 * sizeof (short) / sizeof (int) +   704,
        18 +   768 * sizeof (short) / sizeof (int) +   720,
        18 +   768 * sizeof (short) / sizeof (int) +   736,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   768,
-       18 +   768 * sizeof (short) / sizeof (int) +   784,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
        18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   768,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   784,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       -1,
        18 +   768 * sizeof (short) / sizeof (int) +   800,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   816,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +   832,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   848,
        -1,
        -1,
        -1,
@@ -255,67 +255,67 @@ u_categ_Cn =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   848,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +   880,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
        18 +   768 * sizeof (short) / sizeof (int) +   896,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +   912,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +   928,
        18 +   768 * sizeof (short) / sizeof (int) +   944,
        18 +   768 * sizeof (short) / sizeof (int) +   960,
        18 +   768 * sizeof (short) / sizeof (int) +   976,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   992,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +  1008,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +  1024,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        18 +   768 * sizeof (short) / sizeof (int) +  1040,
        18 +   768 * sizeof (short) / sizeof (int) +  1056,
        18 +   768 * sizeof (short) / sizeof (int) +  1072,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1088,
        18 +   768 * sizeof (short) / sizeof (int) +  1104,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
        -1,
@@ -420,286 +420,286 @@ u_categ_Cn =
        -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1168,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1184,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1200,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
-       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +  1216,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
        -1,
@@ -827,7 +827,7 @@ u_categ_Cn =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +  1216
+       18 +   768 * sizeof (short) / sizeof (int) +  1232
   },
   {
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -842,17 +842,17 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00004000U, 0x00000000U, 0x00001800U, 0x00000000U,
     0x00000000U, 0xFFFC0000U, 0x00000000U, 0xF8000000U,
-    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFFFFFU,
+    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFF800U,
     0xFFFFFFFFU, 0xC0200000U, 0x000FFFFFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xF0000030U,
+    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xC0000030U,
     0x00067811U, 0x2C920200U, 0xA1FDC678U, 0xFFC0003FU,
-    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0xFDFC0030U,
+    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0x01FC0030U,
     0x00066011U, 0x0C120200U, 0x4F3FC660U, 0xFF000030U,
     0x29C23813U, 0x3C0038E7U, 0xFF7EC238U, 0xF800003FU,
     0x00022010U, 0x1C000200U, 0xF89FC220U, 0x00FF0030U,
     0x00022010U, 0x0C100200U, 0xBF9FC220U, 0xFFF90030U,
-    0x00022011U, 0x18000000U, 0x000F0220U, 0x00000030U,
+    0x00022010U, 0x00000000U, 0x000F0220U, 0x00000030U,
     0x03800013U, 0xD0040000U, 0x00A07B80U, 0xFFE3003FU,
     0x00000001U, 0x78000000U, 0xF0000000U, 0xFFFFFFFFU,
     0x010FDA69U, 0xC4001351U, 0x0C00C0A0U, 0xFFFFFFFFU,
@@ -879,21 +879,17 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x0000F000U, 0xE0000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0FF00000U,
     0x00000000U, 0x07000000U, 0x00001C00U, 0x00000000U,
-    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC800000U,
+    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x07C00000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x04000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0C00000U, 0x00000000U, 0x5500C0C0U, 0xC0000000U,
     0x00000000U, 0x00200000U, 0x10300020U, 0x80230000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000C0020U,
-    0xE0008000U, 0x80000000U, 0x0000FFFFU, 0xFFFE0000U,
+    0xE0008000U, 0x00000000U, 0x0000FFFFU, 0xFFFE0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000F000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
     0x00000000U, 0xFFFFFF80U, 0xFFFFF800U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -901,18 +897,18 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00300000U,
-    0x00C00000U, 0x1C000000U, 0xFFFC0200U, 0xFFFF0FFFU,
+    0x00C00000U, 0x1C000000U, 0xFFF80200U, 0xFFFF0FFFU,
     0x00000000U, 0x00008000U, 0x80000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x01F00000U,
     0x00000000U, 0x0000DF40U, 0x00000000U, 0x7FFE7F00U,
     0xFF800000U, 0x80808080U, 0x80808080U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFE0U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU,
     0x04000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFC00000U, 0xF000FFFFU,
     0x00000000U, 0x00000000U, 0x00000001U, 0x00000000U,
     0x01800000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x0000001FU, 0x0001C000U, 0x00000000U, 0x00000000U,
+    0x0000001FU, 0x00018000U, 0x00000000U, 0x00000000U,
     0x00008000U, 0xF8000000U, 0x00000000U, 0x0000FFF0U,
     0x80000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
@@ -925,7 +921,7 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFC00000U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFF800U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000E000U, 0x00000000U, 0x0000FF80U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -964,7 +960,7 @@ u_categ_Cn =
     0xF0008000U, 0xFFFFFFFEU, 0x0000FFFFU, 0xC0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xE0000000U, 0x00000000U, 0xFFFE0000U, 0xF0000000U,
-    0x00000000U, 0x0000FFF0U, 0x0000F800U, 0xF8000000U,
+    0x00000000U, 0x00001FF0U, 0x0000F800U, 0xF8000000U,
     0x40000000U, 0x00000000U, 0xFFC000F0U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0000000U, 0x0000FC00U, 0x00F00000U, 0xF0000000U,
@@ -1010,13 +1006,13 @@ u_categ_Cn =
     0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x7FF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0xFE000000U,
+    0x00000000U, 0x00000000U, 0x0000FF00U, 0x00000000U,
+    0x20000030U, 0xFFFFFFF8U, 0x00000000U, 0xFE000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000200U, 0x00800000U, 0x0000FFC0U, 0x0000E000U,
     0x00030000U, 0xFF800100U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000480U, 0x4B800000U, 0xFC00FF00U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -1045,7 +1041,7 @@ u_categ_Cn =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x0000FFE0U, 0x80000000U,
-    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU,
+    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFCU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -1054,8 +1050,12 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x80000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xF0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0xE000F800U,
@@ -1098,18 +1098,18 @@ u_categ_Cn =
     0xFFF00000U, 0x00018000U, 0x00010001U, 0xFFC00000U,
     0x0000E000U, 0x00008000U, 0x00000000U, 0x0000F000U,
     0x00000000U, 0xFFFFE000U, 0xFFFFFFFFU, 0x0000003FU,
-    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFFFU,
+    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFC0U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF80000U, 0xFF80E000U,
+    0x00000000U, 0x00000000U, 0xFFE00000U, 0xFE00E000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0xFFE00000U, 0xFFFFFFFFU,
     0x0000F000U, 0x00000000U, 0xFC00FF00U, 0x00000000U,
     0x0000FF00U, 0xFFFFC000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0x8000FFFFU, 0x8006FF00U, 0x8000F000U, 0xFFFFFFFFU,
-    0xFFFC0000U, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0x0000F000U, 0x80000000U, 0x0000E000U, 0xFFFFF000U,
+    0xFF000000U, 0xFFFFFFFFU, 0x0000FFFEU, 0xFFFFFF80U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFF800000U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -1123,9 +1123,13 @@ u_categ_Cn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x0000FFFCU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFEU,
     0xC0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/lib/unictype/categ_Co.h b/lib/unictype/categ_Co.h
index f9ffbe9520..74e0ce0961 100644
--- a/lib/unictype/categ_Co.h
+++ b/lib/unictype/categ_Co.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Cs.h b/lib/unictype/categ_Cs.h
index 9c959cc386..fc41c7d63d 100644
--- a/lib/unictype/categ_Cs.h
+++ b/lib/unictype/categ_Cs.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_L.h b/lib/unictype/categ_L.h
index 99b9d37165..e07cb58e58 100644
--- a/lib/unictype/categ_L.h
+++ b/lib/unictype/categ_L.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[65 << 4];
+    unsigned int level3[67 << 4];
   }
 u_categ_L =
 {
@@ -263,12 +263,12 @@ u_categ_L =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   864,
+        4 +   384 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
@@ -280,8 +280,8 @@ u_categ_L =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
         4 +   384 * sizeof (short) / sizeof (int) +   912,
+        4 +   384 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
        -1,
@@ -290,10 +290,10 @@ u_categ_L =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_categ_L =
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
+        4 +   384 * sizeof (short) / sizeof (int) +   976,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
@@ -393,8 +393,8 @@ u_categ_L =
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
-        4 +   384 * sizeof (short) / sizeof (int) +   976,
         4 +   384 * sizeof (short) / sizeof (int) +   992,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
@@ -405,21 +405,21 @@ u_categ_L =
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1024,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +   320,
+        4 +   384 * sizeof (short) / sizeof (int) +  1040,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_categ_L =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
-        4 +   384 * sizeof (short) / sizeof (int) +  1024,
+        4 +   384 * sizeof (short) / sizeof (int) +  1056,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9C00C060U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFC00U, 0x043007FFU,
-    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFE0003U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x00030003U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x10030003U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001C0000U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x02000003U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x00020003U,
@@ -510,7 +510,7 @@ u_categ_L =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000060U, 0x183E0000U, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -523,7 +523,7 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -566,7 +566,7 @@ u_categ_L =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF03FDU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF03FDU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x0000FF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -608,13 +608,13 @@ u_categ_L =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x80000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x00000001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x00000040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -639,7 +639,7 @@ u_categ_L =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001001FU, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -648,8 +648,12 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -685,9 +689,13 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_LC.h b/lib/unictype/categ_LC.h
index 02cc5445e2..3bec99e790 100644
--- a/lib/unictype/categ_LC.h
+++ b/lib/unictype/categ_LC.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Ll.h b/lib/unictype/categ_Ll.h
index ce65fbbbb1..db260633ad 100644
--- a/lib/unictype/categ_Ll.h
+++ b/lib/unictype/categ_Ll.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Lm.h b/lib/unictype/categ_Lm.h
index 8e4855edbf..523a157aee 100644
--- a/lib/unictype/categ_Lm.h
+++ b/lib/unictype/categ_Lm.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -390,6 +390,6 @@ u_categ_Lm =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U
   }
 };
diff --git a/lib/unictype/categ_Lo.h b/lib/unictype/categ_Lo.h
index 6eca13970c..b804d045f8 100644
--- a/lib/unictype/categ_Lo.h
+++ b/lib/unictype/categ_Lo.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[62 << 4];
+    unsigned int level3[64 << 4];
   }
 u_categ_Lo =
 {
@@ -263,12 +263,12 @@ u_categ_Lo =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   848,
+        4 +   384 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   864,
+        4 +   384 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -290,10 +290,10 @@ u_categ_Lo =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_categ_Lo =
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
+        4 +   384 * sizeof (short) / sizeof (int) +   928,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
@@ -393,8 +393,8 @@ u_categ_Lo =
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
-        4 +   384 * sizeof (short) / sizeof (int) +   928,
         4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
@@ -405,21 +405,21 @@ u_categ_Lo =
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
+        4 +   384 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_categ_Lo =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   288,
-        4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_categ_Lo =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9C00C000U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFC00U, 0x000007FFU,
-    0x003FFFFFU, 0x00000000U, 0x01FFFFFFU, 0x00000000U,
+    0x003FFFFFU, 0x00000000U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFC0003U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x00030003U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x10030003U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001C0000U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x02000003U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x00020003U,
@@ -502,7 +502,7 @@ u_categ_Lo =
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
     0x00000040U, 0x10000000U, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0x807FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0x87FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -515,7 +515,7 @@ u_categ_Lo =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFDFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -562,7 +562,7 @@ u_categ_Lo =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF03FDU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF03FDU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x0000FF0FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -604,13 +604,13 @@ u_categ_Lo =
     0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x00000001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x00000040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -644,8 +644,12 @@ u_categ_Lo =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -673,9 +677,13 @@ u_categ_Lo =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Lt.h b/lib/unictype/categ_Lt.h
index 2bb51cc52e..210a32ab80 100644
--- a/lib/unictype/categ_Lt.h
+++ b/lib/unictype/categ_Lt.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Lu.h b/lib/unictype/categ_Lu.h
index 25e8c21dc5..b8f5afa17a 100644
--- a/lib/unictype/categ_Lu.h
+++ b/lib/unictype/categ_Lu.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_M.h b/lib/unictype/categ_M.h
index 312d01c4a0..7674bdea1e 100644
--- a/lib/unictype/categ_M.h
+++ b/lib/unictype/categ_M.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_categ_M =
 {
@@ -191,8 +191,8 @@ u_categ_M =
        16 +   384 * sizeof (short) / sizeof (int) +   416,
        16 +   384 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -231,10 +231,10 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       -1,
        -1,
        -1,
        -1,
@@ -272,7 +272,7 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -282,19 +282,19 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   512,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -306,7 +306,7 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -453,12 +453,12 @@ u_categ_M =
     0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x0080399FU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x00023987U, 0x00230000U,
-    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0x0000000CU,
+    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0xFC00000CU,
     0x0000000EU, 0xD0000000U, 0x00C0399FU, 0x0000000CU,
     0x00000004U, 0xC0000000U, 0x00803DC7U, 0x00000000U,
     0x0000000FU, 0xC0000000U, 0x00603DDFU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x00603DDFU, 0x0000000CU,
-    0x0000000EU, 0xC0000000U, 0x00803DDFU, 0x0000000CU,
+    0x0000000FU, 0xD8000000U, 0x00803DDFU, 0x0000000CU,
     0x0000000CU, 0x00000000U, 0xFF5F8400U, 0x000C0000U,
     0x00000000U, 0x07F20000U, 0x00007F80U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -485,9 +485,9 @@ u_categ_M =
     0x0000001FU, 0xFFF00000U, 0x0000001FU, 0x000FF800U,
     0x00000007U, 0x00003FFEU, 0x00000000U, 0x000FFFC0U,
     0x00000000U, 0x00FFFFF0U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF70000U, 0x031C21FFU,
+    0x00000000U, 0x00000000U, 0xFFF70000U, 0x039C21FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0001FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -548,9 +548,13 @@ u_categ_M =
     0x00000000U, 0x00FFF800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000007FEU, 0x7BF80000U, 0x0FFE0080U, 0x00000000U,
+    0x03FFFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFF7F8000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/categ_Mc.h b/lib/unictype/categ_Mc.h
index ff9f0f6e89..d3d646bf0f 100644
--- a/lib/unictype/categ_Mc.h
+++ b/lib/unictype/categ_Mc.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[19 << 4];
+    unsigned int level3[20 << 4];
   }
 u_categ_Mc =
 {
@@ -186,8 +186,8 @@ u_categ_Mc =
         3 +   256 * sizeof (short) / sizeof (int) +   224,
         3 +   256 * sizeof (short) / sizeof (int) +   240,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   256,
+        3 +   256 * sizeof (short) / sizeof (int) +   272,
        -1,
        -1,
        -1,
@@ -228,7 +228,7 @@ u_categ_Mc =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   272,
+        3 +   256 * sizeof (short) / sizeof (int) +   288,
        -1,
        -1,
        -1,
@@ -277,7 +277,7 @@ u_categ_Mc =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   288,
+        3 +   256 * sizeof (short) / sizeof (int) +   304,
        -1,
        -1,
        -1,
@@ -336,7 +336,7 @@ u_categ_Mc =
     0x00000010U, 0xE8200000U, 0x0000001BU, 0x00000000U,
     0x00000004U, 0x000004C2U, 0x00000000U, 0x000C5C80U,
     0x00000000U, 0x00300FF0U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x000C0002U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x008C0002U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x0000C000U, 0x00000000U, 0x00000000U,
@@ -367,6 +367,10 @@ u_categ_Mc =
     0x00000000U, 0x0040D000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000043U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000180U, 0x02000000U, 0x01800000U, 0x00000000U,
+    0x00800000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x40008000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00120200U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Me.h b/lib/unictype/categ_Me.h
index 3045e835bf..d4c37c0fb2 100644
--- a/lib/unictype/categ_Me.h
+++ b/lib/unictype/categ_Me.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Mn.h b/lib/unictype/categ_Mn.h
index 6156c6f560..96f5705350 100644
--- a/lib/unictype/categ_Mn.h
+++ b/lib/unictype/categ_Mn.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_categ_Mn =
 {
@@ -199,8 +199,8 @@ u_categ_Mn =
        16 +   384 * sizeof (short) / sizeof (int) +   416,
        16 +   384 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -239,10 +239,10 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       -1,
        -1,
        -1,
        -1,
@@ -280,7 +280,7 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -290,19 +290,19 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   512,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -314,7 +314,7 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -461,12 +461,12 @@ u_categ_Mn =
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0000000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x0000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
-    0x00000006U, 0x10000000U, 0x000021BEU, 0x0000000CU,
+    0x00000006U, 0x10000000U, 0x000021BEU, 0xFC00000CU,
     0x00000002U, 0x90000000U, 0x0040201EU, 0x0000000CU,
     0x00000004U, 0x00000000U, 0x00002001U, 0x00000000U,
     0x00000001U, 0xC0000000U, 0x00603DC1U, 0x0000000CU,
     0x00000002U, 0x90000000U, 0x00003040U, 0x0000000CU,
-    0x00000002U, 0x00000000U, 0x0000201EU, 0x0000000CU,
+    0x00000003U, 0x18000000U, 0x0000201EU, 0x0000000CU,
     0x00000000U, 0x00000000U, 0x005C0400U, 0x00000000U,
     0x00000000U, 0x07F20000U, 0x00007F80U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -495,7 +495,7 @@ u_categ_Mn =
     0x00000000U, 0x00CFF000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFF70000U, 0x031021FDU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x1FFF0000U, 0x0001FFE2U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -556,9 +556,13 @@ u_categ_Mn =
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000067EU, 0x79F80000U, 0x0E7E0080U, 0x00000000U,
+    0x037FFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xBF7F0000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x006DFCFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/categ_N.h b/lib/unictype/categ_N.h
index 5dd9c54445..92586b86ff 100644
--- a/lib/unictype/categ_N.h
+++ b/lib/unictype/categ_N.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -441,7 +441,7 @@ u_categ_N =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00001FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Nd.h b/lib/unictype/categ_Nd.h
index f5b90a779d..9a094c4791 100644
--- a/lib/unictype/categ_Nd.h
+++ b/lib/unictype/categ_Nd.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -385,7 +385,7 @@ u_categ_Nd =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Nl.h b/lib/unictype/categ_Nl.h
index 49ccc5ee5e..418e53fe9d 100644
--- a/lib/unictype/categ_Nl.h
+++ b/lib/unictype/categ_Nl.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_No.h b/lib/unictype/categ_No.h
index 7e2708fc54..b4908813f4 100644
--- a/lib/unictype/categ_No.h
+++ b/lib/unictype/categ_No.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_P.h b/lib/unictype/categ_P.h
index 962cf2bb90..241fd2c1d5 100644
--- a/lib/unictype/categ_P.h
+++ b/lib/unictype/categ_P.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[43 << 4];
+    unsigned int level3[44 << 4];
   }
 u_categ_P =
 {
@@ -186,12 +186,12 @@ u_categ_P =
         3 +   256 * sizeof (short) / sizeof (int) +   560,
         3 +   256 * sizeof (short) / sizeof (int) +   576,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   592,
+        3 +   256 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   608,
+        3 +   256 * sizeof (short) / sizeof (int) +   624,
        -1,
        -1,
        -1,
@@ -226,7 +226,7 @@ u_categ_P =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   624,
+        3 +   256 * sizeof (short) / sizeof (int) +   640,
        -1,
        -1,
        -1,
@@ -267,7 +267,7 @@ u_categ_P =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   640,
+        3 +   256 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
@@ -282,14 +282,14 @@ u_categ_P =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   656,
+        3 +   256 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   672,
+        3 +   256 * sizeof (short) / sizeof (int) +   688,
        -1,
        -1,
        -1,
@@ -322,7 +322,7 @@ u_categ_P =
     0x00000000U, 0x7FFF0000U, 0x40000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010030U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x20000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -383,7 +383,7 @@ u_categ_P =
     0x00000000U, 0x00000000U, 0x00000000U, 0xDE000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF7FFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF7FFFU, 0x000003FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -451,6 +451,10 @@ u_categ_P =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x70000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x80000000U, 0x0000007FU, 0x00000000U,
+    0xDC000000U, 0x00000007U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x0000003EU, 0x00030000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Pc.h b/lib/unictype/categ_Pc.h
index fb32608e73..f14a0d5f9a 100644
--- a/lib/unictype/categ_Pc.h
+++ b/lib/unictype/categ_Pc.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Pd.h b/lib/unictype/categ_Pd.h
index 695a34f8fd..20053ad21f 100644
--- a/lib/unictype/categ_Pd.h
+++ b/lib/unictype/categ_Pd.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Pe.h b/lib/unictype/categ_Pe.h
index 082337ae46..31de007c8e 100644
--- a/lib/unictype/categ_Pe.h
+++ b/lib/unictype/categ_Pe.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Pf.h b/lib/unictype/categ_Pf.h
index d6ef18cdf2..0c7721e4fa 100644
--- a/lib/unictype/categ_Pf.h
+++ b/lib/unictype/categ_Pf.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Pi.h b/lib/unictype/categ_Pi.h
index eca23574e5..46978f24ed 100644
--- a/lib/unictype/categ_Pi.h
+++ b/lib/unictype/categ_Pi.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Po.h b/lib/unictype/categ_Po.h
index af994e7dbe..f631636b15 100644
--- a/lib/unictype/categ_Po.h
+++ b/lib/unictype/categ_Po.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_categ_Po =
 {
@@ -186,12 +186,12 @@ u_categ_Po =
         3 +   256 * sizeof (short) / sizeof (int) +   480,
         3 +   256 * sizeof (short) / sizeof (int) +   496,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   512,
+        3 +   256 * sizeof (short) / sizeof (int) +   528,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   528,
+        3 +   256 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
@@ -226,7 +226,7 @@ u_categ_Po =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   544,
+        3 +   256 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
        -1,
@@ -267,7 +267,7 @@ u_categ_Po =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   560,
+        3 +   256 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
@@ -282,14 +282,14 @@ u_categ_Po =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   576,
+        3 +   256 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   592,
+        3 +   256 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -322,7 +322,7 @@ u_categ_Po =
     0x00000000U, 0x7FFF0000U, 0x40000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010030U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x20000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -367,7 +367,7 @@ u_categ_Po =
     0x00000000U, 0x00000000U, 0x00000000U, 0xDE000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xCB7FC9C3U, 0xF3FF7C00U, 0x0000001AU, 0x00000000U,
+    0xCB7FC9C3U, 0xF3FF7C00U, 0x000003FAU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -431,6 +431,10 @@ u_categ_Po =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x70000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x80000000U, 0x0000007FU, 0x00000000U,
+    0xDC000000U, 0x00000007U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x0000003EU, 0x00030000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Ps.h b/lib/unictype/categ_Ps.h
index 85e9d1b9c2..bec9205891 100644
--- a/lib/unictype/categ_Ps.h
+++ b/lib/unictype/categ_Ps.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_S.h b/lib/unictype/categ_S.h
index e0ee123356..39021c90ee 100644
--- a/lib/unictype/categ_S.h
+++ b/lib/unictype/categ_S.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -360,13 +360,13 @@ u_categ_S =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xA0000000U, 0xE000E003U, 0x6000E000U,
     0x00000000U, 0x00000000U, 0x00040010U, 0x1C000000U,
-    0x00001C00U, 0x7FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00001C00U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0xC1D0037BU, 0x0C0042AFU, 0x0000BC1FU, 0x00000000U,
     0xFFFF0C00U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFF0FFU, 0xFFFFF9FFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0x00000000U,
     0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -382,7 +382,7 @@ u_categ_S =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000007E0U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -483,17 +483,17 @@ u_categ_S =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0xFFFF0000U, 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0x00001FFFU, 0x00000000U, 0xFFFFFFC0U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU
   }
 };
diff --git a/lib/unictype/categ_Sc.h b/lib/unictype/categ_Sc.h
index 6d21d6eb8c..3b6335abe8 100644
--- a/lib/unictype/categ_Sc.h
+++ b/lib/unictype/categ_Sc.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -201,7 +201,7 @@ u_categ_Sc =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x08000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x7FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x01000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/categ_Sk.h b/lib/unictype/categ_Sk.h
index c141b83699..04efbeb954 100644
--- a/lib/unictype/categ_Sk.h
+++ b/lib/unictype/categ_Sk.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Sm.h b/lib/unictype/categ_Sm.h
index dde6b92341..64f00d4987 100644
--- a/lib/unictype/categ_Sm.h
+++ b/lib/unictype/categ_Sm.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_So.h b/lib/unictype/categ_So.h
index 781e770c27..2c389e5be0 100644
--- a/lib/unictype/categ_So.h
+++ b/lib/unictype/categ_So.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -354,7 +354,7 @@ u_categ_So =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFF0FFU, 0xFFFFF9FCU, 0xFFFFFFFFU, 0xEFFFFFFFU,
-    0x07FFFFFFU, 0xFFF00000U, 0x0FFFFFFFU, 0x7FFFFFFCU,
+    0x07FFFFFFU, 0xFFF00000U, 0x0FFFFFFFU, 0xFFFFFFFCU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0x00000000U,
     0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -370,7 +370,7 @@ u_categ_So =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x0000FFFFU, 0xFFFFE060U, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000007E0U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -455,17 +455,17 @@ u_categ_So =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0xFFFF0000U, 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0x00001FFFU, 0x00000000U, 0xFFFFFFC0U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU
   }
 };
diff --git a/lib/unictype/categ_Z.h b/lib/unictype/categ_Z.h
index 8a14c88cd8..ed7b64cd8c 100644
--- a/lib/unictype/categ_Z.h
+++ b/lib/unictype/categ_Z.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Zl.h b/lib/unictype/categ_Zl.h
index 906365a41e..c9f697f87b 100644
--- a/lib/unictype/categ_Zl.h
+++ b/lib/unictype/categ_Zl.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Zp.h b/lib/unictype/categ_Zp.h
index d312a4e1d2..b397eb9b97 100644
--- a/lib/unictype/categ_Zp.h
+++ b/lib/unictype/categ_Zp.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_Zs.h b/lib/unictype/categ_Zs.h
index 31f74120d8..bd09696885 100644
--- a/lib/unictype/categ_Zs.h
+++ b/lib/unictype/categ_Zs.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/categ_of.h b/lib/unictype/categ_of.h
index 588946eac2..c3d1a5805e 100644
--- a/lib/unictype/categ_of.h
+++ b/lib/unictype/categ_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[17];
     short level2[5 << 9];
-    unsigned short level3[216 * 40 + 1];
+    unsigned short level3[220 * 40 + 1];
   }
 u_category =
 {
@@ -107,18 +107,18 @@ u_category =
     17664, 17792,    -1,    -1, 17920,    -1,    -1,    -1,
     18048, 18176, 18304, 18432, 18560, 18688, 18816,    -1,
     18944, 19072,    -1, 19200, 19328, 19456, 19584,    -1,
-       -1, 19712,    -1,    -1,    -1, 19840,    -1,    -1,
-    19968, 20096,    -1,    -1,    -1,    -1,    -1,    -1,
-     4352,  4352,  4352,  4352,  4352,  4352,  4352, 20224,
-    20352,  4352, 20480,    -1,    -1,    -1,    -1,    -1,
+       -1, 19712,    -1,    -1, 19840, 19968,    -1,    -1,
+    20096, 20224, 20352,    -1,    -1,    -1,    -1,    -1,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352, 20480,
+    20608,  4352, 20736,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
-    20608,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    20864,    -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,
-     4352,  4352,  4352,  4352, 20736,    -1,    -1,    -1,
+     4352,  4352,  4352,  4352, 20992,    -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,
@@ -127,15 +127,15 @@ u_category =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     4352,  4352,  4352,  4352, 20864, 20992, 21120, 21248,
-       -1,    -1,    -1,    -1,    -1,    -1, 21376, 21504,
+     4352,  4352,  4352,  4352, 21120, 21248, 21376, 21504,
+       -1,    -1,    -1,    -1,    -1,    -1, 21632, 21760,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
-     4352,  4352,  4352,  4352,  4352,  4352,  4352, 21632,
-     4352,  4352,  4352,  4352,  4352, 21760,    -1,    -1,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352, 21888,
+     4352,  4352,  4352,  4352,  4352, 22016,    -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,
@@ -145,25 +145,25 @@ u_category =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    21888,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     4352,  4352, 22144,  4352,  4352, 22272,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    22016, 22144,    -1,    -1,    -1,    -1,    -1,    -1,
+    22400, 22528,    -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,
-     8832, 22272, 22400, 22528, 22656,    -1, 22784,    -1,
-    22912, 23040, 23168, 23296, 23424, 23552, 23680, 23808,
-     8832,  8832,  8832,  8832, 23936, 24064,    -1,    -1,
+     8832, 22656, 22784, 22912, 23040,    -1, 23168,    -1,
+    23296, 23424, 23552, 23680, 23808, 23936, 24064, 24192,
+     8832,  8832,  8832,  8832, 24320, 24448,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    24192,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    24576,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     4352, 24320, 24448,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 24576, 24704,    -1,    -1,
-    24832, 24960, 25088, 25216, 25344,    -1,  8832, 25472,
-     8832,  8832,  8832,  8832,  8832, 25600, 25728, 25856,
-    25984, 26112, 26240, 26368,    -1,    -1,    -1,    -1,
+     4352, 24704, 24832,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 24960, 25088,    -1,    -1,
+    25216, 25344, 25472, 25600, 25728,    -1,  8832, 25856,
+     8832,  8832,  8832,  8832,  8832, 25984, 26112, 26240,
+    26368, 26496, 26624, 26752,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
@@ -206,30 +206,30 @@ u_category =
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
-     4352,  4352,  4352,  4352,  4352, 26496,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352, 26880,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
-     4352,  4352,  4352,  4352,  4352,  4352, 26624,  4352,
-    26752,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352, 27008,  4352,
+    27136,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
      4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
-     4352,  4352,  4352,  4352,  4352, 26880,    -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,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     4352,  4352,  4352,  4352,  4352, 27264,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352,  4352,
+     4352,  4352,  4352,  4352,  4352,  4352,  4352, 27392,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     4352,  4352,  4352,  4352, 27008,    -1,    -1,    -1,
+     4352,  4352,  4352,  4352, 27520,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    27136,    -1, 27264, 27392,    -1,    -1,    -1,    -1,
+    27648,    -1, 27776, 27904,    -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,
@@ -356,7 +356,7 @@ u_category =
     13824, 13824, 13824, 13824, 13824, 13824, 13824, 13824,
     13824, 13824, 13824, 13824, 13824, 13824, 13824, 13824,
     13824, 13824, 13824, 13824, 13824, 13824, 13824, 13824,
-    13824, 13824, 13824, 13824, 13824, 13824, 13824, 27520
+    13824, 13824, 13824, 13824, 13824, 13824, 13824, 28032
   },
   {
     0xe739, 0x739c, 0x39ce, 0x9ce7, 0xce73, 0xe739, 0x739c, 0x39ce,
@@ -442,8 +442,8 @@ u_category =
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x4842, 0xa529,
     0x528c, 0x294a, 0x94a5, 0x4a32, 0xa329, 0x5294, 0xef4a, 0xc631,
     0x6318, 0x318c, 0x18c6, 0xec63, 0x1084, 0x0842, 0x8421, 0x4210,
-    0x2108, 0x1084, 0x0842, 0xa421, 0xd294, 0xec7b, 0xf7bd, 0x7bde,
-    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0x2108, 0x1084, 0x0842, 0xa421, 0xd294, 0xec7b, 0x1084, 0x0842,
+    0x8421, 0xde90, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef,
     0xdef7, 0xef7b, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x3a42, 0x8421, 0x4210, 0xef48, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
@@ -458,7 +458,7 @@ u_category =
     0x4210, 0x2108, 0x1084, 0x0842, 0xa421, 0x4213, 0x2108, 0x93a4,
     0x3bde, 0x8421, 0x5ef4, 0x3188, 0x94a6, 0x7a52, 0xa637, 0x6377,
     0xe90a, 0xf7bd, 0x7bde, 0xbd37, 0x4ef7, 0x2748, 0x9484, 0x3bd2,
-    0x0842, 0x8421, 0x4210, 0xcc84, 0x94a9, 0x4a52, 0xd9d5, 0xef7b,
+    0x0842, 0x8421, 0x4210, 0xcc84, 0x94a9, 0x4a52, 0x49d5, 0xef62,
     0x14bd, 0x09d3, 0x8421, 0xde90, 0x277b, 0x77a4, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0xa421, 0x4213, 0x2108, 0x13a4,
     0x09d2, 0x84e9, 0x5ef4, 0x31ba, 0x94a6, 0x7bde, 0xa52f, 0x52f7,
@@ -468,7 +468,7 @@ u_category =
     0x4210, 0x2108, 0x1084, 0x0842, 0xa421, 0x4213, 0x2108, 0x13a4,
     0x09d2, 0x8421, 0x5ef4, 0x3188, 0x94a6, 0x4a52, 0xc52f, 0x6374,
     0xef4a, 0xf7a4, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0x9484, 0x3bd2,
-    0x0842, 0x8421, 0x4210, 0xf671, 0x7bde, 0x9def, 0xdef4, 0xef7b,
+    0x0842, 0x8421, 0x4210, 0xf671, 0x7bde, 0x9def, 0x5294, 0x294a,
     0x18bd, 0x09d3, 0x8421, 0x4210, 0x277a, 0x77a4, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0xa421, 0x4213, 0x2108, 0x13a4,
     0x09d2, 0x8421, 0x5ef4, 0x2988, 0x94a6, 0x7a52, 0xa637, 0x6377,
@@ -489,9 +489,9 @@ u_category =
     0x09d2, 0x8421, 0x5ef4, 0x2988, 0x18c6, 0x7a63, 0xa631, 0x531b,
     0xef4a, 0xf7bd, 0x8dde, 0xbde9, 0xdef7, 0xe93b, 0x9484, 0x3bd2,
     0x0842, 0x8421, 0x4210, 0x909d, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
-    0x18bd, 0x09d3, 0x8421, 0x4210, 0x213a, 0x13a4, 0x0842, 0x8421,
+    0x18a5, 0x09d3, 0x8421, 0x4210, 0x213a, 0x13a4, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
-    0x0842, 0x8421, 0xde90, 0x3189, 0x94a6, 0xba52, 0xa631, 0x631b,
+    0x0842, 0x8421, 0x5290, 0x3188, 0x94a6, 0xba52, 0xa631, 0x631b,
     0xa90a, 0xf7bd, 0x084e, 0x4a31, 0xa529, 0x2294, 0x9484, 0x3bd2,
     0x0842, 0x8421, 0x4210, 0x294a, 0x94a5, 0xaa52, 0x4212, 0x2108,
     0x1bbd, 0x09d3, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0xbde9,
@@ -628,7 +628,7 @@ u_category =
     0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xc631, 0x6318, 0xbd8c, 0xdef7,
     0xef7b, 0x94a5, 0x4a58, 0xa529, 0x5294, 0x294a, 0x94c5, 0x4a52,
-    0x8529, 0x4210, 0x210a, 0x1884, 0x0853, 0xa5e9, 0xdef4, 0xef7b,
+    0x8529, 0x4210, 0x210a, 0x1884, 0x0853, 0xa531, 0xdef4, 0xef7b,
     0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x3084, 0x18c6, 0x8c63,
     0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
@@ -638,7 +638,7 @@ u_category =
     0x3184, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63,
     0xc631, 0x6318, 0x318c, 0x18c6, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
-    0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xbdef, 0x52f7, 0x294a,
+    0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x52f4, 0x294a,
     0x8020, 0x0200, 0x2008, 0x0080, 0x0802, 0x8020, 0x0200, 0x2008,
     0x0080, 0x0802, 0x8020, 0x0200, 0x2008, 0x0080, 0x0802, 0x8020,
     0x0200, 0x2008, 0x0080, 0x0802, 0x8020, 0x0200, 0x2008, 0x0080,
@@ -666,7 +666,7 @@ u_category =
     0x5ad6, 0xad6b, 0xd6b5, 0xf46a, 0x94ae, 0x4a52, 0x2949, 0x1b9b,
     0x294a, 0x94a5, 0x4a52, 0x2949, 0xeb9b, 0x8c63, 0xc631, 0x6318,
     0x318c, 0xef7a, 0xce73, 0xe739, 0x739c, 0x39ce, 0x9ce7, 0xce73,
-    0xe739, 0x739c, 0x39ce, 0xece7, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
+    0xe739, 0x739c, 0x39ce, 0x9ce7, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
     0xef7b, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x39ce, 0x9ca7, 0x4a73,
     0xa529, 0x5294, 0x294a, 0xf7a5, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x82b5, 0x6b5a, 0xb505, 0x0006, 0x0840, 0x8000, 0x4150, 0x12ad,
@@ -693,7 +693,7 @@ u_category =
     0x2956, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0x6b59, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
     0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x2ad6, 0x94a5, 0xd652, 0x6b5a,
-    0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xed6b,
+    0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b,
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xbded, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0xded6,
@@ -742,7 +742,7 @@ u_category =
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ef,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0xdef6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad7,
-    0xad6b, 0xf6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
+    0xad6b, 0xd6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
     0xbdef, 0x5ef7, 0xad6b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe800, 0x8421,
@@ -766,7 +766,7 @@ u_category =
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
     0x3e31, 0x60f8, 0xf18c, 0xf8c1, 0x8c60, 0xc631, 0x6318, 0x3164,
     0xf8b2, 0x8c60, 0x360f, 0x5cd7, 0xcd73, 0x18c5, 0x1c63, 0xc631,
-    0x6318, 0x318c, 0x1632, 0x8c63, 0xb62c, 0x7b18, 0xbdef, 0xdef7,
+    0x6318, 0x318c, 0x1632, 0x8c63, 0xb62c, 0x6318, 0x318c, 0xdef6,
     0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad,
@@ -790,7 +790,7 @@ u_category =
     0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x3890, 0x20c6,
     0xf7bd, 0x09de, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
-    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0xef48, 0x109d,
+    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0xe908, 0x109d,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
     0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
@@ -817,8 +817,8 @@ u_category =
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
-    0x2108, 0x1084, 0x4842, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
-    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
+    0x8421, 0xde90, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0642, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
@@ -980,7 +980,7 @@ u_category =
     0x2108, 0xf7a4, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0x2945, 0x94a5,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xd529, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
-    0x4210, 0x2108, 0x294a, 0x7bd5, 0xbdef, 0xdef7, 0xef7b, 0x1084,
+    0x4210, 0x2108, 0x294a, 0x7bd5, 0xbdef, 0xdef7, 0x2109, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1124, 0x0842, 0x8421, 0xdea4,
     0xef7b, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x1084, 0x4842, 0xa529, 0xde94, 0xef7b,
@@ -1134,8 +1134,13 @@ u_category =
     0x0000, 0x0000, 0x0000, 0x0000, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x2108, 0x1084,
     0x0842, 0xa529, 0x5294, 0xa94a, 0x7bde, 0xbdef, 0xdef7, 0x277b,
-    0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef,
-    0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
+    0x94a4, 0x4a52, 0xa631, 0x4214, 0x2108, 0x1084, 0x0842, 0x8421,
+    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x9084,
+    0x4a52, 0xc529, 0x5290, 0x894a, 0xc631, 0x6318, 0xbd2c, 0xdef7,
+    0xef7b, 0x94a4, 0x4a52, 0xa631, 0x4294, 0x2108, 0x1084, 0x0842,
+    0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
+    0x1084, 0x3bd2, 0x8421, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa531,
+    0x18c4, 0x8c7b, 0xc631, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0x1084, 0x0842, 0x8421, 0x4210,
     0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0xa421, 0xdef7, 0xef7b,
@@ -1149,6 +1154,11 @@ u_category =
     0x4a62, 0xbde9, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
     0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0x1084, 0x0842, 0x84e9, 0x4274, 0x2108, 0x1084, 0x0842, 0x8421,
+    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x94a4,
+    0x4a52, 0xbde9, 0x5e97, 0x2f4a, 0x94a5, 0x0a52, 0xbd29, 0xdef7,
+    0xef7b, 0x2108, 0x1084, 0x0842, 0xdef5, 0xef7b, 0xf7bd, 0x7bde,
+    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0xdef4, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
@@ -1202,7 +1212,7 @@ u_category =
     0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0x2f7b, 0x94a5, 0xc631, 0x6318,
     0x318c, 0x18c6, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
-    0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7a3, 0x7bde,
+    0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf463, 0x7bde,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
@@ -1214,11 +1224,16 @@ u_category =
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
     0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x9084, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
-    0xf484, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef,
-    0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
+    0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
+    0x4210, 0xe908, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
     0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
-    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0xbdef, 0xdef7, 0xef7b, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
+    0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
+    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
+    0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
+    0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
+    0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0xd210, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
@@ -1352,7 +1367,7 @@ u_category =
     0xd6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0xdad6, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0xdef7,
-    0xef7b, 0xf6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
+    0xef7b, 0xf6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
@@ -1362,8 +1377,8 @@ u_category =
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
-    0xad6b, 0xd6b5, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a,
-    0xb5ad, 0x5ad6, 0xef7b, 0xd6b5, 0x6b5a, 0xbded, 0xdef7, 0xef7b,
+    0xad6b, 0xd6b5, 0x7b5a, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a,
+    0xb5ad, 0x5ad6, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0xdef7, 0xef7b,
     0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad,
     0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
@@ -1384,16 +1399,16 @@ u_category =
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
     0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
-    0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad,
-    0x5ad6, 0xed6b, 0xd6b5, 0x6b5a, 0xbdad, 0xdef7, 0xef7b, 0xf7b5,
-    0x6b5a, 0xb5ad, 0x5ad6, 0xed6b, 0xd6b5, 0x6b5a, 0xb5ad, 0xdad6,
-    0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xed6b, 0xf7bd, 0x7bde,
-    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
-    0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xf6b5, 0x7bde, 0xbdef,
+    0xd6b5, 0x6b5a, 0xb5ad, 0xdad6, 0xef7b, 0xd6b5, 0x6b5a, 0xb5ad,
+    0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
+    0x6b5a, 0xb5ad, 0x5ad6, 0xed6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
+    0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a,
+    0xb5ad, 0xdad6, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xbdad,
     0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
     0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7b5, 0x7bde, 0xbdef, 0xdef7,
-    0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
-    0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
+    0xef7b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a,
+    0xbded, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
@@ -1410,9 +1425,14 @@ u_category =
     0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
     0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
-    0x4210, 0x2108, 0xf484, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
-    0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7,
-    0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde,
+    0x4210, 0x2108, 0xf484, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0x1084,
+    0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
+    0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
+    0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108,
+    0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
+    0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
+    0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
+    0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0xf7a4, 0x7bde,
     0xbdef, 0xdef7, 0xef7b, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b,
     0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421,
     0x4210, 0xef48, 0xf7bd, 0x7bde, 0xbdef, 0xdef7, 0xef7b, 0xf7bd,
diff --git a/lib/unictype/combiningclass.h b/lib/unictype/combiningclass.h
index 31087bb9df..f2d52c6994 100644
--- a/lib/unictype/combiningclass.h
+++ b/lib/unictype/combiningclass.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Combining class of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[2];
     short level2[2 << 9];
-    unsigned char level3[75 << 7];
+    unsigned char level3[79 << 7];
   }
 u_combclass =
 {
@@ -36,16 +36,16 @@ u_combclass =
        -1,    -1,    -1,    -1,    -1,    -1,     0,    -1,
        -1,   128,    -1,   256,   384,   512,   640,   768,
       896,  1024,  1152,  1280,  1280,  1280,  1280,  1408,
-     1536,  1280,  1408,  1664,  1792,  1920,  2048,  2176,
-     2304,  2432,    -1,    -1,    -1,    -1,  2560,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,  2688,  2816,
-       -1,  2944,  3072,    -1,  3200,  3328,  3456,  3584,
-     3712,  3840,    -1,  3968,    -1,    -1,    -1,    -1,
-       -1,  4096,    -1,    -1,    -1,    -1,    -1,    -1,
+     1536,  1280,  1664,  1792,  1920,  2048,  2176,  2304,
+     2432,  2560,    -1,    -1,    -1,    -1,  2688,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  2816,  2944,
+       -1,  3072,  3200,    -1,  3328,  3456,  3584,  3712,
+     3840,  3968,    -1,  4096,    -1,    -1,    -1,    -1,
+       -1,  4224,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  4224,  4352,  4480,    -1,    -1,    -1,    -1,
-     4608,  4736,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  4352,  4480,  4608,    -1,    -1,    -1,    -1,
+     4736,  4864,    -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,
@@ -74,8 +74,8 @@ u_combclass =
        -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,  4864,  4992,    -1,    -1,
-     5120,  5248,  5376,  5504,    -1,  5632,    -1,  5760,
+       -1,    -1,    -1,    -1,  4992,  5120,    -1,    -1,
+     5248,  5376,  5504,  5632,    -1,  5760,    -1,  5888,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -95,16 +95,17 @@ u_combclass =
        -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,  5888,    -1,
-       -1,    -1,    -1,    -1,  6016,    -1,    -1,    -1,
-       -1,    -1,    -1,  6144,    -1,  6272,  6400,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  6016,    -1,
+       -1,    -1,    -1,    -1,  6144,    -1,    -1,    -1,
+       -1,    -1,    -1,  6272,    -1,  6400,  6528,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,  6528,  6656,    -1,    -1,
+       -1,    -1,    -1,    -1,  6656,  6784,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     6784,  6912,  7040,  7168,  7296,  7424,  7552,    -1,
-     7680,  7808,    -1,  7936,  8064,  8192,  8320,    -1,
+     6912,  7040,  7168,  7296,  7424,  7552,  7680,    -1,
+     7808,  7936,    -1,  8064,  8192,  8320,  8448,    -1,
+       -1,    -1,    -1,    -1,  8576,  8704,    -1,    -1,
+     8192,    -1,  8832,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     8064,    -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,
@@ -122,8 +123,8 @@ u_combclass =
        -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,  8960,  9088,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,  8448,  8576,    -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,
@@ -143,19 +144,18 @@ u_combclass =
        -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,  9216,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  8704,    -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,  9344,  9472,  9600,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  8832,  8960,  9088,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9728,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     9216,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  9344,  9472,    -1,    -1,    -1,    -1,    -1,
+       -1,  9856,  9984,    -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,
@@ -378,6 +378,22 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   9,   9,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   9,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   9,   0,   0,   0,   0,   0,
@@ -673,8 +689,8 @@ u_combclass =
     230, 230, 230, 230, 230, 230, 230, 230,
     230, 230, 230, 230, 230, 230, 230, 230,
     230, 230, 230, 230, 230, 230, 230, 230,
-    230, 230, 230, 230, 230, 230,   0,   0,
-      0,   0,   0, 230, 233, 220, 230, 220,
+    230, 230, 230, 230, 230, 230, 232, 228,
+    228, 220,   0, 230, 233, 220, 230, 220,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -1225,6 +1241,54 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   9,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   9,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   9,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   7,   0,   9,   9,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
diff --git a/lib/unictype/ctype_alnum.h b/lib/unictype/ctype_alnum.h
index f05638b39e..1ef5d6fc78 100644
--- a/lib/unictype/ctype_alnum.h
+++ b/lib/unictype/ctype_alnum.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[67 << 4];
+    unsigned int level3[69 << 4];
   }
 u_is_alnum =
 {
@@ -263,12 +263,12 @@ u_is_alnum =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -280,8 +280,8 @@ u_is_alnum =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
         4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
@@ -290,11 +290,11 @@ u_is_alnum =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_is_alnum =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +   992,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -393,8 +393,8 @@ u_is_alnum =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
         4 +   384 * sizeof (short) / sizeof (int) +  1024,
+        4 +   384 * sizeof (short) / sizeof (int) +  1040,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -405,21 +405,21 @@ u_is_alnum =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1040,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1056,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +  1072,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_is_alnum =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1056,
+        4 +   384 * sizeof (short) / sizeof (int) +  1088,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_is_alnum =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU,
-    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x0003FFC3U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U,
@@ -514,7 +514,7 @@ u_is_alnum =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -527,7 +527,7 @@ u_is_alnum =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -570,7 +570,7 @@ u_is_alnum =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -612,13 +612,13 @@ u_is_alnum =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -643,7 +643,7 @@ u_is_alnum =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001001FU, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -652,8 +652,12 @@ u_is_alnum =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -693,9 +697,13 @@ u_is_alnum =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/ctype_alpha.h b/lib/unictype/ctype_alpha.h
index c19b58f4a1..eecc71a03d 100644
--- a/lib/unictype/ctype_alpha.h
+++ b/lib/unictype/ctype_alpha.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[67 << 4];
+    unsigned int level3[69 << 4];
   }
 u_is_alpha =
 {
@@ -263,12 +263,12 @@ u_is_alpha =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -280,8 +280,8 @@ u_is_alpha =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
         4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
@@ -290,11 +290,11 @@ u_is_alpha =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_is_alpha =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +   992,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -393,8 +393,8 @@ u_is_alpha =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
         4 +   384 * sizeof (short) / sizeof (int) +  1024,
+        4 +   384 * sizeof (short) / sizeof (int) +  1040,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -405,21 +405,21 @@ u_is_alpha =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1040,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1056,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +  1072,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_is_alpha =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1056,
+        4 +   384 * sizeof (short) / sizeof (int) +  1088,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_is_alpha =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU,
-    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x0003FFC3U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U,
@@ -514,7 +514,7 @@ u_is_alpha =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -527,7 +527,7 @@ u_is_alpha =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -570,7 +570,7 @@ u_is_alpha =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -612,13 +612,13 @@ u_is_alpha =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -643,7 +643,7 @@ u_is_alpha =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001001FU, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -652,8 +652,12 @@ u_is_alpha =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -693,9 +697,13 @@ u_is_alpha =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/ctype_blank.h b/lib/unictype/ctype_blank.h
index 2a2f53148a..cd64068516 100644
--- a/lib/unictype/ctype_blank.h
+++ b/lib/unictype/ctype_blank.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_cntrl.h b/lib/unictype/ctype_cntrl.h
index 084667db0a..09b6f918d7 100644
--- a/lib/unictype/ctype_cntrl.h
+++ b/lib/unictype/ctype_cntrl.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_digit.h b/lib/unictype/ctype_digit.h
index d9e353af29..ac7212f0eb 100644
--- a/lib/unictype/ctype_digit.h
+++ b/lib/unictype/ctype_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_graph.h b/lib/unictype/ctype_graph.h
index 3f3951549e..2f2f197265 100644
--- a/lib/unictype/ctype_graph.h
+++ b/lib/unictype/ctype_graph.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[17];
     short level2[5 << 7];
-    unsigned int level3[78 << 4];
+    unsigned int level3[79 << 4];
   }
 u_is_graph =
 {
@@ -77,15 +77,15 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   224,
        18 +   640 * sizeof (short) / sizeof (int) +   240,
        18 +   640 * sizeof (short) / sizeof (int) +   256,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   272,
-       18 +   640 * sizeof (short) / sizeof (int) +   288,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   288,
        18 +   640 * sizeof (short) / sizeof (int) +   304,
        18 +   640 * sizeof (short) / sizeof (int) +   320,
        18 +   640 * sizeof (short) / sizeof (int) +   336,
        18 +   640 * sizeof (short) / sizeof (int) +   352,
-       18 +   640 * sizeof (short) / sizeof (int) +   368,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -98,7 +98,7 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   384,
+       18 +   640 * sizeof (short) / sizeof (int) +   368,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -139,13 +139,13 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   400,
+       18 +   640 * sizeof (short) / sizeof (int) +   384,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   400,
        18 +   640 * sizeof (short) / sizeof (int) +   416,
        18 +   640 * sizeof (short) / sizeof (int) +   432,
        18 +   640 * sizeof (short) / sizeof (int) +   448,
-       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -167,7 +167,7 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -185,6 +185,7 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   480,
        18 +   640 * sizeof (short) / sizeof (int) +   496,
        18 +   640 * sizeof (short) / sizeof (int) +   512,
        18 +   640 * sizeof (short) / sizeof (int) +   528,
@@ -202,11 +203,10 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   720,
        18 +   640 * sizeof (short) / sizeof (int) +   736,
        18 +   640 * sizeof (short) / sizeof (int) +   752,
-       18 +   640 * sizeof (short) / sizeof (int) +   768,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   768,
        18 +   640 * sizeof (short) / sizeof (int) +   784,
-       18 +   640 * sizeof (short) / sizeof (int) +   800,
        -1,
        -1,
        -1,
@@ -214,7 +214,7 @@ u_is_graph =
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   816,
+       18 +   640 * sizeof (short) / sizeof (int) +   800,
        -1,
        -1,
        -1,
@@ -223,7 +223,7 @@ u_is_graph =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   832,
+       18 +   640 * sizeof (short) / sizeof (int) +   816,
        -1,
        -1,
        -1,
@@ -241,9 +241,9 @@ u_is_graph =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   848,
+       18 +   640 * sizeof (short) / sizeof (int) +   832,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +   864,
+       18 +   640 * sizeof (short) / sizeof (int) +   848,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -255,9 +255,9 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   880,
+       18 +   640 * sizeof (short) / sizeof (int) +   864,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   896,
+       18 +   640 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -276,12 +276,12 @@ u_is_graph =
        -1,
        -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   896,
        18 +   640 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
        -1,
-       -1,
        18 +   640 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
@@ -420,20 +420,20 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +  1184,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +  1200,
        -1,
        -1,
        -1,
@@ -441,10 +441,10 @@ u_is_graph =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +  1200,
+       18 +   640 * sizeof (short) / sizeof (int) +  1216,
        -1,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +  1216,
+       18 +   640 * sizeof (short) / sizeof (int) +  1232,
        -1,
        -1,
        -1,
@@ -699,7 +699,7 @@ u_is_graph =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +  1232
+       18 +   640 * sizeof (short) / sizeof (int) +  1248
   },
   {
     0x00000000U, 0xFFFFFFFEU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -718,17 +718,17 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
-    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0xFFF00000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x0FFFFFCFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x3FFFFFCFU,
     0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x003FFFC0U,
-    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0x0203FFCFU,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU,
     0xFFF99FEEU, 0xF3EDFDFFU, 0xB0C0399FU, 0x00FFFFCFU,
     0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U,
     0xFFFDDFEFU, 0xE3FFFDFFU, 0x07603DDFU, 0xFF00FFCFU,
     0xFFFDDFEFU, 0xF3EFFDFFU, 0x40603DDFU, 0x0006FFCFU,
-    0xFFFDDFEEU, 0xE7FFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
+    0xFFFDDFEFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
     0xFC7FFFECU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U,
     0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U,
     0xFEF02596U, 0x3BFFECAEU, 0xF3FF3F5FU, 0x00000000U,
@@ -759,21 +759,17 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0FFFU, 0x1FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU,
     0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
-    0x000001FFU, 0x00000000U, 0xFFFF00FFU, 0x037FFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFFF00FFU, 0x03FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU,
     0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0xFFF3FFDFU,
-    0x1FFF7FFFU, 0x7FFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
+    0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -781,18 +777,18 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0xFFFFFFFFU, 0xFFFF7FFFU, 0x7FFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU,
     0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU,
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
     0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x0FFF0000U,
     0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF7FFFU, 0x07FFFFFFU, 0xFFFFFFFFU, 0xFFFF000FU,
     0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -805,7 +801,7 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -844,7 +840,7 @@ u_is_graph =
     0x0FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU,
-    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU,
     0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -890,13 +886,13 @@ u_is_graph =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
+    0xDFFFFFCFU, 0x00000007U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -921,7 +917,7 @@ u_is_graph =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -930,8 +926,12 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -974,18 +974,18 @@ u_is_graph =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0xFFFF1FFFU, 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0x00001FFFU, 0x00000000U, 0xFFFFFFC0U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U,
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -999,9 +999,13 @@ u_is_graph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/ctype_lower.h b/lib/unictype/ctype_lower.h
index 2762a7fbeb..d24fcd6c05 100644
--- a/lib/unictype/ctype_lower.h
+++ b/lib/unictype/ctype_lower.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_print.h b/lib/unictype/ctype_print.h
index e611e74b38..ece2afd2bc 100644
--- a/lib/unictype/ctype_print.h
+++ b/lib/unictype/ctype_print.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[17];
     short level2[5 << 7];
-    unsigned int level3[78 << 4];
+    unsigned int level3[79 << 4];
   }
 u_is_print =
 {
@@ -77,15 +77,15 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   224,
        18 +   640 * sizeof (short) / sizeof (int) +   240,
        18 +   640 * sizeof (short) / sizeof (int) +   256,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   272,
-       18 +   640 * sizeof (short) / sizeof (int) +   288,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   288,
        18 +   640 * sizeof (short) / sizeof (int) +   304,
        18 +   640 * sizeof (short) / sizeof (int) +   320,
        18 +   640 * sizeof (short) / sizeof (int) +   336,
        18 +   640 * sizeof (short) / sizeof (int) +   352,
-       18 +   640 * sizeof (short) / sizeof (int) +   368,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -98,7 +98,7 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   384,
+       18 +   640 * sizeof (short) / sizeof (int) +   368,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -139,13 +139,13 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   400,
+       18 +   640 * sizeof (short) / sizeof (int) +   384,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   400,
        18 +   640 * sizeof (short) / sizeof (int) +   416,
        18 +   640 * sizeof (short) / sizeof (int) +   432,
        18 +   640 * sizeof (short) / sizeof (int) +   448,
-       18 +   640 * sizeof (short) / sizeof (int) +   464,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -167,7 +167,7 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   480,
+       18 +   640 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -185,6 +185,7 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   480,
        18 +   640 * sizeof (short) / sizeof (int) +   496,
        18 +   640 * sizeof (short) / sizeof (int) +   512,
        18 +   640 * sizeof (short) / sizeof (int) +   528,
@@ -202,11 +203,10 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   720,
        18 +   640 * sizeof (short) / sizeof (int) +   736,
        18 +   640 * sizeof (short) / sizeof (int) +   752,
-       18 +   640 * sizeof (short) / sizeof (int) +   768,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   768,
        18 +   640 * sizeof (short) / sizeof (int) +   784,
-       18 +   640 * sizeof (short) / sizeof (int) +   800,
        -1,
        -1,
        -1,
@@ -214,7 +214,7 @@ u_is_print =
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   816,
+       18 +   640 * sizeof (short) / sizeof (int) +   800,
        -1,
        -1,
        -1,
@@ -223,7 +223,7 @@ u_is_print =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   832,
+       18 +   640 * sizeof (short) / sizeof (int) +   816,
        -1,
        -1,
        -1,
@@ -241,9 +241,9 @@ u_is_print =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   848,
+       18 +   640 * sizeof (short) / sizeof (int) +   832,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +   864,
+       18 +   640 * sizeof (short) / sizeof (int) +   848,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
@@ -255,9 +255,9 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   880,
+       18 +   640 * sizeof (short) / sizeof (int) +   864,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +   896,
+       18 +   640 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -276,12 +276,12 @@ u_is_print =
        -1,
        -1,
        -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   896,
        18 +   640 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
        -1,
-       -1,
        18 +   640 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
@@ -420,20 +420,20 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +  1184,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +   160,
+       18 +   640 * sizeof (short) / sizeof (int) +  1200,
        -1,
        -1,
        -1,
@@ -441,10 +441,10 @@ u_is_print =
        -1,
        -1,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +  1200,
+       18 +   640 * sizeof (short) / sizeof (int) +  1216,
        -1,
        -1,
-       18 +   640 * sizeof (short) / sizeof (int) +  1216,
+       18 +   640 * sizeof (short) / sizeof (int) +  1232,
        -1,
        -1,
        -1,
@@ -699,7 +699,7 @@ u_is_print =
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
        18 +   640 * sizeof (short) / sizeof (int) +   160,
-       18 +   640 * sizeof (short) / sizeof (int) +  1232
+       18 +   640 * sizeof (short) / sizeof (int) +  1248
   },
   {
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -718,17 +718,17 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
-    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0xFFF00000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x0FFFFFCFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x3FFFFFCFU,
     0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x003FFFC0U,
-    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0x0203FFCFU,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU,
     0xFFF99FEEU, 0xF3EDFDFFU, 0xB0C0399FU, 0x00FFFFCFU,
     0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U,
     0xFFFDDFEFU, 0xE3FFFDFFU, 0x07603DDFU, 0xFF00FFCFU,
     0xFFFDDFEFU, 0xF3EFFDFFU, 0x40603DDFU, 0x0006FFCFU,
-    0xFFFDDFEEU, 0xE7FFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
+    0xFFFDDFEFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
     0xFC7FFFECU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U,
     0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U,
     0xFEF02596U, 0x3BFFECAEU, 0xF3FF3F5FU, 0x00000000U,
@@ -759,21 +759,17 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0FFFU, 0x1FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU,
     0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
-    0x000001FFU, 0x00000000U, 0xFFFF00FFU, 0x037FFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFFF00FFU, 0x03FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU,
     0xFFFFFFFFU, 0xFFFFFCFFU, 0xFFFFFFFFU, 0xFFF3FFDFU,
-    0x1FFF7FFFU, 0x7FFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
+    0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -781,18 +777,18 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0xFFFFFFFFU, 0xFFFF7FFFU, 0x7FFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU,
     0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU,
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
     0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x0FFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF7FFFU, 0x07FFFFFFU, 0xFFFFFFFFU, 0xFFFF000FU,
     0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -805,7 +801,7 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -844,7 +840,7 @@ u_is_print =
     0x0FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU,
-    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU,
     0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -890,13 +886,13 @@ u_is_print =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
+    0xDFFFFFCFU, 0x00000007U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -921,7 +917,7 @@ u_is_print =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -930,8 +926,12 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -974,18 +974,18 @@ u_is_print =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0xFFFF1FFFU, 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0x00001FFFU, 0x00000000U, 0xFFFFFFC0U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U,
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -999,9 +999,13 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/ctype_punct.h b/lib/unictype/ctype_punct.h
index 01e56c457f..86fb065516 100644
--- a/lib/unictype/ctype_punct.h
+++ b/lib/unictype/ctype_punct.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -79,13 +79,13 @@ u_is_punct =
        18 +   512 * sizeof (short) / sizeof (int) +   256,
        18 +   512 * sizeof (short) / sizeof (int) +   272,
        18 +   512 * sizeof (short) / sizeof (int) +   288,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
        18 +   512 * sizeof (short) / sizeof (int) +   304,
        18 +   512 * sizeof (short) / sizeof (int) +   320,
        18 +   512 * sizeof (short) / sizeof (int) +   336,
        18 +   512 * sizeof (short) / sizeof (int) +   352,
        18 +   512 * sizeof (short) / sizeof (int) +   368,
-       18 +   512 * sizeof (short) / sizeof (int) +   384,
        -1,
        -1,
        -1,
@@ -98,7 +98,7 @@ u_is_punct =
        -1,
        -1,
        -1,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   384,
        -1,
        -1,
        -1,
@@ -142,10 +142,10 @@ u_is_punct =
        -1,
        -1,
        -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   416,
        18 +   512 * sizeof (short) / sizeof (int) +   432,
        18 +   512 * sizeof (short) / sizeof (int) +   448,
-       18 +   512 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -172,26 +172,27 @@ u_is_punct =
        -1,
        -1,
        -1,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   464,
        18 +   512 * sizeof (short) / sizeof (int) +   480,
        18 +   512 * sizeof (short) / sizeof (int) +   496,
        18 +   512 * sizeof (short) / sizeof (int) +   512,
        18 +   512 * sizeof (short) / sizeof (int) +   528,
        18 +   512 * sizeof (short) / sizeof (int) +   544,
        18 +   512 * sizeof (short) / sizeof (int) +   560,
-       18 +   512 * sizeof (short) / sizeof (int) +   576,
        -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   576,
        18 +   512 * sizeof (short) / sizeof (int) +   592,
        18 +   512 * sizeof (short) / sizeof (int) +   608,
        18 +   512 * sizeof (short) / sizeof (int) +   624,
@@ -201,7 +202,6 @@ u_is_punct =
        18 +   512 * sizeof (short) / sizeof (int) +   688,
        18 +   512 * sizeof (short) / sizeof (int) +   704,
        18 +   512 * sizeof (short) / sizeof (int) +   720,
-       -1,
        18 +   512 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
@@ -296,7 +296,7 @@ u_is_punct =
        18 +   512 * sizeof (short) / sizeof (int) +   832,
        -1,
        18 +   512 * sizeof (short) / sizeof (int) +   848,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
        18 +   512 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
@@ -310,7 +310,7 @@ u_is_punct =
        18 +   512 * sizeof (short) / sizeof (int) +   912,
        18 +   512 * sizeof (short) / sizeof (int) +   928,
        18 +   512 * sizeof (short) / sizeof (int) +   944,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
        18 +   512 * sizeof (short) / sizeof (int) +   960,
        18 +   512 * sizeof (short) / sizeof (int) +   976,
        -1,
@@ -444,133 +444,133 @@ u_is_punct =
        -1,
        -1,
        -1,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
        18 +   512 * sizeof (short) / sizeof (int) +  1008
   },
   {
@@ -593,14 +593,14 @@ u_is_punct =
     0xFBC00000U, 0x7FFF3EEFU, 0x4E000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFF00000U, 0xFFFFFFFFU,
     0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0001003CU,
-    0x0000000EU, 0xD0000000U, 0x0080399FU, 0x0FFC000CU,
+    0x0000000EU, 0xD0000000U, 0x0080399FU, 0x2FFC000CU,
     0x0000000EU, 0xD0000000U, 0x00023987U, 0x00230000U,
-    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0x0003000CU,
+    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0xFC03000CU,
     0x0000000EU, 0xD0000000U, 0x00C0399FU, 0x00FD000CU,
     0x00000004U, 0xC0000000U, 0x00803DC7U, 0x07FF0000U,
     0x0000000FU, 0xC0000000U, 0x00603DDFU, 0xFF00000CU,
     0x0000000EU, 0xD0000000U, 0x00603DDFU, 0x0000000CU,
-    0x0000000EU, 0xC0000000U, 0x7F80BDDFU, 0x03FF000CU,
+    0x0000000FU, 0xD8000000U, 0x7F80BDDFU, 0x03FF000CU,
     0x0000000CU, 0x00000000U, 0xFF5F8400U, 0x001C0000U,
     0x00000000U, 0x80008000U, 0x0C008040U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -631,38 +631,34 @@ u_is_punct =
     0x0000001FU, 0xFFF00000U, 0xFC00001FU, 0x1FFFFFFFU,
     0x00000007U, 0x00003FFEU, 0x00000000U, 0xF00FFFC0U,
     0x00000000U, 0xF8FFFFF0U, 0x00000000U, 0xC0000000U,
-    0x00000000U, 0x00000000U, 0xFFFF00FFU, 0x031C21FFU,
+    0x00000000U, 0x00000000U, 0xFFFF00FFU, 0x039C21FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xA0000000U, 0xE000E003U, 0x6000E000U,
     0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0x7FF1FFDFU,
-    0x00007FFFU, 0x7FFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
+    0x00007FFFU, 0xFFFFFFFFU, 0xFFFF0000U, 0x0001FFFFU,
     0xC1D0037BU, 0x0C0040AFU, 0xFFFFBC1FU, 0x00000000U,
     0xFFFF0E00U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
     0x0FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFFFC00U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFE0387E0U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x80010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFF7FFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF7FFFU, 0x000003FFU, 0x00000000U,
     0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x0FFF0000U,
@@ -758,9 +754,13 @@ u_is_punct =
     0x00000000U, 0x00000000U, 0x00000000U, 0x0007FC00U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000007FEU, 0xFBF80000U, 0x0FFE00FFU, 0x00000000U,
+    0xDFFFFC00U, 0x00000007U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFF7F8000U, 0xFC00003EU, 0x00031FFFU,
     0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -810,18 +810,18 @@ u_is_punct =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0x00001FFFU, 0x00006000U, 0x0000FC00U, 0x00000C00U,
     0xFFFFF800U, 0x00001FDFU, 0x00000000U, 0x00000000U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U,
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU,
     0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/lib/unictype/ctype_space.h b/lib/unictype/ctype_space.h
index 94d25d7d31..15ab317d7f 100644
--- a/lib/unictype/ctype_space.h
+++ b/lib/unictype/ctype_space.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_upper.h b/lib/unictype/ctype_upper.h
index 37e3e0cd58..f72e838503 100644
--- a/lib/unictype/ctype_upper.h
+++ b/lib/unictype/ctype_upper.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/ctype_xdigit.h b/lib/unictype/ctype_xdigit.h
index 1fdc7f169a..9d97f5b9ad 100644
--- a/lib/unictype/ctype_xdigit.h
+++ b/lib/unictype/ctype_xdigit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/decdigit.h b/lib/unictype/decdigit.h
index 5ec18c2b26..63fa493d5d 100644
--- a/lib/unictype/decdigit.h
+++ b/lib/unictype/decdigit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decimal digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -112,7 +112,7 @@ u_decdigit =
       512,   256,  1664,   640,    -1,   256,    -1,    -1,
       640,   640,    -1,    -1,   640,   384,     0,    -1,
        -1,   128,    -1,    -1,    -1,    -1,    -1,    -1,
-      640,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      640,    -1,   640,    -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,
diff --git a/lib/unictype/digit.h b/lib/unictype/digit.h
index 2f4d1ecae7..c92c1e453d 100644
--- a/lib/unictype/digit.h
+++ b/lib/unictype/digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -112,7 +112,7 @@ u_digit =
      2944,   384,  3072,   768,    -1,   384,    -1,    -1,
       768,   768,    -1,    -1,   768,   512,     0,    -1,
        -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,
-      768,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      768,    -1,   768,    -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,
diff --git a/lib/unictype/joininggroup_byname.gperf b/lib/unictype/joininggroup_byname.gperf
index 73583703e5..5300f4212b 100644
--- a/lib/unictype/joininggroup_byname.gperf
+++ b/lib/unictype/joininggroup_byname.gperf
@@ -164,3 +164,25 @@ Manichaean Twenty, UC_JOINING_GROUP_MANICHAEAN_TWENTY
 ManichaeanTwenty, UC_JOINING_GROUP_MANICHAEAN_TWENTY
 Manichaean Hundred, UC_JOINING_GROUP_MANICHAEAN_HUNDRED
 ManichaeanHundred, UC_JOINING_GROUP_MANICHAEAN_HUNDRED
+Malayalam Nga, UC_JOINING_GROUP_MALAYALAM_NGA
+MalayalamNga, UC_JOINING_GROUP_MALAYALAM_NGA
+Malayalam Ja, UC_JOINING_GROUP_MALAYALAM_JA
+MalayalamJa, UC_JOINING_GROUP_MALAYALAM_JA
+Malayalam Nya, UC_JOINING_GROUP_MALAYALAM_NYA
+MalayalamNya, UC_JOINING_GROUP_MALAYALAM_NYA
+Malayalam Tta, UC_JOINING_GROUP_MALAYALAM_TTA
+MalayalamTta, UC_JOINING_GROUP_MALAYALAM_TTA
+Malayalam Nna, UC_JOINING_GROUP_MALAYALAM_NNA
+MalayalamNna, UC_JOINING_GROUP_MALAYALAM_NNA
+Malayalam Nnna, UC_JOINING_GROUP_MALAYALAM_NNNA
+MalayalamNnna, UC_JOINING_GROUP_MALAYALAM_NNNA
+Malayalam Bha, UC_JOINING_GROUP_MALAYALAM_BHA
+MalayalamBha, UC_JOINING_GROUP_MALAYALAM_BHA
+Malayalam Ra, UC_JOINING_GROUP_MALAYALAM_RA
+MalayalamRa, UC_JOINING_GROUP_MALAYALAM_RA
+Malayalam Lla, UC_JOINING_GROUP_MALAYALAM_LLA
+MalayalamLla, UC_JOINING_GROUP_MALAYALAM_LLA
+Malayalam Llla, UC_JOINING_GROUP_MALAYALAM_LLLA
+MalayalamLlla, UC_JOINING_GROUP_MALAYALAM_LLLA
+Malayalam Ssa, UC_JOINING_GROUP_MALAYALAM_SSA
+MalayalamSsa, UC_JOINING_GROUP_MALAYALAM_SSA
diff --git a/lib/unictype/joininggroup_name.h b/lib/unictype/joininggroup_name.h
index 718de04730..0f8af55d00 100644
--- a/lib/unictype/joininggroup_name.h
+++ b/lib/unictype/joininggroup_name.h
@@ -109,3 +109,14 @@ ELEM (MANICHAEAN_FIVE,       "Manichaean Five")
 ELEM (MANICHAEAN_TEN,        "Manichaean Ten")
 ELEM (MANICHAEAN_TWENTY,     "Manichaean Twenty")
 ELEM (MANICHAEAN_HUNDRED,    "Manichaean Hundred")
+ELEM (MALAYALAM_NGA,         "Malayalam Nga")
+ELEM (MALAYALAM_JA,          "Malayalam Ja")
+ELEM (MALAYALAM_NYA,         "Malayalam Nya")
+ELEM (MALAYALAM_TTA,         "Malayalam Tta")
+ELEM (MALAYALAM_NNA,         "Malayalam Nna")
+ELEM (MALAYALAM_NNNA,        "Malayalam Nnna")
+ELEM (MALAYALAM_BHA,         "Malayalam Bha")
+ELEM (MALAYALAM_RA,          "Malayalam Ra")
+ELEM (MALAYALAM_LLA,         "Malayalam Lla")
+ELEM (MALAYALAM_LLLA,        "Malayalam Llla")
+ELEM (MALAYALAM_SSA,         "Malayalam Ssa")
diff --git a/lib/unictype/joininggroup_of.h b/lib/unictype/joininggroup_of.h
index bba9fcc1cc..20aad03e5f 100644
--- a/lib/unictype/joininggroup_of.h
+++ b/lib/unictype/joininggroup_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining group of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
   {
     int level1[2];
     short level2[2 << 9];
-    unsigned short level3[5 * 56 + 1];
+    unsigned short level3[6 * 56 + 1];
   }
 u_joining_group =
 {
@@ -43,7 +43,7 @@ u_joining_group =
   {
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,     0,   128,   256,    -1,
-       -1,   384,    -1,    -1,    -1,    -1,    -1,    -1,
+      384,   512,    -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,
@@ -107,7 +107,7 @@ u_joining_group =
        -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,   512,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,   640,    -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,
@@ -193,6 +193,13 @@ u_joining_group =
     0x0a74, 0x0204, 0x860c, 0xe1c3, 0x6cd8, 0x9d3a, 0x664e, 0x3a34,
     0x2041, 0x11a7, 0x3064, 0x2850, 0xb164, 0xc198, 0x3900, 0x2a9d,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0xed59, 0xdb96, 0x7ef5, 0x61c1, 0x18f1, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0204, 0xc584,
     0x6508, 0x3236, 0x28d9, 0x0396, 0x4a1c, 0xdd0e, 0x5028, 0x1001,
     0x8408, 0xcc91, 0xc57a, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/lib/unictype/joiningtype_of.h b/lib/unictype/joiningtype_of.h
index 4928336b04..9389d9420e 100644
--- a/lib/unictype/joiningtype_of.h
+++ b/lib/unictype/joiningtype_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining type of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -201,7 +201,7 @@ u_joining_type =
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0x54, 0x55, 0x55, 0x44, 0x45, 0x55, 0x55, 0x55,
     0x55, 0x55, 0x54, 0x00, 0xf0, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x05, 0x55, 0x55, 0x40, 0x45, 0xf4, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
diff --git a/lib/unictype/mirror.h b/lib/unictype/mirror.h
index 64dbbf5cdd..089629f61b 100644
--- a/lib/unictype/mirror.h
+++ b/lib/unictype/mirror.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Mirrored Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/numeric.h b/lib/unictype/numeric.h
index 78220f843b..02d1d078e6 100644
--- a/lib/unictype/numeric.h
+++ b/lib/unictype/numeric.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Numeric values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -258,7 +258,7 @@ u_numeric =
      7040,   384,  7168,  7296,    -1,   384,    -1,    -1,
      1408,  1408,    -1,    -1,  1408,   512,  7424,    -1,
        -1,  7552,    -1,    -1,    -1,    -1,    -1,    -1,
-     7680,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     7680,    -1,  1408,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      7808,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
diff --git a/lib/unictype/pr_alphabetic.h b/lib/unictype/pr_alphabetic.h
index bd59dc5fa2..8d5d09040e 100644
--- a/lib/unictype/pr_alphabetic.h
+++ b/lib/unictype/pr_alphabetic.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[68 << 4];
+    unsigned int level3[70 << 4];
   }
 u_property_alphabetic =
 {
@@ -263,12 +263,12 @@ u_property_alphabetic =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -280,21 +280,21 @@ u_property_alphabetic =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
         4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
+        4 +   384 * sizeof (short) / sizeof (int) +   976,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   976,
         4 +   384 * sizeof (short) / sizeof (int) +   992,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_property_alphabetic =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
+        4 +   384 * sizeof (short) / sizeof (int) +  1024,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -393,8 +393,8 @@ u_property_alphabetic =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1024,
         4 +   384 * sizeof (short) / sizeof (int) +  1040,
+        4 +   384 * sizeof (short) / sizeof (int) +  1056,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
@@ -405,21 +405,21 @@ u_property_alphabetic =
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1056,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1072,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +   336,
+        4 +   384 * sizeof (short) / sizeof (int) +  1088,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_property_alphabetic =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
-        4 +   384 * sizeof (short) / sizeof (int) +  1072,
+        4 +   384 * sizeof (short) / sizeof (int) +  1104,
        -1,
        -1
   },
@@ -448,17 +448,17 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FEFFFFFU, 0x9C00E1FEU,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFC00U, 0x043007FFU,
-    0xFCFFFFFFU, 0x00001FFFU, 0x01FFFFFFU, 0x00000000U,
+    0xFCFFFFFFU, 0x00001FFFU, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0xFFF00000U, 0xFFFF03F8U,
     0xFFFFFFFFU, 0xEFFFFFFFU, 0xFFE1DFFFU, 0xFFFE000FU,
-    0xFFF99FEFU, 0xE3C5FDFFU, 0xB080599FU, 0x0003000FU,
+    0xFFF99FEFU, 0xE3C5FDFFU, 0xB080599FU, 0x1003000FU,
     0xFFF987EEU, 0xC36DFDFFU, 0x5E021987U, 0x003F0000U,
-    0xFFFBBFEEU, 0xE3EDFDFFU, 0x00011BBFU, 0x0200000FU,
+    0xFFFBBFEEU, 0xE3EDFDFFU, 0x00011BBFU, 0x1E00000FU,
     0xFFF99FEEU, 0xE3EDFDFFU, 0xB0C0199FU, 0x0002000FU,
     0xD63DC7ECU, 0xC3FFC718U, 0x00811DC7U, 0x00000000U,
     0xFFFDDFEFU, 0xE3FFFDFFU, 0x07601DDFU, 0x0000000FU,
     0xFFFDDFEFU, 0xE3EFFDFFU, 0x40601DDFU, 0x0006000FU,
-    0xFFFDDFEEU, 0xE7FFFFFFU, 0x80F05DDFU, 0xFC00000FU,
+    0xFFFDDFEFU, 0xE7FFFFFFU, 0x80F05DDFU, 0xFC00000FU,
     0xFC7FFFECU, 0x2FFBFFFFU, 0xFF5F807FU, 0x000C0000U,
     0xFFFFFFFEU, 0x07FFFFFFU, 0x0000207FU, 0x00000000U,
     0xFEF02596U, 0x3BFFECAEU, 0xF000205FU, 0x00000000U,
@@ -514,7 +514,7 @@ u_property_alphabetic =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -527,7 +527,7 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -570,7 +570,7 @@ u_property_alphabetic =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x07FFFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -612,13 +612,13 @@ u_property_alphabetic =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x80000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0x7FE7FFFFU, 0xFFFF0000U, 0xFFFFFFFFU,
+    0x00FFFFCFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x7F7FFFFFU, 0x00000001U, 0xFFFC0000U,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x000000CBU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -643,7 +643,7 @@ u_property_alphabetic =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -652,8 +652,12 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -697,9 +701,13 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_ascii_hex_digit.h b/lib/unictype/pr_ascii_hex_digit.h
index 8816521983..6cc535e1f5 100644
--- a/lib/unictype/pr_ascii_hex_digit.h
+++ b/lib/unictype/pr_ascii_hex_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_arabic_digit.h b/lib/unictype/pr_bidi_arabic_digit.h
index b611e80982..52ef8c4e72 100644
--- a/lib/unictype/pr_bidi_arabic_digit.h
+++ b/lib/unictype/pr_bidi_arabic_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_arabic_right_to_left.h b/lib/unictype/pr_bidi_arabic_right_to_left.h
index db615ca847..252b62dfe0 100644
--- a/lib/unictype/pr_bidi_arabic_right_to_left.h
+++ b/lib/unictype/pr_bidi_arabic_right_to_left.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -307,7 +307,7 @@ u_property_bidi_arabic_right_to_left =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFC00C060U,
     0xFFFDFFFFU, 0x0000FFFFU, 0xFFFFF800U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFE003FU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_bidi_block_separator.h b/lib/unictype/pr_bidi_block_separator.h
index d81c863f32..18f330200f 100644
--- a/lib/unictype/pr_bidi_block_separator.h
+++ b/lib/unictype/pr_bidi_block_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_boundary_neutral.h b/lib/unictype/pr_bidi_boundary_neutral.h
index ad50a1885f..4b9042ba4d 100644
--- a/lib/unictype/pr_bidi_boundary_neutral.h
+++ b/lib/unictype/pr_bidi_boundary_neutral.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_common_separator.h b/lib/unictype/pr_bidi_common_separator.h
index a093b11b7a..74a9a99098 100644
--- a/lib/unictype/pr_bidi_common_separator.h
+++ b/lib/unictype/pr_bidi_common_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_control.h b/lib/unictype/pr_bidi_control.h
index a903494dbe..ca368f48a6 100644
--- a/lib/unictype/pr_bidi_control.h
+++ b/lib/unictype/pr_bidi_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_embedding_or_override.h b/lib/unictype/pr_bidi_embedding_or_override.h
index 3a8e577794..95d0936ff2 100644
--- a/lib/unictype/pr_bidi_embedding_or_override.h
+++ b/lib/unictype/pr_bidi_embedding_or_override.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_eur_num_separator.h b/lib/unictype/pr_bidi_eur_num_separator.h
index fcfe2b8023..b6c383c158 100644
--- a/lib/unictype/pr_bidi_eur_num_separator.h
+++ b/lib/unictype/pr_bidi_eur_num_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_eur_num_terminator.h b/lib/unictype/pr_bidi_eur_num_terminator.h
index 8344bf57bc..29e2d2134c 100644
--- a/lib/unictype/pr_bidi_eur_num_terminator.h
+++ b/lib/unictype/pr_bidi_eur_num_terminator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -201,7 +201,7 @@ u_property_bidi_eur_num_terminator =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x08000000U, 0x00000000U,
     0x00000000U, 0x001F0000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x7FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00004000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00080000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_bidi_european_digit.h b/lib/unictype/pr_bidi_european_digit.h
index 530b6e5d38..0f95cddf10 100644
--- a/lib/unictype/pr_bidi_european_digit.h
+++ b/lib/unictype/pr_bidi_european_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_hebrew_right_to_left.h b/lib/unictype/pr_bidi_hebrew_right_to_left.h
index 65ed3ae498..ac45f9aacb 100644
--- a/lib/unictype/pr_bidi_hebrew_right_to_left.h
+++ b/lib/unictype/pr_bidi_hebrew_right_to_left.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -311,7 +311,7 @@ u_property_bidi_hebrew_right_to_left =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFC3007FFU,
-    0x043FFFFFU, 0xFFFFC110U, 0xF1FFFFFFU, 0xFFFFFFFFU,
+    0x043FFFFFU, 0xFFFFC110U, 0xF1FFFFFFU, 0xFFFFF800U,
     0xFFFFFFFFU, 0xC0200000U, 0x000FFFFFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_bidi_left_to_right.h b/lib/unictype/pr_bidi_left_to_right.h
index c4faaaaf28..a4c4be42b7 100644
--- a/lib/unictype/pr_bidi_left_to_right.h
+++ b/lib/unictype/pr_bidi_left_to_right.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[17];
     short level2[4 << 7];
-    unsigned int level3[54 << 4];
+    unsigned int level3[56 << 4];
   }
 u_property_bidi_left_to_right =
 {
@@ -201,8 +201,8 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   592,
        18 +   512 * sizeof (short) / sizeof (int) +   608,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   624,
+       18 +   512 * sizeof (short) / sizeof (int) +   640,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
@@ -241,10 +241,9 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   640,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   656,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   672,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
@@ -282,7 +281,8 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   672,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   688,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
@@ -292,30 +292,30 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   688,
        18 +   512 * sizeof (short) / sizeof (int) +   704,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   720,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   736,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   752,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   768,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   784,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   800,
-       18 +   512 * sizeof (short) / sizeof (int) +   304,
-       -1,
        18 +   512 * sizeof (short) / sizeof (int) +   816,
        18 +   512 * sizeof (short) / sizeof (int) +   832,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   848,
+       18 +   512 * sizeof (short) / sizeof (int) +   864,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   848,
+       18 +   512 * sizeof (short) / sizeof (int) +   880,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
@@ -443,7 +443,7 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   848,
+       18 +   512 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -571,7 +571,7 @@ u_property_bidi_left_to_right =
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
        18 +   512 * sizeof (short) / sizeof (int) +   400,
-       18 +   512 * sizeof (short) / sizeof (int) +   848
+       18 +   512 * sizeof (short) / sizeof (int) +   880
   },
   {
     0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x07FFFFFEU,
@@ -591,12 +591,12 @@ u_property_bidi_left_to_right =
     0xFFFFFFF8U, 0xEBFFFFFFU, 0xFF01DE01U, 0xFFFFFFF3U,
     0xFFFFFFFDU, 0xEFFFFFFFU, 0xFFFFDFE1U, 0xF7F3FFF3U,
     0xFFFFFFF9U, 0xEFFFFFFFU, 0xFFFDC679U, 0xFFDCFFFFU,
-    0xFFFFFFF9U, 0xEFFFFFFFU, 0xFFFFDE41U, 0xFFFDFFF3U,
+    0xFFFFFFF9U, 0xEFFFFFFFU, 0xFFFFDE41U, 0x03FDFFF3U,
     0xFFFFFFFDU, 0x6FFFFFFFU, 0xFFBFDFE1U, 0xFFFFFFF3U,
     0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFFFDFFEU, 0xF807FFFFU,
     0xFFFFFFFEU, 0x3FFFFFFFU, 0xFF9FC23EU, 0x80FFFFF3U,
     0xFFFFFFFDU, 0xEFFFFFFFU, 0xFFFFCFFFU, 0xFFFFFFF3U,
-    0xFFFFFFFDU, 0xFFFFFFFFU, 0xFFFFDFE1U, 0xFFFFFFF3U,
+    0xFFFFFFFCU, 0xE7FFFFFFU, 0xFFFFDFE1U, 0xFFFFFFF3U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFA3FBFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x780DFFFFU, 0xFFFF807FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xE40DFFFFU, 0xFFFFC0FFU, 0xFFFFFFFFU,
@@ -629,19 +629,19 @@ u_property_bidi_left_to_right =
     0xFFFFFFFFU, 0xFF300FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0008FFFFU, 0xFCEFDE02U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x07C00000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x04000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x5FFFFFFFU, 0x1FFF1FFCU, 0x9FFF1FFFU,
     0x00004000U, 0x00000000U, 0x00000000U, 0x800E0000U,
-    0xFFFF8000U, 0x80000000U, 0x0000FFFFU, 0xFFFE0000U,
+    0xFFFF8000U, 0x00000000U, 0x0000FFFFU, 0xFFFE0000U,
     0x3E2FFC84U, 0xF3FFBD50U, 0x0000C3E0U, 0xFFFFFFFFU,
     0x0000F1FFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFC00000U, 0xFFFFFFFFU, 0x07FFFFFFU,
-    0x00200000U, 0x00000000U, 0x00000000U, 0x80000000U,
+    0x00200000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFF80U, 0xFFFFF800U, 0x00000000U,
     0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -657,12 +657,12 @@ u_property_bidi_left_to_right =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00300000U,
-    0x00C00000U, 0x1C000000U, 0xFFFC0200U, 0xFFFF0FFFU,
+    0x00C00000U, 0x1C000000U, 0xFFF80200U, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FC781FU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFE0U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU,
     0x04000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFC00000U, 0xF000FFFFU,
@@ -730,9 +730,13 @@ u_property_bidi_left_to_right =
     0xFFFFFFFFU, 0xFF40D7FFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x1FFFFFFFU, 0xFFFFF043U, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFF981U, 0x8607FFFFU, 0xF181FF7FU, 0xFFFFFFFFU,
+    0xFC8003FFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xC080FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x0003FFFFU, 0xFF920300U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x4B81FFFFU, 0xFFFFFF40U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFE0FFFFU,
@@ -778,14 +782,18 @@ u_property_bidi_left_to_right =
     0xFFF00000U, 0x00018000U, 0x00010001U, 0xFFC00000U,
     0xFFFFE000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFF3FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFC0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF80000U, 0xFF80E000U,
+    0x00000000U, 0x00000000U, 0xFFE00000U, 0xFE00E000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0xFFE00000U, 0xFFFFFFFFU,
     0x0000F000U, 0x00000000U, 0xFC00FF00U, 0x00000000U,
     0x0000FF00U, 0xFFFFC000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0x8000FFFFU, 0x8006FF00U, 0x8000F000U, 0xFFFFFFFFU,
-    0xFFFC0000U, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0x0000F000U, 0x80000000U, 0x0000E000U, 0xFFFFF000U,
+    0xFF000000U, 0xFFFFFFFFU, 0x0000FFFEU, 0xFFFFFF80U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/lib/unictype/pr_bidi_non_spacing_mark.h b/lib/unictype/pr_bidi_non_spacing_mark.h
index f2a6a50fc8..a177d9e860 100644
--- a/lib/unictype/pr_bidi_non_spacing_mark.h
+++ b/lib/unictype/pr_bidi_non_spacing_mark.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_property_bidi_non_spacing_mark =
 {
@@ -199,8 +199,8 @@ u_property_bidi_non_spacing_mark =
        16 +   384 * sizeof (short) / sizeof (int) +   416,
        16 +   384 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -239,10 +239,10 @@ u_property_bidi_non_spacing_mark =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       -1,
        -1,
        -1,
        -1,
@@ -280,7 +280,7 @@ u_property_bidi_non_spacing_mark =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -290,19 +290,19 @@ u_property_bidi_non_spacing_mark =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   512,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -314,7 +314,7 @@ u_property_bidi_non_spacing_mark =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -461,12 +461,12 @@ u_property_bidi_non_spacing_mark =
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0000000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x0000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
-    0x00000006U, 0x10000000U, 0x000021BEU, 0x0000000CU,
+    0x00000006U, 0x10000000U, 0x000021BEU, 0xFC00000CU,
     0x00000002U, 0x90000000U, 0x0040201EU, 0x0000000CU,
     0x00000004U, 0x00000000U, 0x00002001U, 0x00000000U,
     0x00000001U, 0xC0000000U, 0x00603DC1U, 0x0000000CU,
     0x00000002U, 0x10000000U, 0x00003000U, 0x0000000CU,
-    0x00000002U, 0x00000000U, 0x0000201EU, 0x0000000CU,
+    0x00000003U, 0x18000000U, 0x0000201EU, 0x0000000CU,
     0x00000000U, 0x00000000U, 0x005C0400U, 0x00000000U,
     0x00000000U, 0x07F20000U, 0x00007F80U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -495,7 +495,7 @@ u_property_bidi_non_spacing_mark =
     0x00000000U, 0x00CFF000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFF70000U, 0x031021FDU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0001FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -556,9 +556,13 @@ u_property_bidi_non_spacing_mark =
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000067EU, 0x79F80000U, 0x0E7E0080U, 0x00000000U,
+    0x037FFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x3F7F0000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x006DFCFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/pr_bidi_other_neutral.h b/lib/unictype/pr_bidi_other_neutral.h
index 346a5d6baa..c4a4f385d7 100644
--- a/lib/unictype/pr_bidi_other_neutral.h
+++ b/lib/unictype/pr_bidi_other_neutral.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[40 << 4];
+    unsigned int level3[41 << 4];
   }
 u_property_bidi_other_neutral =
 {
@@ -294,10 +294,10 @@ u_property_bidi_other_neutral =
        -1,
         3 +   256 * sizeof (short) / sizeof (int) +   560,
         3 +   256 * sizeof (short) / sizeof (int) +   576,
-        3 +   256 * sizeof (short) / sizeof (int) +   256,
         3 +   256 * sizeof (short) / sizeof (int) +   592,
         3 +   256 * sizeof (short) / sizeof (int) +   608,
         3 +   256 * sizeof (short) / sizeof (int) +   624,
+        3 +   256 * sizeof (short) / sizeof (int) +   640,
        -1,
        -1,
        -1
@@ -358,7 +358,7 @@ u_property_bidi_other_neutral =
     0xFFF3FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U, 0xF8000000U,
-    0xFFDFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
+    0xFFDFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
     0x000000FFU, 0x00000000U, 0x00000000U, 0xFFFFFC00U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -374,12 +374,12 @@ u_property_bidi_other_neutral =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFE0007E0U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
     0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x0FFF0000U,
@@ -451,17 +451,21 @@ u_property_bidi_other_neutral =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0x00001800U, 0x00000000U, 0x00000000U, 0x00000C00U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU
   }
 };
diff --git a/lib/unictype/pr_bidi_pdf.h b/lib/unictype/pr_bidi_pdf.h
index a08b0c46bc..1e8011c616 100644
--- a/lib/unictype/pr_bidi_pdf.h
+++ b/lib/unictype/pr_bidi_pdf.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_segment_separator.h b/lib/unictype/pr_bidi_segment_separator.h
index 74f55c7450..fd621bd90b 100644
--- a/lib/unictype/pr_bidi_segment_separator.h
+++ b/lib/unictype/pr_bidi_segment_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_bidi_whitespace.h b/lib/unictype/pr_bidi_whitespace.h
index 0add05c324..0863e52c1f 100644
--- a/lib/unictype/pr_bidi_whitespace.h
+++ b/lib/unictype/pr_bidi_whitespace.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_case_ignorable.h b/lib/unictype/pr_case_ignorable.h
index e598e48655..05d8d290ab 100644
--- a/lib/unictype/pr_case_ignorable.h
+++ b/lib/unictype/pr_case_ignorable.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[44 << 4];
+    unsigned int level3[45 << 4];
   }
 u_property_case_ignorable =
 {
@@ -199,8 +199,8 @@ u_property_case_ignorable =
        16 +   384 * sizeof (short) / sizeof (int) +   496,
        16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
@@ -239,10 +239,9 @@ u_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
@@ -280,7 +279,8 @@ u_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -290,31 +290,31 @@ u_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
        16 +   384 * sizeof (short) / sizeof (int) +   608,
+       16 +   384 * sizeof (short) / sizeof (int) +   624,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   624,
+       16 +   384 * sizeof (short) / sizeof (int) +   640,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   640,
+       16 +   384 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   656,
+       16 +   384 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   672,
+       16 +   384 * sizeof (short) / sizeof (int) +   688,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   688,
+       16 +   384 * sizeof (short) / sizeof (int) +   704,
        -1,
        -1,
        -1,
@@ -465,12 +465,12 @@ u_property_case_ignorable =
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0002000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x0000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
-    0x00000006U, 0x10000000U, 0x000021BEU, 0x0000000CU,
+    0x00000006U, 0x10000000U, 0x000021BEU, 0xFC00000CU,
     0x00000002U, 0x90000000U, 0x0040201EU, 0x0000000CU,
     0x00000004U, 0x00000000U, 0x00002001U, 0x00000000U,
     0x00000001U, 0xC0000000U, 0x00603DC1U, 0x0000000CU,
     0x00000002U, 0x90000000U, 0x00003040U, 0x0000000CU,
-    0x00000002U, 0x00000000U, 0x0000201EU, 0x0000000CU,
+    0x00000003U, 0x18000000U, 0x0000201EU, 0x0000000CU,
     0x00000000U, 0x00000000U, 0x005C0400U, 0x00000000U,
     0x00000000U, 0x07F20000U, 0x00007FC0U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F40U, 0x00000000U,
@@ -499,7 +499,7 @@ u_property_case_ignorable =
     0x00000000U, 0x00CFF000U, 0x00000000U, 0x3F000000U,
     0x00000000U, 0x00000000U, 0xFFF70000U, 0x031021FDU,
     0x00000000U, 0xFFFFF000U, 0xFFFFFFFFU, 0x010007FFU,
-    0xF8000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0xF8000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -576,9 +576,13 @@ u_property_case_ignorable =
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000067EU, 0x79F80000U, 0x0E7E0080U, 0x00000000U,
+    0x037FFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xBF7F0000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x006DFCFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
@@ -587,7 +591,7 @@ u_property_case_ignorable =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x60000000U, 0x0000000FU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_cased.h b/lib/unictype/pr_cased.h
index a62500d40c..cb74213a2b 100644
--- a/lib/unictype/pr_cased.h
+++ b/lib/unictype/pr_cased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_changes_when_casefolded.h b/lib/unictype/pr_changes_when_casefolded.h
index e650461ff1..73412c1554 100644
--- a/lib/unictype/pr_changes_when_casefolded.h
+++ b/lib/unictype/pr_changes_when_casefolded.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_changes_when_casemapped.h b/lib/unictype/pr_changes_when_casemapped.h
index f611d973c2..52609a7da9 100644
--- a/lib/unictype/pr_changes_when_casemapped.h
+++ b/lib/unictype/pr_changes_when_casemapped.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_changes_when_lowercased.h b/lib/unictype/pr_changes_when_lowercased.h
index 80e7793166..51f052130a 100644
--- a/lib/unictype/pr_changes_when_lowercased.h
+++ b/lib/unictype/pr_changes_when_lowercased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_changes_when_titlecased.h b/lib/unictype/pr_changes_when_titlecased.h
index a60c8e1743..777d1acec2 100644
--- a/lib/unictype/pr_changes_when_titlecased.h
+++ b/lib/unictype/pr_changes_when_titlecased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_changes_when_uppercased.h b/lib/unictype/pr_changes_when_uppercased.h
index 148f6949f7..a77ee451fa 100644
--- a/lib/unictype/pr_changes_when_uppercased.h
+++ b/lib/unictype/pr_changes_when_uppercased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_combining.h b/lib/unictype/pr_combining.h
index 24998cff3b..93fd3305a0 100644
--- a/lib/unictype/pr_combining.h
+++ b/lib/unictype/pr_combining.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_property_combining =
 {
@@ -199,8 +199,8 @@ u_property_combining =
        16 +   384 * sizeof (short) / sizeof (int) +   416,
        16 +   384 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -239,10 +239,10 @@ u_property_combining =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       -1,
        -1,
        -1,
        -1,
@@ -280,7 +280,7 @@ u_property_combining =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -290,19 +290,19 @@ u_property_combining =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   512,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -314,7 +314,7 @@ u_property_combining =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -461,12 +461,12 @@ u_property_combining =
     0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x0080399FU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x00023987U, 0x00230000U,
-    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0x0000000CU,
+    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0xFC00000CU,
     0x0000000EU, 0xD0000000U, 0x00C0399FU, 0x0000000CU,
     0x00000004U, 0xC0000000U, 0x00803DC7U, 0x00000000U,
     0x0000000FU, 0xC0000000U, 0x00603DDFU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x00603DDFU, 0x0000000CU,
-    0x0000000EU, 0xC0000000U, 0x00803DDFU, 0x0000000CU,
+    0x0000000FU, 0xD8000000U, 0x00803DDFU, 0x0000000CU,
     0x0000000CU, 0x00000000U, 0xFF5F8400U, 0x000C0000U,
     0x00000000U, 0x07F20000U, 0x00007F80U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -493,9 +493,9 @@ u_property_combining =
     0x0000001FU, 0xFFF00000U, 0x0000001FU, 0x000FF800U,
     0x00000007U, 0x00003FFEU, 0x00000000U, 0x000FFFC0U,
     0x00000000U, 0x00FFFFF0U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF70000U, 0x031C21FFU,
+    0x00000000U, 0x00000000U, 0xFFF70000U, 0x039C21FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0001FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -556,9 +556,13 @@ u_property_combining =
     0x00000000U, 0x00FFF800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000007FEU, 0x7BF80000U, 0x0FFE0080U, 0x00000000U,
+    0x03FFFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFF7F8000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/pr_composite.h b/lib/unictype/pr_composite.h
index be07e02938..7f056729e3 100644
--- a/lib/unictype/pr_composite.h
+++ b/lib/unictype/pr_composite.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_currency_symbol.h b/lib/unictype/pr_currency_symbol.h
index ea4b76a2fb..1c48c480e6 100644
--- a/lib/unictype/pr_currency_symbol.h
+++ b/lib/unictype/pr_currency_symbol.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -201,7 +201,7 @@ u_property_currency_symbol =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x08000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x7FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x01000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_dash.h b/lib/unictype/pr_dash.h
index 7e273c3df4..bcfb979929 100644
--- a/lib/unictype/pr_dash.h
+++ b/lib/unictype/pr_dash.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_decimal_digit.h b/lib/unictype/pr_decimal_digit.h
index 7d5120808d..46de62f52c 100644
--- a/lib/unictype/pr_decimal_digit.h
+++ b/lib/unictype/pr_decimal_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -385,7 +385,7 @@ u_property_decimal_digit =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_default_ignorable_code_point.h b/lib/unictype/pr_default_ignorable_code_point.h
index f21c95f0e0..315c09320e 100644
--- a/lib/unictype/pr_default_ignorable_code_point.h
+++ b/lib/unictype/pr_default_ignorable_code_point.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_deprecated.h b/lib/unictype/pr_deprecated.h
index 59b2f1c3f3..025f1c9159 100644
--- a/lib/unictype/pr_deprecated.h
+++ b/lib/unictype/pr_deprecated.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_diacritic.h b/lib/unictype/pr_diacritic.h
index 5ec9aee9ad..861dfaf33a 100644
--- a/lib/unictype/pr_diacritic.h
+++ b/lib/unictype/pr_diacritic.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[33 << 4];
+    unsigned int level3[34 << 4];
   }
 u_property_diacritic =
 {
@@ -186,8 +186,8 @@ u_property_diacritic =
         3 +   256 * sizeof (short) / sizeof (int) +   416,
         3 +   256 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   448,
+        3 +   256 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -226,10 +226,9 @@ u_property_diacritic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   464,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   480,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   496,
        -1,
        -1,
        -1,
@@ -277,7 +276,8 @@ u_property_diacritic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   496,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -289,7 +289,7 @@ u_property_diacritic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   512,
+        3 +   256 * sizeof (short) / sizeof (int) +   528,
        -1,
        -1,
        -1,
@@ -324,12 +324,12 @@ u_property_diacritic =
     0x00000000U, 0x10000000U, 0x001E2000U, 0x00020000U,
     0x00000000U, 0x10000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x10000000U, 0x00002000U, 0x00000000U,
-    0x00000000U, 0x10000000U, 0x00002000U, 0x00000000U,
+    0x00000000U, 0x10000000U, 0x00002000U, 0xE0000000U,
     0x00000000U, 0x10000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x10000000U, 0x00002000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
+    0x00000000U, 0x18000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000400U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00005F80U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00001F00U, 0x00000000U,
@@ -352,9 +352,9 @@ u_property_diacritic =
     0x00000000U, 0x00100000U, 0x00000010U, 0x000FF800U,
     0x00000000U, 0x00000C00U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00C00000U, 0x00000000U, 0x3F000000U,
-    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x031021FFU,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x039021FFU,
     0x00000000U, 0xFFFFF000U, 0xFFFFFFFFU, 0x000007FFU,
-    0x00000000U, 0x00000000U, 0x0000FFF0U, 0xE0200000U,
+    0x00000000U, 0x00000000U, 0x0000FFF0U, 0xE3E00000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -415,9 +415,13 @@ u_property_diacritic =
     0x00000000U, 0x00C00000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000800U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x80000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00100000U, 0x00000080U, 0x00000000U,
+    0x02000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x80000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000034U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/pr_extender.h b/lib/unictype/pr_extender.h
index 8b3b88deb6..e9ed949cca 100644
--- a/lib/unictype/pr_extender.h
+++ b/lib/unictype/pr_extender.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[18 << 4];
+    unsigned int level3[19 << 4];
   }
 u_property_extender =
 {
@@ -186,6 +186,7 @@ u_property_extender =
         3 +   256 * sizeof (short) / sizeof (int) +   224,
        -1,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   240,
        -1,
        -1,
        -1,
@@ -225,11 +226,10 @@ u_property_extender =
        -1,
        -1,
        -1,
-       -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   240,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   256,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   272,
+       -1,
        -1,
        -1,
        -1,
@@ -289,7 +289,7 @@ u_property_extender =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   272,
+        3 +   256 * sizeof (short) / sizeof (int) +   288,
        -1,
        -1,
        -1,
@@ -364,13 +364,17 @@ u_property_extender =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x000001C0U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x01000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x0000000CU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000070U, 0x00000000U,
diff --git a/lib/unictype/pr_format_control.h b/lib/unictype/pr_format_control.h
index 9f6a4c0e73..fb69a72664 100644
--- a/lib/unictype/pr_format_control.h
+++ b/lib/unictype/pr_format_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_grapheme_base.h b/lib/unictype/pr_grapheme_base.h
index d2c594fe34..2754261cc4 100644
--- a/lib/unictype/pr_grapheme_base.h
+++ b/lib/unictype/pr_grapheme_base.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[76 << 4];
+    unsigned int level3[77 << 4];
   }
 u_property_grapheme_base =
 {
@@ -63,15 +63,15 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   224,
         4 +   384 * sizeof (short) / sizeof (int) +   240,
         4 +   384 * sizeof (short) / sizeof (int) +   256,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   272,
-        4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   288,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   320,
         4 +   384 * sizeof (short) / sizeof (int) +   336,
         4 +   384 * sizeof (short) / sizeof (int) +   352,
-        4 +   384 * sizeof (short) / sizeof (int) +   368,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
@@ -84,7 +84,7 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   384,
+        4 +   384 * sizeof (short) / sizeof (int) +   368,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
@@ -125,13 +125,13 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   400,
+        4 +   384 * sizeof (short) / sizeof (int) +   384,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   400,
         4 +   384 * sizeof (short) / sizeof (int) +   416,
         4 +   384 * sizeof (short) / sizeof (int) +   432,
         4 +   384 * sizeof (short) / sizeof (int) +   448,
-        4 +   384 * sizeof (short) / sizeof (int) +   464,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
@@ -153,7 +153,7 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   480,
+        4 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -170,6 +170,7 @@ u_property_grapheme_base =
        -1,
        -1,
        -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   480,
         4 +   384 * sizeof (short) / sizeof (int) +   496,
         4 +   384 * sizeof (short) / sizeof (int) +   512,
         4 +   384 * sizeof (short) / sizeof (int) +   528,
@@ -188,11 +189,10 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   736,
         4 +   384 * sizeof (short) / sizeof (int) +   752,
         4 +   384 * sizeof (short) / sizeof (int) +   768,
-        4 +   384 * sizeof (short) / sizeof (int) +   784,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   784,
         4 +   384 * sizeof (short) / sizeof (int) +   800,
-        4 +   384 * sizeof (short) / sizeof (int) +   816,
        -1,
        -1,
        -1,
@@ -200,7 +200,7 @@ u_property_grapheme_base =
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   832,
+        4 +   384 * sizeof (short) / sizeof (int) +   816,
        -1,
        -1,
        -1,
@@ -209,7 +209,7 @@ u_property_grapheme_base =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   848,
+        4 +   384 * sizeof (short) / sizeof (int) +   832,
        -1,
        -1,
        -1,
@@ -227,9 +227,9 @@ u_property_grapheme_base =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   864,
+        4 +   384 * sizeof (short) / sizeof (int) +   848,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   880,
+        4 +   384 * sizeof (short) / sizeof (int) +   864,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
@@ -241,9 +241,9 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   880,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
+        4 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
@@ -262,12 +262,12 @@ u_property_grapheme_base =
        -1,
        -1,
        -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
         4 +   384 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
        -1,
        -1,
-       -1,
         4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
@@ -406,20 +406,20 @@ u_property_grapheme_base =
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +  1184,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +  1200,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_property_grapheme_base =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   160,
-        4 +   384 * sizeof (short) / sizeof (int) +  1200,
+        4 +   384 * sizeof (short) / sizeof (int) +  1216,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_property_grapheme_base =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x403FFFFFU, 0xFFFFC260U,
     0xFFFD3FFFU, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x07F007FFU,
-    0x043FFFFFU, 0x7FFF0110U, 0x41FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x7FFF0110U, 0x41FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF8U, 0xEBFFFFFFU, 0xFF01DE01U, 0xFFFFFFF3U,
-    0xFFF99FEDU, 0xA3C5FDFFU, 0xB0005981U, 0x0FFFFFC3U,
+    0xFFF99FEDU, 0xA3C5FDFFU, 0xB0005981U, 0x3FFFFFC3U,
     0xFFF987E8U, 0xC36DFDFFU, 0x5E000001U, 0x001CFFC0U,
     0xFFFBBFE8U, 0xE3EDFDFFU, 0x00011A01U, 0x0203FFC3U,
     0xFFF99FECU, 0x23EDFDFFU, 0xB0001981U, 0x00FFFFC3U,
@@ -489,7 +489,7 @@ u_property_grapheme_base =
     0xFFFFFFF0U, 0xE82FFFFFU, 0xFFFF0FFBU, 0x1FF007FFU,
     0xFFFFFFFCU, 0xFFFFC4C3U, 0xFFFFFFFFU, 0xF00C5CBFU,
     0xFFFFFFFFU, 0xF8300FFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
-    0x000001FFU, 0x00000000U, 0x000800FFU, 0x006FDE02U,
+    0x000001FFU, 0x00000000U, 0x000800FFU, 0x00EFDE02U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -497,13 +497,9 @@ u_property_grapheme_base =
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU,
     0xFFFF07FFU, 0xFFFF80FFU, 0xFFFFFFFFU, 0xFFF30000U,
-    0x1FFF7FFFU, 0x7FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x1FFF7FFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
     0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -511,18 +507,18 @@ u_property_grapheme_base =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
-    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0003FDFFU, 0x0000F000U,
+    0xFF3FFFFFU, 0xE3FFFFFFU, 0x0007FDFFU, 0x0000F000U,
     0xFFFFFFFFU, 0xFFFF7FFFU, 0x7FFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0C7FFFU,
     0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x000180FFU,
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
     0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x0FFF0000U,
     0xFFFFFFFFU, 0xFFFF03FFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xF87FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF7FFFU, 0x07FFFFFFU, 0xFFFFFFFFU, 0xFFFF000FU,
     0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -535,7 +531,7 @@ u_property_grapheme_base =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -578,7 +574,7 @@ u_property_grapheme_base =
     0x0FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x1FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFEU,
-    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFF07FFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x003FFFFFU,
     0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -624,13 +620,13 @@ u_property_grapheme_base =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF981U, 0x8607FFFFU, 0xF181007FU, 0xFFFFFFFFU,
+    0xDC8003CFU, 0x00000007U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x4000FFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
     0x0000FFFFU, 0x00120200U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -655,7 +651,7 @@ u_property_grapheme_base =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -664,8 +660,12 @@ u_property_grapheme_base =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -704,18 +704,18 @@ u_property_grapheme_base =
     0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
     0xFFFF1FFFU, 0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFF0FFFU,
     0xFFFFFFFFU, 0x00001FFFU, 0x00000000U, 0xFFFFFFC0U,
-    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU, 0x007F1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x01FF1FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
     0xFFFF00FFU, 0x00003FFFU, 0x00000000U, 0x00000000U,
-    0x7FFF0000U, 0x7FF900FFU, 0x7FFF0FFFU, 0x00000000U,
-    0x0003FFFFU, 0x00000000U, 0x00000001U, 0x00000000U,
+    0xFFFF0FFFU, 0x7FFFFFFFU, 0xFFFF1FFFU, 0x00000FFFU,
+    0x00FFFFFFU, 0x00000000U, 0xFFFF0001U, 0x0000007FU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -729,9 +729,13 @@ u_property_grapheme_base =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_grapheme_extend.h b/lib/unictype/pr_grapheme_extend.h
index 7d30c0c1b0..bf2f1988ba 100644
--- a/lib/unictype/pr_grapheme_extend.h
+++ b/lib/unictype/pr_grapheme_extend.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[38 << 4];
+    unsigned int level3[39 << 4];
   }
 u_property_grapheme_extend =
 {
@@ -199,8 +199,8 @@ u_property_grapheme_extend =
        16 +   384 * sizeof (short) / sizeof (int) +   416,
        16 +   384 * sizeof (short) / sizeof (int) +   432,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -239,10 +239,10 @@ u_property_grapheme_extend =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       -1,
        -1,
        -1,
        -1,
@@ -280,7 +280,7 @@ u_property_grapheme_extend =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   496,
+       16 +   384 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -290,19 +290,19 @@ u_property_grapheme_extend =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   512,
        16 +   384 * sizeof (short) / sizeof (int) +   528,
+       16 +   384 * sizeof (short) / sizeof (int) +   544,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   544,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
+       16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   576,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -314,7 +314,7 @@ u_property_grapheme_extend =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -461,12 +461,12 @@ u_property_grapheme_extend =
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0000000CU,
     0x00000002U, 0x50000000U, 0x0080201EU, 0x0000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
-    0x00000006U, 0x10000000U, 0x000021BEU, 0x0000000CU,
+    0x00000006U, 0x10000000U, 0x000021BEU, 0xFC00000CU,
     0x00000002U, 0xD0000000U, 0x00C0201EU, 0x0000000CU,
     0x00000004U, 0x40000000U, 0x00802001U, 0x00000000U,
     0x00000001U, 0xC0000000U, 0x00603DC1U, 0x0000000CU,
     0x00000002U, 0x90000000U, 0x00603044U, 0x0000000CU,
-    0x00000002U, 0x40000000U, 0x0080201EU, 0x0000000CU,
+    0x00000003U, 0x58000000U, 0x0080201EU, 0x0000000CU,
     0x00000000U, 0x00000000U, 0x805C8400U, 0x00000000U,
     0x00000000U, 0x07F20000U, 0x00007F80U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00003F00U, 0x00000000U,
@@ -495,7 +495,7 @@ u_property_grapheme_extend =
     0x00000000U, 0x00CFF000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFF70000U, 0x031021FDU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0x00001000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0001FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -556,9 +556,13 @@ u_property_grapheme_extend =
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000067EU, 0x79F80000U, 0x0E7E0080U, 0x00000000U,
+    0x037FFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xBF7F0000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x006DFCFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
diff --git a/lib/unictype/pr_grapheme_link.h b/lib/unictype/pr_grapheme_link.h
index 7aaced65e3..086b9d2758 100644
--- a/lib/unictype/pr_grapheme_link.h
+++ b/lib/unictype/pr_grapheme_link.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[15 << 4];
+    unsigned int level3[17 << 4];
   }
 u_property_grapheme_link =
 {
@@ -186,8 +186,8 @@ u_property_grapheme_link =
         3 +   256 * sizeof (short) / sizeof (int) +   208,
         3 +   256 * sizeof (short) / sizeof (int) +   224,
        -1,
-       -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   160,
+        3 +   256 * sizeof (short) / sizeof (int) +   240,
+        3 +   256 * sizeof (short) / sizeof (int) +   256,
        -1,
        -1,
        -1,
@@ -313,7 +313,7 @@ u_property_grapheme_link =
     0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00002000U, 0x00000000U,
+    0x00000000U, 0x18000000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000400U, 0x00000000U,
     0x00000000U, 0x04000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -362,6 +362,14 @@ u_property_grapheme_link =
     0x00000000U, 0x80000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00400000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000800U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00100000U, 0x00000080U, 0x00000000U,
+    0x02000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x80000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000030U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
   }
 };
diff --git a/lib/unictype/pr_hex_digit.h b/lib/unictype/pr_hex_digit.h
index 4766c5ce17..5b7b261a34 100644
--- a/lib/unictype/pr_hex_digit.h
+++ b/lib/unictype/pr_hex_digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_hyphen.h b/lib/unictype/pr_hyphen.h
index 869056f4ef..50c0318d50 100644
--- a/lib/unictype/pr_hyphen.h
+++ b/lib/unictype/pr_hyphen.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_id_continue.h b/lib/unictype/pr_id_continue.h
index 55d7c7c90b..6df01e5e89 100644
--- a/lib/unictype/pr_id_continue.h
+++ b/lib/unictype/pr_id_continue.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[4 << 7];
-    unsigned int level3[69 << 4];
+    unsigned int level3[71 << 4];
   }
 u_property_id_continue =
 {
@@ -275,12 +275,12 @@ u_property_id_continue =
        -1,
        -1,
        16 +   512 * sizeof (short) / sizeof (int) +   848,
+       16 +   512 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
        -1,
-       -1,
-       16 +   512 * sizeof (short) / sizeof (int) +   864,
+       16 +   512 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -290,24 +290,24 @@ u_property_id_continue =
        -1,
        -1,
        -1,
-       16 +   512 * sizeof (short) / sizeof (int) +   880,
        16 +   512 * sizeof (short) / sizeof (int) +   896,
        16 +   512 * sizeof (short) / sizeof (int) +   912,
        16 +   512 * sizeof (short) / sizeof (int) +   928,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   944,
        -1,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   976,
        -1,
        -1,
+       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
+       16 +   512 * sizeof (short) / sizeof (int) +  1008,
+       -1,
+       -1,
        -1,
        -1,
        -1,
@@ -397,7 +397,7 @@ u_property_id_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1008,
+       16 +   512 * sizeof (short) / sizeof (int) +  1024,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
@@ -405,8 +405,8 @@ u_property_id_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1024,
        16 +   512 * sizeof (short) / sizeof (int) +  1040,
+       16 +   512 * sizeof (short) / sizeof (int) +  1056,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
@@ -417,21 +417,21 @@ u_property_id_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1056,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+       16 +   512 * sizeof (short) / sizeof (int) +  1072,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +  1088,
        -1,
        -1,
        -1,
@@ -439,10 +439,10 @@ u_property_id_continue =
        -1,
        -1,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1072,
+       16 +   512 * sizeof (short) / sizeof (int) +  1104,
        -1,
        -1,
-       16 +   512 * sizeof (short) / sizeof (int) +  1088,
+       16 +   512 * sizeof (short) / sizeof (int) +  1120,
        -1,
        -1,
        -1,
@@ -588,17 +588,17 @@ u_property_id_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FEFFFFFU, 0x9FFFFDFFU,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0x043FFFFFU,
-    0xFFFFFFFFU, 0x00003FFFU, 0x0FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0x00003FFFU, 0x0FFFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0xFFF00000U, 0xFFFFFFFBU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFEFFCFU,
-    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x0003FFCFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x1003FFCFU,
     0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x003FFFC0U,
-    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0x0200FFCFU,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE00FFCFU,
     0xFFF99FEEU, 0xF3EDFDFFU, 0xB0C0399FU, 0x0002FFCFU,
     0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x0000FFC0U,
     0xFFFDDFEFU, 0xE3FFFDFFU, 0x07603DDFU, 0x0000FFCFU,
     0xFFFDDFEFU, 0xF3EFFDFFU, 0x40603DDFU, 0x0006FFCFU,
-    0xFFFDDFEEU, 0xE7FFFFFFU, 0x80F07DDFU, 0xFC00FFCFU,
+    0xFFFDDFEFU, 0xFFFFFFFFU, 0x80F07DDFU, 0xFC00FFCFU,
     0xFC7FFFECU, 0x2FFBFFFFU, 0xFF5F847FU, 0x000CFFC0U,
     0xFFFFFFFEU, 0x07FFFFFFU, 0x03FF7FFFU, 0x00000000U,
     0xFEF02596U, 0x3BFFECAEU, 0xF3FF3F5FU, 0x00000000U,
@@ -629,9 +629,9 @@ u_property_id_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0FFFU, 0x000FF800U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0x00FFFFFFU, 0xFFFFE3FFU, 0x3FFFFFFFU,
-    0x000001FFU, 0x00000000U, 0xFFF70000U, 0x037FFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFF70000U, 0x03FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
@@ -646,7 +646,7 @@ u_property_id_continue =
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
     0x000000E0U, 0x1F3EFFFEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xFE7FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -659,7 +659,7 @@ u_property_id_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -702,7 +702,7 @@ u_property_id_continue =
     0x00000000U, 0x00000000U, 0x00000000U, 0x20000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000001U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x07FFFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -744,13 +744,13 @@ u_property_id_continue =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF0080U, 0xFFFFFFFFU,
+    0x03FFFFCFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0xFF7FFFFFU, 0x03FF0001U, 0xFFFC0000U,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -775,7 +775,7 @@ u_property_id_continue =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -784,8 +784,12 @@ u_property_id_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -837,9 +841,13 @@ u_property_id_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_id_start.h b/lib/unictype/pr_id_start.h
index f704c1fd10..bd484945b4 100644
--- a/lib/unictype/pr_id_start.h
+++ b/lib/unictype/pr_id_start.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[64 << 4];
+    unsigned int level3[66 << 4];
   }
 u_property_id_start =
 {
@@ -263,12 +263,12 @@ u_property_id_start =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   848,
+        4 +   384 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   864,
+        4 +   384 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -280,8 +280,8 @@ u_property_id_start =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   880,
         4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -290,10 +290,10 @@ u_property_id_start =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
+        4 +   384 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_property_id_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
@@ -393,8 +393,8 @@ u_property_id_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +   992,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
@@ -405,21 +405,21 @@ u_property_id_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   992,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +  1024,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_property_id_start =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
+        4 +   384 * sizeof (short) / sizeof (int) +  1040,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_property_id_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9C00C060U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFC00U, 0x043007FFU,
-    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFE0003U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x00030003U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x10030003U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001C0000U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x02000003U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x00020003U,
@@ -506,7 +506,7 @@ u_property_id_start =
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
     0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xF87FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -519,7 +519,7 @@ u_property_id_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -562,7 +562,7 @@ u_property_id_start =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -604,13 +604,13 @@ u_property_id_start =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x80000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x00000001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x00000040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -635,7 +635,7 @@ u_property_id_start =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001001FU, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -644,8 +644,12 @@ u_property_id_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -681,9 +685,13 @@ u_property_id_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_ideographic.h b/lib/unictype/pr_ideographic.h
index e0b0d5d85c..f0bd9a1324 100644
--- a/lib/unictype/pr_ideographic.h
+++ b/lib/unictype/pr_ideographic.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[13 << 4];
+    unsigned int level3[16 << 4];
   }
 u_property_ideographic =
 {
@@ -262,8 +262,8 @@ u_property_ideographic =
        -1,
        -1,
        -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   128,
+        4 +   384 * sizeof (short) / sizeof (int) +   144,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_property_ideographic =
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
-        4 +   384 * sizeof (short) / sizeof (int) +   128,
+        4 +   384 * sizeof (short) / sizeof (int) +   160,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
@@ -393,8 +393,8 @@ u_property_ideographic =
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
-        4 +   384 * sizeof (short) / sizeof (int) +   144,
-        4 +   384 * sizeof (short) / sizeof (int) +   160,
+        4 +   384 * sizeof (short) / sizeof (int) +   176,
+        4 +   384 * sizeof (short) / sizeof (int) +   192,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
@@ -405,21 +405,21 @@ u_property_ideographic =
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
-        4 +   384 * sizeof (short) / sizeof (int) +   176,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +   208,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +    16,
+        4 +   384 * sizeof (short) / sizeof (int) +   224,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_property_ideographic =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +    16,
-        4 +   384 * sizeof (short) / sizeof (int) +   192,
+        4 +   384 * sizeof (short) / sizeof (int) +   240,
        -1,
        -1
   },
@@ -447,7 +447,7 @@ u_property_ideographic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -464,6 +464,14 @@ u_property_ideographic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -477,9 +485,13 @@ u_property_ideographic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_ids_binary_operator.h b/lib/unictype/pr_ids_binary_operator.h
index c5ec342d7f..33a142bfd4 100644
--- a/lib/unictype/pr_ids_binary_operator.h
+++ b/lib/unictype/pr_ids_binary_operator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_ids_trinary_operator.h b/lib/unictype/pr_ids_trinary_operator.h
index bc2c84cb9b..1e1d5107bb 100644
--- a/lib/unictype/pr_ids_trinary_operator.h
+++ b/lib/unictype/pr_ids_trinary_operator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_ignorable_control.h b/lib/unictype/pr_ignorable_control.h
index dcb4608e23..723c22170c 100644
--- a/lib/unictype/pr_ignorable_control.h
+++ b/lib/unictype/pr_ignorable_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_iso_control.h b/lib/unictype/pr_iso_control.h
index cc805b9caa..fb17f8ba9e 100644
--- a/lib/unictype/pr_iso_control.h
+++ b/lib/unictype/pr_iso_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_join_control.h b/lib/unictype/pr_join_control.h
index 28991b9694..5003c28cb5 100644
--- a/lib/unictype/pr_join_control.h
+++ b/lib/unictype/pr_join_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_left_of_pair.h b/lib/unictype/pr_left_of_pair.h
index bcf7f081ac..4d446cd448 100644
--- a/lib/unictype/pr_left_of_pair.h
+++ b/lib/unictype/pr_left_of_pair.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_line_separator.h b/lib/unictype/pr_line_separator.h
index c593fb4f9d..d496c8e9bb 100644
--- a/lib/unictype/pr_line_separator.h
+++ b/lib/unictype/pr_line_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_logical_order_exception.h b/lib/unictype/pr_logical_order_exception.h
index 2a9455b70f..c8a578975d 100644
--- a/lib/unictype/pr_logical_order_exception.h
+++ b/lib/unictype/pr_logical_order_exception.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_lowercase.h b/lib/unictype/pr_lowercase.h
index 737eea870d..741fb79d04 100644
--- a/lib/unictype/pr_lowercase.h
+++ b/lib/unictype/pr_lowercase.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_math.h b/lib/unictype/pr_math.h
index 602c2a3c81..de8b0e81c5 100644
--- a/lib/unictype/pr_math.h
+++ b/lib/unictype/pr_math.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_non_break.h b/lib/unictype/pr_non_break.h
index b62bc8c8f6..46b1b8d043 100644
--- a/lib/unictype/pr_non_break.h
+++ b/lib/unictype/pr_non_break.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_not_a_character.h b/lib/unictype/pr_not_a_character.h
index a663932413..214b804cbf 100644
--- a/lib/unictype/pr_not_a_character.h
+++ b/lib/unictype/pr_not_a_character.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_numeric.h b/lib/unictype/pr_numeric.h
index cee94c5c7f..0f1e7c274e 100644
--- a/lib/unictype/pr_numeric.h
+++ b/lib/unictype/pr_numeric.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -574,7 +574,7 @@ u_property_numeric =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00001FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_other_alphabetic.h b/lib/unictype/pr_other_alphabetic.h
index 48ed069d24..0340cd1d09 100644
--- a/lib/unictype/pr_other_alphabetic.h
+++ b/lib/unictype/pr_other_alphabetic.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[32 << 4];
+    unsigned int level3[33 << 4];
   }
 u_property_other_alphabetic =
 {
@@ -186,8 +186,8 @@ u_property_other_alphabetic =
         3 +   256 * sizeof (short) / sizeof (int) +   368,
         3 +   256 * sizeof (short) / sizeof (int) +   384,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   400,
+        3 +   256 * sizeof (short) / sizeof (int) +   416,
        -1,
        -1,
        -1,
@@ -226,10 +226,9 @@ u_property_other_alphabetic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   416,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   432,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   448,
        -1,
        -1,
        -1,
@@ -267,10 +266,8 @@ u_property_other_alphabetic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   448,
-       -1,
-       -1,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -285,7 +282,6 @@ u_property_other_alphabetic =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -297,6 +293,10 @@ u_property_other_alphabetic =
        -1,
        -1,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   512,
+       -1,
+       -1,
+       -1,
        -1,
        -1,
        -1,
@@ -320,12 +320,12 @@ u_property_other_alphabetic =
     0x0000000FU, 0xCC000000U, 0x00E0DFFFU, 0x0000000CU,
     0x0000000EU, 0xC0000000U, 0x0080199FU, 0x0000000CU,
     0x0000000EU, 0xC0000000U, 0x00021987U, 0x00230000U,
-    0x0000000EU, 0xC0000000U, 0x00001BBFU, 0x0000000CU,
+    0x0000000EU, 0xC0000000U, 0x00001BBFU, 0x1C00000CU,
     0x0000000EU, 0xC0000000U, 0x00C0199FU, 0x0000000CU,
     0x00000004U, 0xC0000000U, 0x00801DC7U, 0x00000000U,
     0x0000000FU, 0xC0000000U, 0x00601DDFU, 0x0000000CU,
     0x0000000EU, 0xC0000000U, 0x00601DDFU, 0x0000000CU,
-    0x0000000EU, 0xC0000000U, 0x00801DDFU, 0x0000000CU,
+    0x0000000FU, 0xC0000000U, 0x00801DDFU, 0x0000000CU,
     0x0000000CU, 0x00000000U, 0xFF5F8000U, 0x000C0000U,
     0x00000000U, 0x07F20000U, 0x00002000U, 0x00000000U,
     0x00000000U, 0x1BF20000U, 0x00002000U, 0x00000000U,
@@ -403,9 +403,13 @@ u_property_other_alphabetic =
     0x00000000U, 0x003FF800U, 0x00000000U, 0x00000000U,
     0xE0000000U, 0x000007FFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000007FEU, 0x7BE00000U, 0x0FFE0000U, 0x00000000U,
+    0x00FFFC00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x7F7F8000U, 0x00000000U, 0x00000000U,
     0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x0000008BU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_other_default_ignorable_code_point.h b/lib/unictype/pr_other_default_ignorable_code_point.h
index f46d6aa025..7d080a0019 100644
--- a/lib/unictype/pr_other_default_ignorable_code_point.h
+++ b/lib/unictype/pr_other_default_ignorable_code_point.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_grapheme_extend.h b/lib/unictype/pr_other_grapheme_extend.h
index a2ccd3862d..110f66ea92 100644
--- a/lib/unictype/pr_other_grapheme_extend.h
+++ b/lib/unictype/pr_other_grapheme_extend.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_id_continue.h b/lib/unictype/pr_other_id_continue.h
index 6369431c9b..b8175bdba4 100644
--- a/lib/unictype/pr_other_id_continue.h
+++ b/lib/unictype/pr_other_id_continue.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_id_start.h b/lib/unictype/pr_other_id_start.h
index fde4717f33..77b4e7e2a5 100644
--- a/lib/unictype/pr_other_id_start.h
+++ b/lib/unictype/pr_other_id_start.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_lowercase.h b/lib/unictype/pr_other_lowercase.h
index 4a77a94ae6..c444a137be 100644
--- a/lib/unictype/pr_other_lowercase.h
+++ b/lib/unictype/pr_other_lowercase.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_math.h b/lib/unictype/pr_other_math.h
index 506245b960..76de20b7b1 100644
--- a/lib/unictype/pr_other_math.h
+++ b/lib/unictype/pr_other_math.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_other_uppercase.h b/lib/unictype/pr_other_uppercase.h
index 68fbf003e0..2cf0591f48 100644
--- a/lib/unictype/pr_other_uppercase.h
+++ b/lib/unictype/pr_other_uppercase.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_paired_punctuation.h b/lib/unictype/pr_paired_punctuation.h
index df525f9266..565dc9cf87 100644
--- a/lib/unictype/pr_paired_punctuation.h
+++ b/lib/unictype/pr_paired_punctuation.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_paragraph_separator.h b/lib/unictype/pr_paragraph_separator.h
index e402622cc8..0b5edbb471 100644
--- a/lib/unictype/pr_paragraph_separator.h
+++ b/lib/unictype/pr_paragraph_separator.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_pattern_syntax.h b/lib/unictype/pr_pattern_syntax.h
index 68a2bfb635..b74e3e3eab 100644
--- a/lib/unictype/pr_pattern_syntax.h
+++ b/lib/unictype/pr_pattern_syntax.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_pattern_white_space.h b/lib/unictype/pr_pattern_white_space.h
index 46ddc811a1..7c588ab745 100644
--- a/lib/unictype/pr_pattern_white_space.h
+++ b/lib/unictype/pr_pattern_white_space.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_private_use.h b/lib/unictype/pr_private_use.h
index d8c81f34b5..e7115a8a22 100644
--- a/lib/unictype/pr_private_use.h
+++ b/lib/unictype/pr_private_use.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_punctuation.h b/lib/unictype/pr_punctuation.h
index 09ed0a2d3b..898022bc2d 100644
--- a/lib/unictype/pr_punctuation.h
+++ b/lib/unictype/pr_punctuation.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[43 << 4];
+    unsigned int level3[44 << 4];
   }
 u_property_punctuation =
 {
@@ -186,12 +186,12 @@ u_property_punctuation =
         3 +   256 * sizeof (short) / sizeof (int) +   560,
         3 +   256 * sizeof (short) / sizeof (int) +   576,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   592,
+        3 +   256 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   608,
+        3 +   256 * sizeof (short) / sizeof (int) +   624,
        -1,
        -1,
        -1,
@@ -226,7 +226,7 @@ u_property_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   624,
+        3 +   256 * sizeof (short) / sizeof (int) +   640,
        -1,
        -1,
        -1,
@@ -267,7 +267,7 @@ u_property_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   640,
+        3 +   256 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
@@ -282,14 +282,14 @@ u_property_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   656,
+        3 +   256 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   672,
+        3 +   256 * sizeof (short) / sizeof (int) +   688,
        -1,
        -1,
        -1,
@@ -322,7 +322,7 @@ u_property_punctuation =
     0x00000000U, 0x7FFF0000U, 0x40000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010030U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x20000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -383,7 +383,7 @@ u_property_punctuation =
     0x00000000U, 0x00000000U, 0x00000000U, 0xDE000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00010000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF7FFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF7FFFU, 0x000003FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -451,6 +451,10 @@ u_property_punctuation =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x70000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x80000000U, 0x0000007FU, 0x00000000U,
+    0xDC000000U, 0x00000007U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x0000003EU, 0x00030000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_quotation_mark.h b/lib/unictype/pr_quotation_mark.h
index 88922855de..77353b9b45 100644
--- a/lib/unictype/pr_quotation_mark.h
+++ b/lib/unictype/pr_quotation_mark.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_radical.h b/lib/unictype/pr_radical.h
index 4806fbfd98..852229babc 100644
--- a/lib/unictype/pr_radical.h
+++ b/lib/unictype/pr_radical.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_regional_indicator.c b/lib/unictype/pr_regional_indicator.c
new file mode 100644
index 0000000000..f3e85dd001
--- /dev/null
+++ b/lib/unictype/pr_regional_indicator.c
@@ -0,0 +1,38 @@
+/* Properties of Unicode characters.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2021.
+
+   This file is free software.
+   It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
+   You can redistribute it and/or modify it under either
+     - the terms of the GNU Lesser General Public License as published
+       by the Free Software Foundation; either version 3, or (at your
+       option) any later version, or
+     - the terms of the GNU General Public License as published by the
+       Free Software Foundation; either version 2, or (at your option)
+       any later version, or
+     - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License and the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License and of the GNU General Public License along with this
+   program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+bool
+uc_is_property_regional_indicator (ucs4_t uc)
+{
+  return (uc >= 0x1F1E6 && uc <= 0x1F1FF);
+}
+
+const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR =
+  { &uc_is_property_regional_indicator };
diff --git a/lib/unictype/pr_sentence_terminal.h b/lib/unictype/pr_sentence_terminal.h
index 2c880a71ac..416c7aee69 100644
--- a/lib/unictype/pr_sentence_terminal.h
+++ b/lib/unictype/pr_sentence_terminal.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[27 << 4];
+    unsigned int level3[28 << 4];
   }
 u_property_sentence_terminal =
 {
@@ -186,8 +186,8 @@ u_property_sentence_terminal =
         3 +   256 * sizeof (short) / sizeof (int) +   336,
         3 +   256 * sizeof (short) / sizeof (int) +   352,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   368,
+        3 +   256 * sizeof (short) / sizeof (int) +   384,
        -1,
        -1,
        -1,
@@ -226,7 +226,7 @@ u_property_sentence_terminal =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   384,
+        3 +   256 * sizeof (short) / sizeof (int) +   400,
        -1,
        -1,
        -1,
@@ -267,7 +267,7 @@ u_property_sentence_terminal =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   400,
+        3 +   256 * sizeof (short) / sizeof (int) +   416,
        -1,
        -1,
        -1,
@@ -282,7 +282,7 @@ u_property_sentence_terminal =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   416,
+        3 +   256 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
@@ -395,6 +395,10 @@ u_property_sentence_terminal =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x70000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x0000000CU, 0x00000000U,
+    0x18000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000006U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_soft_dotted.h b/lib/unictype/pr_soft_dotted.h
index 2d75e7a143..bdbe49dd62 100644
--- a/lib/unictype/pr_soft_dotted.h
+++ b/lib/unictype/pr_soft_dotted.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_space.h b/lib/unictype/pr_space.h
index 6a7b11a264..2629f1ed3b 100644
--- a/lib/unictype/pr_space.h
+++ b/lib/unictype/pr_space.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_terminal_punctuation.h b/lib/unictype/pr_terminal_punctuation.h
index 6ff5d89a9f..5bac4d598c 100644
--- a/lib/unictype/pr_terminal_punctuation.h
+++ b/lib/unictype/pr_terminal_punctuation.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[32 << 4];
+    unsigned int level3[33 << 4];
   }
 u_property_terminal_punctuation =
 {
@@ -186,12 +186,12 @@ u_property_terminal_punctuation =
         3 +   256 * sizeof (short) / sizeof (int) +   400,
         3 +   256 * sizeof (short) / sizeof (int) +   416,
        -1,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   432,
+        3 +   256 * sizeof (short) / sizeof (int) +   448,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   448,
+        3 +   256 * sizeof (short) / sizeof (int) +   464,
        -1,
        -1,
        -1,
@@ -226,7 +226,7 @@ u_property_terminal_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   464,
+        3 +   256 * sizeof (short) / sizeof (int) +   480,
        -1,
        -1,
        -1,
@@ -267,7 +267,7 @@ u_property_terminal_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   480,
+        3 +   256 * sizeof (short) / sizeof (int) +   496,
        -1,
        -1,
        -1,
@@ -282,7 +282,7 @@ u_property_terminal_punctuation =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   496,
+        3 +   256 * sizeof (short) / sizeof (int) +   512,
        -1,
        -1,
        -1,
@@ -411,6 +411,10 @@ u_property_terminal_punctuation =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x70000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x0000000CU, 0x00000000U,
+    0x18000000U, 0x00000006U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x0000000EU, 0x00020000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_titlecase.h b/lib/unictype/pr_titlecase.h
index ed6d1fe7dd..760197ca3f 100644
--- a/lib/unictype/pr_titlecase.h
+++ b/lib/unictype/pr_titlecase.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_unassigned_code_value.h b/lib/unictype/pr_unassigned_code_value.h
index 18d7204731..7eb694b73c 100644
--- a/lib/unictype/pr_unassigned_code_value.h
+++ b/lib/unictype/pr_unassigned_code_value.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[5 << 7];
-    unsigned int level3[77 << 4];
+    unsigned int level3[78 << 4];
   }
 u_property_unassigned_code_value =
 {
@@ -75,15 +75,15 @@ u_property_unassigned_code_value =
        16 +   640 * sizeof (short) / sizeof (int) +   192,
        16 +   640 * sizeof (short) / sizeof (int) +   208,
        16 +   640 * sizeof (short) / sizeof (int) +   224,
+       -1,
        16 +   640 * sizeof (short) / sizeof (int) +   240,
-       16 +   640 * sizeof (short) / sizeof (int) +   256,
        -1,
        -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   256,
        16 +   640 * sizeof (short) / sizeof (int) +   272,
        16 +   640 * sizeof (short) / sizeof (int) +   288,
        16 +   640 * sizeof (short) / sizeof (int) +   304,
        16 +   640 * sizeof (short) / sizeof (int) +   320,
-       16 +   640 * sizeof (short) / sizeof (int) +   336,
        -1,
        -1,
        -1,
@@ -96,7 +96,7 @@ u_property_unassigned_code_value =
        -1,
        -1,
        -1,
-       16 +   640 * sizeof (short) / sizeof (int) +   352,
+       16 +   640 * sizeof (short) / sizeof (int) +   336,
        -1,
        -1,
        -1,
@@ -137,13 +137,13 @@ u_property_unassigned_code_value =
        -1,
        -1,
        -1,
-       16 +   640 * sizeof (short) / sizeof (int) +   368,
+       16 +   640 * sizeof (short) / sizeof (int) +   352,
        -1,
        -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   368,
        16 +   640 * sizeof (short) / sizeof (int) +   384,
        16 +   640 * sizeof (short) / sizeof (int) +   400,
        16 +   640 * sizeof (short) / sizeof (int) +   416,
-       16 +   640 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
@@ -165,7 +165,7 @@ u_property_unassigned_code_value =
        -1,
        -1,
        -1,
-       16 +   640 * sizeof (short) / sizeof (int) +   448,
+       16 +   640 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
@@ -183,6 +183,7 @@ u_property_unassigned_code_value =
        -1,
        -1,
        -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   448,
        16 +   640 * sizeof (short) / sizeof (int) +   464,
        16 +   640 * sizeof (short) / sizeof (int) +   480,
        16 +   640 * sizeof (short) / sizeof (int) +   496,
@@ -201,47 +202,46 @@ u_property_unassigned_code_value =
        16 +   640 * sizeof (short) / sizeof (int) +   704,
        16 +   640 * sizeof (short) / sizeof (int) +   720,
        16 +   640 * sizeof (short) / sizeof (int) +   736,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
        -1,
-       16 +   640 * sizeof (short) / sizeof (int) +   768,
-       16 +   640 * sizeof (short) / sizeof (int) +   784,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
        16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   768,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   784,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       -1,
        16 +   640 * sizeof (short) / sizeof (int) +   800,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        -1,
        16 +   640 * sizeof (short) / sizeof (int) +   816,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +   832,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   848,
        -1,
        -1,
        -1,
@@ -253,66 +253,66 @@ u_property_unassigned_code_value =
        -1,
        -1,
        -1,
-       16 +   640 * sizeof (short) / sizeof (int) +   864,
+       16 +   640 * sizeof (short) / sizeof (int) +   848,
        -1,
+       16 +   640 * sizeof (short) / sizeof (int) +   864,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +   880,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
        16 +   640 * sizeof (short) / sizeof (int) +   896,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +   912,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +   928,
        16 +   640 * sizeof (short) / sizeof (int) +   944,
        16 +   640 * sizeof (short) / sizeof (int) +   960,
        16 +   640 * sizeof (short) / sizeof (int) +   976,
        -1,
        16 +   640 * sizeof (short) / sizeof (int) +   992,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1008,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1024,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1040,
        16 +   640 * sizeof (short) / sizeof (int) +  1056,
        16 +   640 * sizeof (short) / sizeof (int) +  1072,
        -1,
        16 +   640 * sizeof (short) / sizeof (int) +  1088,
        16 +   640 * sizeof (short) / sizeof (int) +  1104,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1120,
        -1,
        -1,
@@ -418,285 +418,285 @@ u_property_unassigned_code_value =
        -1,
        -1,
        16 +   640 * sizeof (short) / sizeof (int) +  1184,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
        -1,
        16 +   640 * sizeof (short) / sizeof (int) +  1200,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       -1,
+       16 +   640 * sizeof (short) / sizeof (int) +  1216,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1120,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1120,
-       16 +   640 * sizeof (short) / sizeof (int) +  1216,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
-       16 +   640 * sizeof (short) / sizeof (int) +   752,
+       16 +   640 * sizeof (short) / sizeof (int) +  1232,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
+       16 +   640 * sizeof (short) / sizeof (int) +   736,
        16 +   640 * sizeof (short) / sizeof (int) +  1120
   },
   {
@@ -712,17 +712,17 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00004000U, 0x00000000U, 0x00001800U, 0x00000000U,
     0x00000000U, 0xFFFC0000U, 0x00000000U, 0xF8000000U,
-    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFFFFFU,
+    0x00000000U, 0x8000C000U, 0xB0000000U, 0xFFFFF800U,
     0xFFFFFFFFU, 0xC0200000U, 0x000FFFFFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xF0000030U,
+    0x00066010U, 0x0C3A0200U, 0x4F7F8660U, 0xC0000030U,
     0x00067811U, 0x2C920200U, 0xA1FDC678U, 0xFFC0003FU,
-    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0xFDFC0030U,
+    0x00044011U, 0x0C120200U, 0xFFFEC440U, 0x01FC0030U,
     0x00066011U, 0x0C120200U, 0x4F3FC660U, 0xFF000030U,
     0x29C23813U, 0x3C0038E7U, 0xFF7EC238U, 0xF800003FU,
     0x00022010U, 0x1C000200U, 0xF89FC220U, 0x00FF0030U,
     0x00022010U, 0x0C100200U, 0xBF9FC220U, 0xFFF90030U,
-    0x00022011U, 0x18000000U, 0x000F0220U, 0x00000030U,
+    0x00022010U, 0x00000000U, 0x000F0220U, 0x00000030U,
     0x03800013U, 0xD0040000U, 0x00A07B80U, 0xFFE3003FU,
     0x00000001U, 0x78000000U, 0xF0000000U, 0xFFFFFFFFU,
     0x010FDA69U, 0xC4001351U, 0x0C00C0A0U, 0xFFFFFFFFU,
@@ -749,21 +749,17 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x0000F000U, 0xE0000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0FF00000U,
     0x00000000U, 0x07000000U, 0x00001C00U, 0x00000000U,
-    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC800000U,
+    0xFFFFFE00U, 0xFFFFFFFFU, 0x0000FF00U, 0xFC000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x07C00000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x04000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0C00000U, 0x00000000U, 0x5500C0C0U, 0xC0000000U,
     0x00000000U, 0x00200000U, 0x10300020U, 0x80230000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000C0020U,
-    0xE0008000U, 0x80000000U, 0x0000FFFFU, 0xFFFE0000U,
+    0xE0008000U, 0x00000000U, 0x0000FFFFU, 0xFFFE0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000F000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
     0x00000000U, 0xFFFFFF80U, 0xFFFFF800U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -771,18 +767,18 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00300000U,
-    0x00C00000U, 0x1C000000U, 0xFFFC0200U, 0xFFFF0FFFU,
+    0x00C00000U, 0x1C000000U, 0xFFF80200U, 0xFFFF0FFFU,
     0x00000000U, 0x00008000U, 0x80000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x01F00000U,
     0x00000000U, 0x0000DF40U, 0x00000000U, 0x7FFE7F00U,
     0xFF800000U, 0x80808080U, 0x80808080U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFE0U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU,
     0x04000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFC00000U, 0xF000FFFFU,
     0x00000000U, 0x00000000U, 0x00000001U, 0x00000000U,
     0x01800000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x0000001FU, 0x0001C000U, 0x00000000U, 0x00000000U,
+    0x0000001FU, 0x00018000U, 0x00000000U, 0x00000000U,
     0x00008000U, 0xF8000000U, 0x00000000U, 0x0000FFF0U,
     0x80000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
@@ -795,7 +791,7 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFC00000U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFF800U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x0000E000U, 0x00000000U, 0x0000FF80U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -834,7 +830,7 @@ u_property_unassigned_code_value =
     0xF0008000U, 0xFFFFFFFEU, 0x0000FFFFU, 0xC0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xE0000000U, 0x00000000U, 0xFFFE0000U, 0xF0000000U,
-    0x00000000U, 0x0000FFF0U, 0x0000F800U, 0xF8000000U,
+    0x00000000U, 0x00001FF0U, 0x0000F800U, 0xF8000000U,
     0x40000000U, 0x00000000U, 0xFFC000F0U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xC0000000U, 0x0000FC00U, 0x00F00000U, 0xF0000000U,
@@ -880,13 +876,13 @@ u_property_unassigned_code_value =
     0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x7FF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0xFE000000U,
+    0x00000000U, 0x00000000U, 0x0000FF00U, 0x00000000U,
+    0x20000030U, 0xFFFFFFF8U, 0x00000000U, 0xFE000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000200U, 0x00800000U, 0x0000FFC0U, 0x0000E000U,
     0x00030000U, 0xFF800100U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000480U, 0x4B800000U, 0xFC00FF00U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -915,7 +911,7 @@ u_property_unassigned_code_value =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x0000FFE0U, 0x80000000U,
-    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU,
+    0x00007FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFCU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -924,8 +920,12 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF80000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x80000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xF0000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0xE000F800U,
@@ -968,18 +968,18 @@ u_property_unassigned_code_value =
     0xFFF00000U, 0x00018000U, 0x00010001U, 0xFFC00000U,
     0x0000E000U, 0x00008000U, 0x00000000U, 0x0000F000U,
     0x00000000U, 0xFFFFE000U, 0xFFFFFFFFU, 0x0000003FU,
-    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFFFU,
+    0x0000FFF8U, 0xF0000000U, 0xFFFCFE00U, 0xFFFFFFC0U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFF80000U, 0xFF80E000U,
+    0x00000000U, 0x00000000U, 0xFFE00000U, 0xFE00E000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0xFFF00000U,
     0x00000000U, 0x00000000U, 0xFFE00000U, 0xFFFFFFFFU,
     0x0000F000U, 0x00000000U, 0xFC00FF00U, 0x00000000U,
     0x0000FF00U, 0xFFFFC000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0x8000FFFFU, 0x8006FF00U, 0x8000F000U, 0xFFFFFFFFU,
-    0xFFFC0000U, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0x0000F000U, 0x80000000U, 0x0000E000U, 0xFFFFF000U,
+    0xFF000000U, 0xFFFFFFFFU, 0x0000FFFEU, 0xFFFFFF80U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -997,9 +997,13 @@ u_property_unassigned_code_value =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x0000FFFCU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFEU,
     0xC0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/lib/unictype/pr_unified_ideograph.h b/lib/unictype/pr_unified_ideograph.h
index 4201cdaa0b..cc159f9a72 100644
--- a/lib/unictype/pr_unified_ideograph.h
+++ b/lib/unictype/pr_unified_ideograph.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[2 << 7];
-    unsigned int level3[8 << 4];
+    unsigned int level3[9 << 4];
   }
 u_property_unified_ideograph =
 {
@@ -278,20 +278,20 @@ u_property_unified_ideograph =
         4 +   256 * sizeof (short) / sizeof (int) +     0,
         4 +   256 * sizeof (short) / sizeof (int) +     0,
         4 +   256 * sizeof (short) / sizeof (int) +   112,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +     0,
+        4 +   256 * sizeof (short) / sizeof (int) +   128,
        -1,
        -1,
        -1,
@@ -315,7 +315,7 @@ u_property_unified_ideograph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0x801AC000U, 0x0000039AU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -333,8 +333,12 @@ u_property_unified_ideograph =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U
   }
 };
diff --git a/lib/unictype/pr_uppercase.h b/lib/unictype/pr_uppercase.h
index 9da9f3e85e..5adb4ebcf4 100644
--- a/lib/unictype/pr_uppercase.h
+++ b/lib/unictype/pr_uppercase.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_variation_selector.h b/lib/unictype/pr_variation_selector.h
index 2183599b0d..fcb549a3d0 100644
--- a/lib/unictype/pr_variation_selector.h
+++ b/lib/unictype/pr_variation_selector.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_white_space.h b/lib/unictype/pr_white_space.h
index 4f0efabe83..1808ad3714 100644
--- a/lib/unictype/pr_white_space.h
+++ b/lib/unictype/pr_white_space.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/pr_xid_continue.h b/lib/unictype/pr_xid_continue.h
index 9fe7f0ac6b..c5b31fc51a 100644
--- a/lib/unictype/pr_xid_continue.h
+++ b/lib/unictype/pr_xid_continue.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[4 << 7];
-    unsigned int level3[69 << 4];
+    unsigned int level3[71 << 4];
   }
 u_property_xid_continue =
 {
@@ -275,12 +275,12 @@ u_property_xid_continue =
        -1,
        -1,
        16 +   512 * sizeof (short) / sizeof (int) +   848,
+       16 +   512 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
        -1,
-       -1,
-       16 +   512 * sizeof (short) / sizeof (int) +   864,
+       16 +   512 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -290,24 +290,24 @@ u_property_xid_continue =
        -1,
        -1,
        -1,
-       16 +   512 * sizeof (short) / sizeof (int) +   880,
        16 +   512 * sizeof (short) / sizeof (int) +   896,
        16 +   512 * sizeof (short) / sizeof (int) +   912,
        16 +   512 * sizeof (short) / sizeof (int) +   928,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   944,
        -1,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   960,
        -1,
        -1,
-       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   976,
        -1,
        -1,
+       -1,
        16 +   512 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
+       16 +   512 * sizeof (short) / sizeof (int) +  1008,
+       -1,
+       -1,
        -1,
        -1,
        -1,
@@ -397,7 +397,7 @@ u_property_xid_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1008,
+       16 +   512 * sizeof (short) / sizeof (int) +  1024,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
@@ -405,8 +405,8 @@ u_property_xid_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1024,
        16 +   512 * sizeof (short) / sizeof (int) +  1040,
+       16 +   512 * sizeof (short) / sizeof (int) +  1056,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
@@ -417,21 +417,21 @@ u_property_xid_continue =
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1056,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+       16 +   512 * sizeof (short) / sizeof (int) +  1072,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +   304,
+       16 +   512 * sizeof (short) / sizeof (int) +  1088,
        -1,
        -1,
        -1,
@@ -439,10 +439,10 @@ u_property_xid_continue =
        -1,
        -1,
        16 +   512 * sizeof (short) / sizeof (int) +   304,
-       16 +   512 * sizeof (short) / sizeof (int) +  1072,
+       16 +   512 * sizeof (short) / sizeof (int) +  1104,
        -1,
        -1,
-       16 +   512 * sizeof (short) / sizeof (int) +  1088,
+       16 +   512 * sizeof (short) / sizeof (int) +  1120,
        -1,
        -1,
        -1,
@@ -588,17 +588,17 @@ u_property_xid_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FEFFFFFU, 0x9FFFFDFFU,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0x043FFFFFU,
-    0xFFFFFFFFU, 0x00003FFFU, 0x0FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0x00003FFFU, 0x0FFFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0xFFF00000U, 0xFFFFFFFBU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFEFFCFU,
-    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x0003FFCFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x1003FFCFU,
     0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x003FFFC0U,
-    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0x0200FFCFU,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE00FFCFU,
     0xFFF99FEEU, 0xF3EDFDFFU, 0xB0C0399FU, 0x0002FFCFU,
     0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x0000FFC0U,
     0xFFFDDFEFU, 0xE3FFFDFFU, 0x07603DDFU, 0x0000FFCFU,
     0xFFFDDFEFU, 0xF3EFFDFFU, 0x40603DDFU, 0x0006FFCFU,
-    0xFFFDDFEEU, 0xE7FFFFFFU, 0x80F07DDFU, 0xFC00FFCFU,
+    0xFFFDDFEFU, 0xFFFFFFFFU, 0x80F07DDFU, 0xFC00FFCFU,
     0xFC7FFFECU, 0x2FFBFFFFU, 0xFF5F847FU, 0x000CFFC0U,
     0xFFFFFFFEU, 0x07FFFFFFU, 0x03FF7FFFU, 0x00000000U,
     0xFEF02596U, 0x3BFFECAEU, 0xF3FF3F5FU, 0x00000000U,
@@ -629,9 +629,9 @@ u_property_xid_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0FFFU, 0x000FF800U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0x00FFFFFFU, 0xFFFFE3FFU, 0x3FFFFFFFU,
-    0x000001FFU, 0x00000000U, 0xFFF70000U, 0x037FFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFF70000U, 0x03FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF83FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
@@ -646,7 +646,7 @@ u_property_xid_continue =
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
     0x000000E0U, 0x1F3EFFFEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE67FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -659,7 +659,7 @@ u_property_xid_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -702,7 +702,7 @@ u_property_xid_continue =
     0x00000000U, 0x00000000U, 0x00000000U, 0x20000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000001U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x07FFFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -744,13 +744,13 @@ u_property_xid_continue =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF0080U, 0xFFFFFFFFU,
+    0x03FFFFCFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0xFF7FFFFFU, 0x03FF0001U, 0xFFFC0000U,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -775,7 +775,7 @@ u_property_xid_continue =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF001FU, 0x7FFFFFFFU,
-    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFFF8000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -784,8 +784,12 @@ u_property_xid_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -837,9 +841,13 @@ u_property_xid_continue =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_xid_start.h b/lib/unictype/pr_xid_start.h
index c0edbd13aa..74ebfaa0a1 100644
--- a/lib/unictype/pr_xid_start.h
+++ b/lib/unictype/pr_xid_start.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[3];
     short level2[3 << 7];
-    unsigned int level3[64 << 4];
+    unsigned int level3[66 << 4];
   }
 u_property_xid_start =
 {
@@ -263,12 +263,12 @@ u_property_xid_start =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   848,
+        4 +   384 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   864,
+        4 +   384 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
@@ -280,8 +280,8 @@ u_property_xid_start =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   880,
         4 +   384 * sizeof (short) / sizeof (int) +   896,
+        4 +   384 * sizeof (short) / sizeof (int) +   912,
        -1,
        -1,
        -1,
@@ -290,10 +290,10 @@ u_property_xid_start =
        -1,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   912,
+        4 +   384 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
-        4 +   384 * sizeof (short) / sizeof (int) +   928,
+        4 +   384 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
@@ -385,7 +385,7 @@ u_property_xid_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   944,
+        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
@@ -393,8 +393,8 @@ u_property_xid_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   960,
         4 +   384 * sizeof (short) / sizeof (int) +   976,
+        4 +   384 * sizeof (short) / sizeof (int) +   992,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
@@ -405,21 +405,21 @@ u_property_xid_start =
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +   992,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        4 +   384 * sizeof (short) / sizeof (int) +  1008,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +   304,
+        4 +   384 * sizeof (short) / sizeof (int) +  1024,
        -1,
        -1,
        -1,
@@ -427,7 +427,7 @@ u_property_xid_start =
        -1,
        -1,
         4 +   384 * sizeof (short) / sizeof (int) +   304,
-        4 +   384 * sizeof (short) / sizeof (int) +  1008,
+        4 +   384 * sizeof (short) / sizeof (int) +  1040,
        -1,
        -1
   },
@@ -448,10 +448,10 @@ u_property_xid_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9C00C060U,
     0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0002003FU, 0xFFFFFC00U, 0x043007FFU,
-    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x00000000U,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0x000007FFU,
     0x00000000U, 0x3FDFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFE0003U,
-    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x00030003U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x10030003U,
     0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001C0000U,
     0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x02000003U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x00020003U,
@@ -506,7 +506,7 @@ u_property_xid_start =
     0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
     0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
-    0xFFFFFFE0U, 0xFFFE3FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFE7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00007FFFU, 0x07FFFFFFU, 0x00000000U, 0xFFFF0000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -519,7 +519,7 @@ u_property_xid_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -562,7 +562,7 @@ u_property_xid_start =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFF0000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
@@ -604,13 +604,13 @@ u_property_xid_start =
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x80000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x000003CFU, 0x00000000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFDFFU, 0x00007FFFU, 0x00000001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x00000040U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -635,7 +635,7 @@ u_property_xid_start =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001001FU, 0x00000000U,
-    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000001U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -644,8 +644,12 @@ u_property_xid_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000003U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
@@ -681,9 +685,13 @@ u_property_xid_start =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/lib/unictype/pr_zero_width.h b/lib/unictype/pr_zero_width.h
index b57f1e352f..fca2f1ecca 100644
--- a/lib/unictype/pr_zero_width.h
+++ b/lib/unictype/pr_zero_width.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/scripts.h b/lib/unictype/scripts.h
index 7757563530..ff932e90b7 100644
--- a/lib/unictype/scripts.h
+++ b/lib/unictype/scripts.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Unicode scripts.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -36,7 +36,7 @@ static const uc_interval_t script_common_intervals[] =
   { 0x0589, 1, 1 },
   { 0x0605, 1, 1 },
   { 0x060C, 1, 1 },
-  { 0x061B, 1, 0 }, { 0x061C, 0, 1 },
+  { 0x061B, 1, 1 },
   { 0x061F, 1, 1 },
   { 0x0640, 1, 1 },
   { 0x06DD, 1, 1 },
@@ -53,30 +53,29 @@ static const uc_interval_t script_common_intervals[] =
   { 0x1CE1, 1, 1 },
   { 0x1CE9, 1, 0 }, { 0x1CEC, 0, 1 },
   { 0x1CEE, 1, 0 }, { 0x1CF3, 0, 1 },
-  { 0x1CF5, 1, 0 }, { 0x1CF6, 0, 1 },
+  { 0x1CF5, 1, 0 }, { 0x1CF7, 0, 1 },
   { 0x2000, 1, 0 }, { 0x200B, 0, 1 },
   { 0x200E, 1, 0 }, { 0x2064, 0, 1 },
   { 0x2066, 1, 0 }, { 0x2070, 0, 1 },
   { 0x2074, 1, 0 }, { 0x207E, 0, 1 },
   { 0x2080, 1, 0 }, { 0x208E, 0, 1 },
-  { 0x20A0, 1, 0 }, { 0x20BE, 0, 1 },
+  { 0x20A0, 1, 0 }, { 0x20BF, 0, 1 },
   { 0x2100, 1, 0 }, { 0x2125, 0, 1 },
   { 0x2127, 1, 0 }, { 0x2129, 0, 1 },
   { 0x212C, 1, 0 }, { 0x2131, 0, 1 },
   { 0x2133, 1, 0 }, { 0x214D, 0, 1 },
   { 0x214F, 1, 0 }, { 0x215F, 0, 1 },
   { 0x2189, 1, 0 }, { 0x218B, 0, 1 },
-  { 0x2190, 1, 0 }, { 0x23FE, 0, 1 },
-  { 0x2400, 1, 0 }, { 0x2426, 0, 1 },
+  { 0x2190, 1, 0 }, { 0x2426, 0, 1 },
   { 0x2440, 1, 0 }, { 0x244A, 0, 1 },
   { 0x2460, 1, 0 }, { 0x27FF, 0, 1 },
   { 0x2900, 1, 0 }, { 0x2B73, 0, 1 },
   { 0x2B76, 1, 0 }, { 0x2B95, 0, 1 },
   { 0x2B98, 1, 0 }, { 0x2BB9, 0, 1 },
   { 0x2BBD, 1, 0 }, { 0x2BC8, 0, 1 },
-  { 0x2BCA, 1, 0 }, { 0x2BD1, 0, 1 },
+  { 0x2BCA, 1, 0 }, { 0x2BD2, 0, 1 },
   { 0x2BEC, 1, 0 }, { 0x2BEF, 0, 1 },
-  { 0x2E00, 1, 0 }, { 0x2E44, 0, 1 },
+  { 0x2E00, 1, 0 }, { 0x2E49, 0, 1 },
   { 0x2FF0, 1, 0 }, { 0x2FFB, 0, 1 },
   { 0x3000, 1, 0 }, { 0x3004, 0, 1 },
   { 0x3006, 1, 1 },
@@ -164,9 +163,10 @@ static const uc_interval_t script_common_intervals[] =
   { 0x1F210, 1, 0 }, { 0x1F23B, 0, 1 },
   { 0x1F240, 1, 0 }, { 0x1F248, 0, 1 },
   { 0x1F250, 1, 0 }, { 0x1F251, 0, 1 },
-  { 0x1F300, 1, 0 }, { 0x1F6D2, 0, 1 },
+  { 0x1F260, 1, 0 }, { 0x1F265, 0, 1 },
+  { 0x1F300, 1, 0 }, { 0x1F6D4, 0, 1 },
   { 0x1F6E0, 1, 0 }, { 0x1F6EC, 0, 1 },
-  { 0x1F6F0, 1, 0 }, { 0x1F6F6, 0, 1 },
+  { 0x1F6F0, 1, 0 }, { 0x1F6F8, 0, 1 },
   { 0x1F700, 1, 0 }, { 0x1F773, 0, 1 },
   { 0x1F780, 1, 0 }, { 0x1F7D4, 0, 1 },
   { 0x1F800, 1, 0 }, { 0x1F80B, 0, 1 },
@@ -174,14 +174,13 @@ static const uc_interval_t script_common_intervals[] =
   { 0x1F850, 1, 0 }, { 0x1F859, 0, 1 },
   { 0x1F860, 1, 0 }, { 0x1F887, 0, 1 },
   { 0x1F890, 1, 0 }, { 0x1F8AD, 0, 1 },
-  { 0x1F910, 1, 0 }, { 0x1F91E, 0, 1 },
-  { 0x1F920, 1, 0 }, { 0x1F927, 0, 1 },
-  { 0x1F930, 1, 1 },
-  { 0x1F933, 1, 0 }, { 0x1F93E, 0, 1 },
-  { 0x1F940, 1, 0 }, { 0x1F94B, 0, 1 },
-  { 0x1F950, 1, 0 }, { 0x1F95E, 0, 1 },
-  { 0x1F980, 1, 0 }, { 0x1F991, 0, 1 },
+  { 0x1F900, 1, 0 }, { 0x1F90B, 0, 1 },
+  { 0x1F910, 1, 0 }, { 0x1F93E, 0, 1 },
+  { 0x1F940, 1, 0 }, { 0x1F94C, 0, 1 },
+  { 0x1F950, 1, 0 }, { 0x1F96B, 0, 1 },
+  { 0x1F980, 1, 0 }, { 0x1F997, 0, 1 },
   { 0x1F9C0, 1, 1 },
+  { 0x1F9D0, 1, 0 }, { 0x1F9E6, 0, 1 },
   { 0xE0001, 1, 1 },
   { 0xE0020, 1, 0 }, { 0xE007F, 0, 1 }
 };
@@ -295,6 +294,7 @@ static const uc_interval_t script_arabic_intervals[] =
   { 0x0600, 1, 0 }, { 0x0604, 0, 1 },
   { 0x0606, 1, 0 }, { 0x060B, 0, 1 },
   { 0x060D, 1, 0 }, { 0x061A, 0, 1 },
+  { 0x061C, 1, 1 },
   { 0x061E, 1, 1 },
   { 0x0620, 1, 0 }, { 0x063F, 0, 1 },
   { 0x0641, 1, 0 }, { 0x064A, 0, 1 },
@@ -353,7 +353,8 @@ static const uc_interval_t script_syriac_intervals[] =
 {
   { 0x0700, 1, 0 }, { 0x070D, 0, 1 },
   { 0x070F, 1, 0 }, { 0x074A, 0, 1 },
-  { 0x074D, 1, 0 }, { 0x074F, 0, 1 }
+  { 0x074D, 1, 0 }, { 0x074F, 0, 1 },
+  { 0x0860, 1, 0 }, { 0x086A, 0, 1 }
 };
 static const uc_interval_t script_thaana_intervals[] =
 {
@@ -381,7 +382,7 @@ static const uc_interval_t script_bengali_intervals[] =
   { 0x09D7, 1, 1 },
   { 0x09DC, 1, 0 }, { 0x09DD, 0, 1 },
   { 0x09DF, 1, 0 }, { 0x09E3, 0, 1 },
-  { 0x09E6, 1, 0 }, { 0x09FB, 0, 1 }
+  { 0x09E6, 1, 0 }, { 0x09FD, 0, 1 }
 };
 static const uc_interval_t script_gurmukhi_intervals[] =
 {
@@ -417,7 +418,7 @@ static const uc_interval_t script_gujarati_intervals[] =
   { 0x0AD0, 1, 1 },
   { 0x0AE0, 1, 0 }, { 0x0AE3, 0, 1 },
   { 0x0AE6, 1, 0 }, { 0x0AF1, 0, 1 },
-  { 0x0AF9, 1, 1 }
+  { 0x0AF9, 1, 0 }, { 0x0AFF, 0, 1 }
 };
 static const uc_interval_t script_oriya_intervals[] =
 {
@@ -490,11 +491,10 @@ static const uc_interval_t script_kannada_intervals[] =
 };
 static const uc_interval_t script_malayalam_intervals[] =
 {
-  { 0x0D01, 1, 0 }, { 0x0D03, 0, 1 },
+  { 0x0D00, 1, 0 }, { 0x0D03, 0, 1 },
   { 0x0D05, 1, 0 }, { 0x0D0C, 0, 1 },
   { 0x0D0E, 1, 0 }, { 0x0D10, 0, 1 },
-  { 0x0D12, 1, 0 }, { 0x0D3A, 0, 1 },
-  { 0x0D3D, 1, 0 }, { 0x0D44, 0, 1 },
+  { 0x0D12, 1, 0 }, { 0x0D44, 0, 1 },
   { 0x0D46, 1, 0 }, { 0x0D48, 0, 1 },
   { 0x0D4A, 1, 0 }, { 0x0D4F, 0, 1 },
   { 0x0D54, 1, 0 }, { 0x0D63, 0, 1 },
@@ -662,7 +662,7 @@ static const uc_interval_t script_hiragana_intervals[] =
 {
   { 0x3041, 1, 0 }, { 0x3096, 0, 1 },
   { 0x309D, 1, 0 }, { 0x309F, 0, 1 },
-  { 0x1B001, 1, 1 },
+  { 0x1B001, 1, 0 }, { 0x1B11E, 0, 1 },
   { 0x1F200, 1, 1 }
 };
 static const uc_interval_t script_katakana_intervals[] =
@@ -679,7 +679,7 @@ static const uc_interval_t script_katakana_intervals[] =
 static const uc_interval_t script_bopomofo_intervals[] =
 {
   { 0x02EA, 1, 0 }, { 0x02EB, 0, 1 },
-  { 0x3105, 1, 0 }, { 0x312D, 0, 1 },
+  { 0x3105, 1, 0 }, { 0x312E, 0, 1 },
   { 0x31A0, 1, 0 }, { 0x31BA, 0, 1 }
 };
 static const uc_interval_t script_han_intervals[] =
@@ -692,13 +692,14 @@ static const uc_interval_t script_han_intervals[] =
   { 0x3021, 1, 0 }, { 0x3029, 0, 1 },
   { 0x3038, 1, 0 }, { 0x303B, 0, 1 },
   { 0x3400, 1, 0 }, { 0x4DB5, 0, 1 },
-  { 0x4E00, 1, 0 }, { 0x9FD5, 0, 1 },
+  { 0x4E00, 1, 0 }, { 0x9FEA, 0, 1 },
   { 0xF900, 1, 0 }, { 0xFA6D, 0, 1 },
   { 0xFA70, 1, 0 }, { 0xFAD9, 0, 1 },
   { 0x20000, 1, 0 }, { 0x2A6D6, 0, 1 },
   { 0x2A700, 1, 0 }, { 0x2B734, 0, 1 },
   { 0x2B740, 1, 0 }, { 0x2B81D, 0, 1 },
   { 0x2B820, 1, 0 }, { 0x2CEA1, 0, 1 },
+  { 0x2CEB0, 1, 0 }, { 0x2EBE0, 0, 1 },
   { 0x2F800, 1, 0 }, { 0x2FA1D, 0, 1 }
 };
 static const uc_interval_t script_yi_intervals[] =
@@ -708,7 +709,8 @@ static const uc_interval_t script_yi_intervals[] =
 };
 static const uc_interval_t script_old_italic_intervals[] =
 {
-  { 0x10300, 1, 0 }, { 0x10323, 0, 1 }
+  { 0x10300, 1, 0 }, { 0x10323, 0, 1 },
+  { 0x1032D, 1, 0 }, { 0x1032F, 0, 1 }
 };
 static const uc_interval_t script_gothic_intervals[] =
 {
@@ -732,7 +734,7 @@ static const uc_interval_t script_inherited_intervals[] =
   { 0x1CED, 1, 1 },
   { 0x1CF4, 1, 1 },
   { 0x1CF8, 1, 0 }, { 0x1CF9, 0, 1 },
-  { 0x1DC0, 1, 0 }, { 0x1DF5, 0, 1 },
+  { 0x1DC0, 1, 0 }, { 0x1DF9, 0, 1 },
   { 0x1DFB, 1, 0 }, { 0x1DFF, 0, 1 },
   { 0x200C, 1, 0 }, { 0x200D, 0, 1 },
   { 0x20D0, 1, 0 }, { 0x20F0, 0, 1 },
@@ -1280,7 +1282,32 @@ static const uc_interval_t script_tangut_intervals[] =
   { 0x17000, 1, 0 }, { 0x187EC, 0, 1 },
   { 0x18800, 1, 0 }, { 0x18AF2, 0, 1 }
 };
-static const uc_script_t scripts[137] =
+static const uc_interval_t script_masaram_gondi_intervals[] =
+{
+  { 0x11D00, 1, 0 }, { 0x11D06, 0, 1 },
+  { 0x11D08, 1, 0 }, { 0x11D09, 0, 1 },
+  { 0x11D0B, 1, 0 }, { 0x11D36, 0, 1 },
+  { 0x11D3A, 1, 1 },
+  { 0x11D3C, 1, 0 }, { 0x11D3D, 0, 1 },
+  { 0x11D3F, 1, 0 }, { 0x11D47, 0, 1 },
+  { 0x11D50, 1, 0 }, { 0x11D59, 0, 1 }
+};
+static const uc_interval_t script_nushu_intervals[] =
+{
+  { 0x16FE1, 1, 1 },
+  { 0x1B170, 1, 0 }, { 0x1B2FB, 0, 1 }
+};
+static const uc_interval_t script_soyombo_intervals[] =
+{
+  { 0x11A50, 1, 0 }, { 0x11A83, 0, 1 },
+  { 0x11A86, 1, 0 }, { 0x11A9C, 0, 1 },
+  { 0x11A9E, 1, 0 }, { 0x11AA2, 0, 1 }
+};
+static const uc_interval_t script_zanabazar_square_intervals[] =
+{
+  { 0x11A00, 1, 0 }, { 0x11A47, 0, 1 }
+};
+static const uc_script_t scripts[141] =
 {
   {
     sizeof (script_common_intervals) / sizeof (uc_interval_t),
@@ -1966,6 +1993,26 @@ static const uc_script_t scripts[137] =
     sizeof (script_tangut_intervals) / sizeof (uc_interval_t),
     script_tangut_intervals,
     "Tangut"
+  },
+  {
+    sizeof (script_masaram_gondi_intervals) / sizeof (uc_interval_t),
+    script_masaram_gondi_intervals,
+    "Masaram_Gondi"
+  },
+  {
+    sizeof (script_nushu_intervals) / sizeof (uc_interval_t),
+    script_nushu_intervals,
+    "Nushu"
+  },
+  {
+    sizeof (script_soyombo_intervals) / sizeof (uc_interval_t),
+    script_soyombo_intervals,
+    "Soyombo"
+  },
+  {
+    sizeof (script_zanabazar_square_intervals) / sizeof (uc_interval_t),
+    script_zanabazar_square_intervals,
+    "Zanabazar_Square"
   }
 };
 #define script_header_0 16
@@ -1978,7 +2025,7 @@ struct
   {
     int level1[15];
     short level2[4 << 9];
-    unsigned char level3[208 << 7];
+    unsigned char level3[214 << 7];
   }
 u_script =
 {
@@ -1995,41 +2042,41 @@ u_script =
      4736,  4736,  4736,  4736,  4736,  4864,  4992,  5120,
      5248,  5376,  5504,  5632,  5760,  5888,  6016,  6144,
      6272,  6400,  6528,  6656,   256,   256,  6784,  6912,
-     7040,  7168,  7296,  7424,  7552,  7552,  7552,  7680,
-     7808,  7552,  7552,  7552,  7552,  7552,  7552,  7552,
-     7936,  7936,  7552,  7552,  7552,  7552,  8064,  8192,
-     8320,  8448,  8576,  8704,  8832,  8960,  9088,  9216,
-     9344,  9472,  9600,  9728,  9856,  9984, 10112,  7552,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088, 10240,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088, 10368,
-    10496, 10496, 10496, 10496, 10496, 10496, 10496, 10496,
-    10496, 10624, 10752, 10752, 10880, 11008, 11136, 11264,
-    11392, 11520, 11648, 11776, 11904, 12032, 12160, 12288,
+     7040,  7168,  7296,  7424,  7552,  7552,  7552,  7552,
+     7680,  7552,  7552,  7552,  7552,  7552,  7552,  7552,
+     7808,  7808,  7552,  7552,  7552,  7552,  7936,  8064,
+     8192,  8320,  8448,  8576,  8704,  8832,  8960,  9088,
+     9216,  9344,  9472,  9600,  9728,  9856,  9984,  7552,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960, 10112,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960, 10240,
+    10368, 10368, 10368, 10368, 10368, 10368, 10368, 10368,
+    10368, 10496, 10624, 10624, 10752, 10880, 11008, 11136,
+    11264, 11392, 11520, 11648, 11776, 11904, 12032, 12160,
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
@@ -2040,146 +2087,146 @@ u_script =
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
      4096,  4096,  4096,  4096,  4096,  4096,  4096,  4096,
-     4096,  4096,  4096,  4096,  4096,  4096,  4096, 12416,
-       -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,    -1,    -1,    -1,    -1,    -1,    -1,
+     4096,  4096,  4096,  4096,  4096,  4096,  4096, 12288,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  9088,  9088, 12544, 12672, 12800, 12928,
-    13056, 13056, 13184, 13312, 13440, 13568, 13696, 13824,
-    13952, 14080, 14208, 14336,    -1, 14464, 14592, 14720,
-    14848, 14976, 15104,    -1, 15232, 15232, 15360,    -1,
-    15488, 15616, 15744, 15872, 16000, 16128, 16256, 16384,
-    16512, 16640,    -1,    -1, 16768,    -1,    -1,    -1,
-    16896, 17024, 17152, 17280, 17408, 17536, 17664,    -1,
-    17792, 17920,    -1, 18048, 18176, 18304, 18432,    -1,
-       -1, 18560,    -1,    -1,    -1, 18688,    -1,    -1,
-    18816, 18944,    -1,    -1,    -1,    -1,    -1,    -1,
-    19072, 19072, 19072, 19072, 19072, 19072, 19072, 19200,
-    19328, 19072, 19456,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    19584, 19584, 19584, 19584, 19584, 19584, 19584, 19584,
-    19712,    -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,
-    19840, 19840, 19840, 19840, 19968,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  8960,  8960, 12416, 12544, 12672, 12800,
+    12928, 12928, 13056, 13184, 13312, 13440, 13568, 13696,
+    13824, 13952, 14080, 14208,    -1, 14336, 14464, 14592,
+    14720, 14848, 14976,    -1, 15104, 15104, 15232,    -1,
+    15360, 15488, 15616, 15744, 15872, 16000, 16128, 16256,
+    16384, 16512,    -1,    -1, 16640,    -1,    -1,    -1,
+    16768, 16896, 17024, 17152, 17280, 17408, 17536,    -1,
+    17664, 17792,    -1, 17920, 18048, 18176, 18304,    -1,
+       -1, 18432,    -1,    -1, 18560, 18688,    -1,    -1,
+    18816, 18944, 19072,    -1,    -1,    -1,    -1,    -1,
+    19200, 19200, 19200, 19200, 19200, 19200, 19200, 19328,
+    19456, 19200, 19584,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    19712, 19712, 19712, 19712, 19712, 19712, 19712, 19712,
+    19840,    -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,
+    19968, 19968, 19968, 19968, 20096,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    20096, 20096, 20096, 20096, 20224, 20352, 20480, 20608,
-       -1,    -1,    -1,    -1,    -1,    -1, 20736, 20864,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 20992,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 20992,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 20992,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 20992,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 20992,
-    20992, 20992, 20992, 20992, 20992, 20992, 20992, 21120,
-    20992, 20992, 20992, 20992, 20992, 21248,    -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,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    20224, 20224, 20224, 20224, 20352, 20480, 20608, 20736,
+       -1,    -1,    -1,    -1,    -1,    -1, 20864, 20992,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21120,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21120,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21120,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21120,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21120,
+    21120, 21120, 21120, 21120, 21120, 21120, 21120, 21248,
+    21120, 21120, 21120, 21120, 21120, 21376,    -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,
-    21376,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    21504, 21632,    -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,
-     7552, 21760, 21888, 22016, 22144,    -1, 22272,    -1,
-    22400, 22528, 22656,  7552,  7552, 22784,  7552, 22912,
-    23040, 23040, 23040, 23040, 23040, 23168,    -1,    -1,
+    21504, 21632, 21760, 21888, 21888, 22016,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    23296,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    23424, 23552, 23680,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 23808, 23936,    -1,    -1,
-    24064, 24192, 24320, 24448, 24576,    -1,  7552,  7552,
-     7552,  7552,  7552,  7552,  7552, 24704, 24832, 24960,
-    25088, 25216, 25344, 25472,    -1,    -1,    -1,    -1,
+    22144, 22272,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088, 25600,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088, 25728,  9088,
-    25856,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088,  9088,  9088,  9088,
-     9088,  9088,  9088,  9088,  9088, 25984,    -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,
+     7552, 22400, 22528, 22656, 22784,    -1, 22912,    -1,
+    23040, 23168, 23296,  7552,  7552, 23424,  7552, 23552,
+    23680, 23680, 23680, 23680, 23680, 23808,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    23936,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    24064, 24192, 24320,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 24448, 24576,    -1,    -1,
+    24704, 24832, 24960, 25088, 25216,    -1,  7552,  7552,
+     7552,  7552,  7552,  7552,  7552, 25344, 25472, 25600,
+    25728, 25856, 25984, 26112,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960, 26240,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960, 26368,  8960,
+    26496,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960, 26624,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960,  8960,
+     8960,  8960,  8960,  8960,  8960,  8960,  8960, 26752,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     8960,  8960,  8960,  8960, 26880,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     9088,  9088,  9088,  9088, 26112,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    26240,    -1, 26368, 26496,    -1,    -1,    -1,    -1,
+    27008,    -1, 27136, 27264,    -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,
@@ -2408,7 +2455,7 @@ u_script =
       6,   6,   6,   6,   6,   0,   6,   6,
       6,   6,   6,   6,   0,   6,   6,   6,
       6,   6,   6,   6,   6,   6,   6,   6,
-      6,   6,   6,   0,   0, 255,   6,   0,
+      6,   6,   6,   0,   6, 255,   6,   0,
       6,   6,   6,   6,   6,   6,   6,   6,
       6,   6,   6,   6,   6,   6,   6,   6,
       6,   6,   6,   6,   6,   6,   6,   6,
@@ -2481,8 +2528,8 @@ u_script =
      94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94, 255, 255,  94, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      7,   7,   7,   7,   7,   7,   7,   7,
+      7,   7,   7, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -2532,7 +2579,7 @@ u_script =
      10,  10,  10,  10, 255, 255,  10,  10,
      10,  10,  10,  10,  10,  10,  10,  10,
      10,  10,  10,  10,  10,  10,  10,  10,
-     10,  10,  10,  10, 255, 255, 255, 255,
+     10,  10,  10,  10,  10,  10, 255, 255,
     255,  11,  11,  11, 255,  11,  11,  11,
      11,  11,  11, 255, 255, 255, 255,  11,
      11, 255, 255,  11,  11,  11,  11,  11,
@@ -2564,7 +2611,7 @@ u_script =
      12,  12,  12,  12, 255, 255,  12,  12,
      12,  12,  12,  12,  12,  12,  12,  12,
      12,  12, 255, 255, 255, 255, 255, 255,
-    255,  12, 255, 255, 255, 255, 255, 255,
+    255,  12,  12,  12,  12,  12,  12,  12,
     255,  13,  13,  13, 255,  13,  13,  13,
      13,  13,  13,  13,  13, 255, 255,  13,
      13, 255, 255,  13,  13,  13,  13,  13,
@@ -2629,14 +2676,14 @@ u_script =
      16,  16,  16,  16,  16,  16,  16,  16,
     255,  16,  16, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    255,  17,  17,  17, 255,  17,  17,  17,
+     17,  17,  17,  17, 255,  17,  17,  17,
      17,  17,  17,  17,  17, 255,  17,  17,
      17, 255,  17,  17,  17,  17,  17,  17,
      17,  17,  17,  17,  17,  17,  17,  17,
      17,  17,  17,  17,  17,  17,  17,  17,
      17,  17,  17,  17,  17,  17,  17,  17,
      17,  17,  17,  17,  17,  17,  17,  17,
-     17,  17,  17, 255, 255,  17,  17,  17,
+     17,  17,  17,  17,  17,  17,  17,  17,
      17,  17,  17,  17,  17, 255,  17,  17,
      17, 255,  17,  17,  17,  17,  17,  17,
     255, 255, 255, 255,  17,  17,  17,  17,
@@ -3059,7 +3106,7 @@ u_script =
      40,  40,  40,  40,  40,  40,  40,  40,
      40,   0,  40,  40,  40,  40,  40,  40,
      40,   0,   0,   0,   0,  40,   0,   0,
-      0,   0,   0,   0,  40,   0,   0, 255,
+      0,   0,   0,   0,  40,   0,   0,   0,
      40,  40, 255, 255, 255, 255, 255, 255,
       1,   1,   1,   1,   1,   1,   1,   1,
       1,   1,   1,   1,   1,   1,   1,   1,
@@ -3091,8 +3138,8 @@ u_script =
      40,  40,  40,  40,  40,  40,  40,  40,
      40,  40,  40,  40,  40,  40,  40,  40,
      40,  40,  40,  40,  40,  40,  40,  40,
-     40,  40,  40,  40,  40,  40, 255, 255,
-    255, 255, 255,  40,  40,  40,  40,  40,
+     40,  40,  40,  40,  40,  40,  40,  40,
+     40,  40, 255,  40,  40,  40,  40,  40,
       2,   2,   2,   2,   2,   2,   2,   2,
       2,   2,   2,   2,   2,   2,   2,   2,
       2,   2,   2,   2,   2,   2, 255, 255,
@@ -3148,7 +3195,7 @@ u_script =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
      40,  40,  40,  40,  40,  40,  40,  40,
@@ -3209,22 +3256,6 @@ u_script =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0, 255,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -3279,7 +3310,7 @@ u_script =
       0,   0, 255, 255, 255,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0, 255,   0,   0,   0,   0,   0,   0,
-      0,   0, 255, 255, 255, 255, 255, 255,
+      0,   0,   0, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255,   0,   0,   0,   0,
@@ -3357,8 +3388,8 @@ u_script =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -3450,7 +3481,7 @@ u_script =
      34,  34,  34,  34,  34,  34,  34,  34,
      34,  34,  34,  34,  34,  34,  34,  34,
      34,  34,  34,  34,  34,  34,  34,  34,
-     34,  34,  34,  34,  34,  34, 255, 255,
+     34,  34,  34,  34,  34,  34,  34, 255,
     255,  24,  24,  24,  24,  24,  24,  24,
      24,  24,  24,  24,  24,  24,  24,  24,
      24,  24,  24,  24,  24,  24,  24,  24,
@@ -3551,10 +3582,10 @@ u_script =
      35,  35,  35,  35,  35,  35,  35,  35,
      35,  35,  35,  35,  35,  35,  35,  35,
      35,  35,  35,  35,  35,  35,  35,  35,
-     35,  35,  35,  35,  35,  35, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
      36,  36,  36,  36,  36,  36,  36,  36,
@@ -4074,7 +4105,7 @@ u_script =
      37,  37,  37,  37,  37,  37,  37,  37,
      37,  37,  37,  37,  37,  37,  37,  37,
      37,  37,  37,  37, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255,  37,  37,  37,
      38,  38,  38,  38,  38,  38,  38,  38,
      38,  38,  38,  38,  38,  38,  38,  38,
      38,  38,  38,  38,  38,  38,  38,  38,
@@ -4581,11 +4612,27 @@ u_script =
     124, 124, 124, 124, 124, 124, 124, 124,
     124, 124, 124, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 124,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    140, 140, 140, 140, 140, 140, 140, 140,
+    255, 255, 255, 255, 255, 255, 255, 255,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 255, 255, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 139, 139, 139,
+    139, 139, 139, 139, 139, 255, 139, 139,
+    139, 139, 139, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -4629,6 +4676,22 @@ u_script =
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
+    137, 137, 137, 137, 137, 137, 137, 255,
+    137, 137, 255, 137, 137, 137, 137, 137,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    137, 137, 137, 137, 137, 137, 137, 255,
+    255, 255, 137, 255, 137, 137, 255, 137,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    255, 255, 255, 255, 255, 255, 255, 255,
+    137, 137, 137, 137, 137, 137, 137, 137,
+    137, 137, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255,
+    255, 255, 255, 255, 255, 255, 255, 255,
      62,  62,  62,  62,  62,  62,  62,  62,
      62,  62,  62,  62,  62,  62,  62,  62,
      62,  62,  62,  62,  62,  62,  62,  62,
@@ -4865,7 +4928,7 @@ u_script =
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    136, 255, 255, 255, 255, 255, 255, 255,
+    136, 138, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -4917,12 +4980,42 @@ u_script =
     136, 136, 136, 136, 136, 136, 136, 136,
     136, 136, 136, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-     33,  32, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+     33,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32,  32,
+     32,  32,  32,  32,  32,  32,  32, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -4933,6 +5026,40 @@ u_script =
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 138, 138, 138, 138,
+    138, 138, 138, 138, 255, 255, 255, 255,
     104, 104, 104, 104, 104, 104, 104, 104,
     104, 104, 104, 104, 104, 104, 104, 104,
     104, 104, 104, 104, 104, 104, 104, 104,
@@ -5329,7 +5456,7 @@ u_script =
       0, 255, 255, 255, 255, 255, 255, 255,
       0,   0, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -5343,12 +5470,12 @@ u_script =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0, 255, 255, 255,
-      0,   0,   0,   0,   0,   0,   0, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0, 255, 255, 255, 255, 255, 255, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -5413,25 +5540,25 @@ u_script =
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0, 255,
+      0,   0,   0,   0, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    255, 255, 255, 255, 255, 255, 255, 255,
-      0, 255, 255,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0, 255, 255, 255, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -5439,9 +5566,9 @@ u_script =
     255, 255, 255, 255, 255, 255, 255, 255,
       0, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
@@ -5499,13 +5626,29 @@ u_script =
      35,  35,  35,  35,  35,  35,  35,  35,
      35,  35, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
-    255, 255, 255, 255, 255, 255, 255, 255,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35,  35,  35,  35,  35,  35,  35,  35,
+     35, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255,
diff --git a/lib/unictype/scripts_byname.gperf b/lib/unictype/scripts_byname.gperf
index 8de3271c39..a7ad646fca 100644
--- a/lib/unictype/scripts_byname.gperf
+++ b/lib/unictype/scripts_byname.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Unicode scripts.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -165,3 +165,7 @@ Marchen, 133
 Newa, 134
 Osage, 135
 Tangut, 136
+Masaram_Gondi, 137
+Nushu, 138
+Soyombo, 139
+Zanabazar_Square, 140
diff --git a/lib/unictype/sy_c_ident.h b/lib/unictype/sy_c_ident.h
index 8f1c36d895..26b0402190 100644
--- a/lib/unictype/sy_c_ident.h
+++ b/lib/unictype/sy_c_ident.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Language syntax properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/sy_c_whitespace.h b/lib/unictype/sy_c_whitespace.h
index 45b0301192..9d0b2fa1d1 100644
--- a/lib/unictype/sy_c_whitespace.h
+++ b/lib/unictype/sy_c_whitespace.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Language syntax properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unictype/sy_java_ident.h b/lib/unictype/sy_java_ident.h
index 2d51a94fbd..992ed8655f 100644
--- a/lib/unictype/sy_java_ident.h
+++ b/lib/unictype/sy_java_ident.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Language syntax properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -34,8 +34,8 @@ static const
 struct
   {
     int level1[225];
-    short level2[25 << 5];
-    unsigned short level3[169 * 16];
+    short level2[26 << 5];
+    unsigned short level3[173 * 16];
   }
 u_java_ident =
 {
@@ -45,7 +45,7 @@ u_java_ident =
       320,   352,   384,   416,   448,    -1,   480,   160,
       512,    -1,    -1,   544,    -1,   576,   608,    -1,
       160,   160,   160,   160,   160,   160,   160,   160,
-      160,   160,   640,   672,   704,    -1,    -1,   736,
+      160,   160,   640,   672,   704,   160,   736,   768,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -68,7 +68,7 @@ u_java_ident =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      768
+      800
   },
   {
         0,   128,   256,   256,   256,   384,   512,   640,
@@ -117,57 +117,61 @@ u_java_ident =
     14080, 14208,    -1,    -1,    -1,    -1,    -1,    -1,
     14336, 14464, 14592, 14720, 14848, 14976, 15104,    -1,
     15232, 15360,    -1, 15488, 15616, 15744, 15872,    -1,
-       -1, 16000,    -1,    -1,    -1, 16128,    -1,    -1,
-    16256, 16384,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256,   256,   256,   256, 16512,
-    16640,   256, 16768,    -1,    -1,    -1,    -1,    -1,
+       -1, 16000,    -1,    -1, 16128, 16256,    -1,    -1,
+    16384, 16512, 16640,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256,   256,   256,   256, 16768,
+    16896,   256, 17024,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       256,   256,   256,   256,   256,   256,   256,   256,
-    16896,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17152,    -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,
-      256,   256,   256,   256, 17024,    -1,    -1,    -1,
+      256,   256,   256,   256, 17280,    -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,
-      256,   256,   256,   256, 17152, 17280, 17408, 17536,
-       -1,    -1,    -1,    -1,    -1,    -1, 17664, 17792,
+      256,   256,   256,   256, 17408, 17536, 17664, 17792,
+       -1,    -1,    -1,    -1,    -1,    -1, 17920, 18048,
       256,   256,   256,   256,   256,   256,   256,   256,
-      256,   256,   256,   256,   256,   256,   256, 17920,
-      256,   256,   256,   256,   256, 18048,    -1,    -1,
+      256,   256,   256,   256,   256,   256,   256, 18176,
+      256,   256,   256,   256,   256, 18304,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    18176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      256,   256, 18432,   256,   256, 18560,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    18304, 18432,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 18560, 18688, 18816,    -1,    -1,    -1,
-    18944, 19072, 19200,   256,   256, 19328, 19456, 19584,
-       -1,    -1,    -1,    -1, 19712, 19840,    -1,    -1,
+    18688, 18816,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1, 18944, 19072, 19200,    -1,    -1,    -1,
+    19328, 19456, 19584,   256,   256, 19712, 19840, 19968,
+       -1,    -1,    -1,    -1, 20096, 20224,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    19968,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    20352,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256, 20096, 20224,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 20352, 20480,    -1,    -1,
+      256, 20480, 20608,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 20736, 20864,    -1,    -1,
       256,   256,   256,   256,   256,   256,   256,   256,
-      256,   256,   256,   256,   256, 20608,   256,   256,
+      256,   256,   256,   256,   256, 20992,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
-      256,   256,   256,   256,   256,   256, 20736,   256,
-    20864,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256, 21120,   256,
+    21248,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
       256,   256,   256,   256,   256,   256,   256,   256,
-      256,   256,   256,   256,   256, 20992,    -1,    -1,
+      256,   256,   256,   256,   256, 21376,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256, 21504,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 21120,    -1,    -1,    -1,
+      256,   256,   256,   256, 21632,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    21248,    -1, 21376, 21504,    -1,    -1,    -1,    -1,
+    21760,    -1, 21888, 22016,    -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
@@ -200,17 +204,17 @@ u_java_ident =
     0x0000, 0x0000, 0x0000, 0x0000, 0x5000, 0x5555, 0xaaa1, 0xaaaa,
     0x5555, 0x0005, 0x0000, 0x0000, 0x0000, 0x5540, 0xa055, 0xaa8a,
     0x0000, 0x0000, 0x5000, 0x5545, 0x5455, 0xa554, 0xaaaa, 0xaaaa,
-    0x0000, 0x0000, 0x0000, 0xaa54, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x0000, 0x0000, 0x0000, 0xaa54, 0x0000, 0xaa80, 0xaaaa, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x0800, 0xa000,
     0xaaaa, 0xaaaa, 0x55aa, 0x5555, 0x5575, 0x5555, 0x5555, 0x5555,
     0x0055, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x5150,
     0x5555, 0x5555, 0x5554, 0x0000, 0x5a50, 0x5555, 0x0002, 0x0000,
     0x0254, 0x2800, 0x0028, 0x0000, 0x0000, 0x0008, 0x0a88, 0x51a0,
-    0x6955, 0x8569, 0x6aaa, 0x20aa, 0x5a50, 0x5555, 0xaa00, 0xaa2a,
+    0x6955, 0x8569, 0x6aaa, 0x20aa, 0x5a50, 0x5555, 0xaa00, 0xa82a,
     0x0256, 0x2a80, 0x0028, 0x0000, 0x0000, 0x0008, 0x8208, 0x59a0,
     0x6a95, 0xa569, 0xaaa6, 0x8802, 0x5aaa, 0x5555, 0xa405, 0xaaaa,
     0x0256, 0x2000, 0x0020, 0x0000, 0x0000, 0x0008, 0x0208, 0x51a0,
-    0x6555, 0xa565, 0xaaa8, 0xaaaa, 0x5a50, 0x5555, 0xaaa2, 0xaaa2,
+    0x6555, 0xa565, 0xaaa8, 0xaaaa, 0x5a50, 0x5555, 0xaaa2, 0x5552,
     0x0256, 0x2800, 0x0028, 0x0000, 0x0000, 0x0008, 0x0208, 0x51a0,
     0x6955, 0xa569, 0x5aaa, 0x20aa, 0x5a50, 0x5555, 0xaaa2, 0xaaaa,
     0x021a, 0x0a80, 0xa008, 0x0882, 0xa82a, 0x0a80, 0x0000, 0x5aa0,
@@ -219,7 +223,7 @@ u_java_ident =
     0x5955, 0xa559, 0x96aa, 0xaa80, 0x5a50, 0x5555, 0xaaaa, 0xaaaa,
     0x0254, 0x0800, 0x0008, 0x0000, 0x0000, 0x0008, 0x0200, 0x51a0,
     0x5955, 0xa559, 0x96aa, 0x8aaa, 0x5a50, 0x5555, 0xaa82, 0xaaaa,
-    0x0256, 0x0800, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x5280,
+    0x0255, 0x0800, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x5140,
     0x5955, 0x8559, 0x40aa, 0x2aaa, 0x5a50, 0x5555, 0xaaaa, 0x000a,
     0x025a, 0x0000, 0x8000, 0x000a, 0x0000, 0x0000, 0x0020, 0xa200,
     0x8000, 0x6a9a, 0x9955, 0x5555, 0x5aaa, 0x5555, 0xaa5a, 0xaaaa,
@@ -272,16 +276,16 @@ u_java_ident =
     0x0000, 0x0000, 0x0000, 0x0000, 0x5500, 0x5555, 0x5555, 0xaaaa,
     0x5555, 0x02a5, 0x5555, 0x0005, 0x0000, 0x0000, 0x0000, 0xa000,
     0x0000, 0xaaa8, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
-    0xaaaa, 0xaaaa, 0x5595, 0x5555, 0x5555, 0x0401, 0x8150, 0xaaa5,
+    0xaaaa, 0xaaaa, 0x5595, 0x5555, 0x5555, 0x0401, 0x4150, 0xaaa5,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0xa555, 0x556a,
+    0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5555, 0x5565,
     0x0000, 0x0000, 0xa000, 0xa000, 0x0000, 0x0000, 0x0000, 0x0000,
     0xa000, 0xa000, 0x0000, 0x2222, 0x0000, 0x0000, 0x0000, 0xa000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x8800,
     0x080a, 0xa800, 0x0a00, 0xaa00, 0x0000, 0xa800, 0x080a, 0xa800,
     0xaaaa, 0xffea, 0xaaaa, 0xaaaa, 0xaaaa, 0xbffa, 0xaaaa, 0x2aaa,
     0xaaa8, 0xaaaa, 0xa8aa, 0xaaaa, 0xfbff, 0xffff, 0xaaa2, 0x2aaa,
-    0xaaaa, 0xaaaa, 0x0000, 0xa800, 0x0000, 0x0000, 0x0000, 0x8000,
+    0xaaaa, 0xaaaa, 0x0000, 0xa800, 0x0000, 0x0000, 0x0000, 0x0000,
     0xaaaa, 0xaaaa, 0x5555, 0xa955, 0x56a6, 0x5555, 0xaaa9, 0xaaaa,
     0x2a8a, 0x000a, 0xa200, 0xa002, 0x88aa, 0x2008, 0x0000, 0x00a0,
     0x02aa, 0x8aa0, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -301,14 +305,14 @@ u_java_ident =
     0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x8000, 0x0296, 0x0002, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080,
-    0x02aa, 0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x0002, 0x0000,
+    0x02aa, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x0002, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x8000, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x0000, 0xaa80,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0xa000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xaa80, 0xaaaa, 0xaaaa,
     0x0000, 0xa800, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa000,
     0x0000, 0xa800, 0x0000, 0x0000, 0x5555, 0xaa05, 0xaaaa, 0xaaaa,
@@ -367,7 +371,7 @@ u_java_ident =
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xa6aa,
     0x0000, 0x0000, 0x0000, 0xa800, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xaaa8, 0xaaaa, 0xaaa9, 0xaaaa, 0xaaaa, 0xaaaa,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0xaaaa, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0x02aa, 0x0000, 0x0000,
     0x0000, 0xaa80, 0x0000, 0x0000, 0x0000, 0x0000, 0x5000, 0xaa95,
     0x0000, 0x0000, 0x0000, 0xa000, 0x0000, 0x0000, 0x0000, 0x0000,
     0xaa00, 0x0000, 0xa002, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
@@ -425,12 +429,16 @@ u_java_ident =
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x5555, 0xaaa5, 0xaaaa, 0x2aaa,
-    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x5554, 0x0015, 0x0000, 0x0000, 0x0000, 0x0000, 0x5540, 0x9545,
+    0x6aaa, 0xaaaa, 0x5554, 0x0055, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0a00, 0x5550, 0x5555, 0xaaa5, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xaaa8,
     0x0000, 0x0008, 0x0000, 0x0000, 0x0000, 0x4000, 0x9555, 0x5555,
     0xaaa8, 0xaaaa, 0x5555, 0xaaa5, 0xaaaa, 0xaaaa, 0x000a, 0x0000,
     0x0000, 0x0000, 0x555a, 0x5555, 0x5555, 0x5556, 0x9555, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x8000, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x9554, 0x659a,
+    0x4555, 0xaaaa, 0x5555, 0xaaa5, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0xaaa0, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -452,13 +460,15 @@ u_java_ident =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0xa800, 0xaaaa, 0x5554, 0x5555, 0x5555, 0x5555, 0x5555, 0x9555,
     0xaaaa, 0x6aaa, 0x0015, 0x0000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
-    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaa8, 0xaaaa, 0xaaaa, 0xaaaa,
+    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaa0, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa800, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xaa80, 0xaaaa,
-    0xaaa0, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
-    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x0000, 0x0000, 0x0000, 0x8000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xaa00,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xaa80, 0x0000, 0xa800,
     0x0000, 0xaaa8, 0x0000, 0x96a0, 0xaaff, 0xaaaa, 0xaaaa, 0xaaaa,
@@ -501,8 +511,10 @@ u_java_ident =
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0xa000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0xaaa0, 0xaaaa, 0xaaaa, 0xaaaa,
-    0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
+    0x0000, 0x0000, 0x0000, 0x0000, 0xaaa0, 0xaaaa, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0xaaa8, 0xaaaa, 0xaaaa, 0xaaaa,
     0x0000, 0x0000, 0x0000, 0xa000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
     0xaaae, 0xaaaa, 0xaaaa, 0xaaaa, 0xffff, 0xffff, 0xffff, 0xffff,
diff --git a/lib/unictype/sy_java_whitespace.h b/lib/unictype/sy_java_whitespace.h
index 62fe768a4f..1f64ffcfb2 100644
--- a/lib/unictype/sy_java_whitespace.h
+++ b/lib/unictype/sy_java_whitespace.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Language syntax properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/unigbrk/gbrkprop.h b/lib/unigbrk/gbrkprop.h
index 0feb7822e5..1c937ed3b0 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 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.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[119 << 7];
+    unsigned char level3[124 << 7];
   }
 unigbrkprop =
 {
@@ -114,8 +114,9 @@ unigbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
     10112, 10240, 10368, 10496, 10624, 10752, 10880,    -1,
     11008, 11136,    -1, 11264, 11392, 11520, 11648,    -1,
+       -1,    -1,    -1,    -1, 11776, 11904,    -1,    -1,
+    12032, 12160, 12288,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    11776, 11904,    -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,
@@ -133,9 +134,9 @@ 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, 12416, 12544,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 12672, 12800,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1, 12032, 12160,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1, 12288, 12416,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -154,25 +155,24 @@ 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, 12928,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 12544,    -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, 13056, 13184, 13312,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 12672, 12800, 12928,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 13440, 13568,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 13056, 13184,    -1,    -1,
+    13696,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    13312,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 13824, 13952,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 13440, 13568,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1, 14080,    -1,    -1, 14208, 14336,
+    14464, 14592, 14720, 14848, 14976, 15104,    -1,    -1,
+       -1,    -1, 15232, 15360,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1, 13696,    -1,    -1,    -1, 13824,
-    13952, 14080, 14208, 14336, 14464, 14592,    -1,    -1,
-       -1,    -1, 14720,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    14848,  8832, 14976, 15104,  8832,  8832,  8832,  8832,
+    15488,  8832, 15616, 15744,  8832,  8832,  8832,  8832,
      8832,  8832,  8832,  8832,  8832,  8832,  8832,  8832,
      8832,  8832,  8832,  8832,  8832,  8832,  8832,  8832,
      8832,  8832,  8832,  8832,  8832,  8832,  8832,  8832,
@@ -716,8 +716,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_OTHER, GBP_OTHER, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_OTHER, GBP_EXTEND, GBP_SPACINGMARK, GBP_SPACINGMARK,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -846,8 +846,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_EXTEND, GBP_SPACINGMARK, GBP_SPACINGMARK,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_SPACINGMARK, 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,
@@ -861,7 +860,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_EXTEND, GBP_SPACINGMARK,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_EXTEND,
+    GBP_EXTEND, GBP_OTHER, GBP_EXTEND, GBP_SPACINGMARK,
     GBP_SPACINGMARK, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
     GBP_EXTEND, GBP_OTHER, GBP_SPACINGMARK, GBP_SPACINGMARK,
     GBP_SPACINGMARK, GBP_OTHER, GBP_SPACINGMARK, GBP_SPACINGMARK,
@@ -1547,7 +1547,7 @@ unigbrkprop =
     GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_SPACINGMARK, GBP_SPACINGMARK,
-    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_EXTEND, GBP_OTHER, GBP_OTHER, GBP_SPACINGMARK,
     GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1579,8 +1579,8 @@ 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_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, 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_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -1662,6 +1662,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_GAZ, GBP_OTHER, GBP_GAZ, 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,
@@ -1682,8 +1683,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_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_GAZ, GBP_GAZ, 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,
@@ -1712,7 +1712,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_EB, GBP_EB,
+    GBP_GAZ, GBP_OTHER, GBP_EB, GBP_EB,
     GBP_EB, GBP_EB, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3182,6 +3182,70 @@ 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_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_SPACINGMARK,
+    GBP_SPACINGMARK, 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_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_SPACINGMARK, GBP_PREPEND, 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_EXTEND,
+    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_SPACINGMARK,
+    GBP_SPACINGMARK, 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_PREPEND, GBP_PREPEND,
+    GBP_PREPEND, GBP_PREPEND, 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_SPACINGMARK,
+    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,
@@ -3258,6 +3322,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_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_EXTEND, GBP_OTHER,
+    GBP_EXTEND, GBP_EXTEND, GBP_OTHER, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_EXTEND, GBP_EXTEND,
+    GBP_EXTEND, GBP_EXTEND, GBP_PREPEND, 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,
@@ -3695,7 +3791,8 @@ unigbrkprop =
     GBP_RI, GBP_RI, GBP_RI, GBP_RI,
     GBP_RI, GBP_RI, GBP_RI, GBP_RI,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_EB, GBP_OTHER, GBP_OTHER,
+    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_GAZ, 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,
@@ -3708,11 +3805,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_GAZ, 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_EB,
-    GBP_EB, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_EB, GBP_EB,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3723,6 +3818,39 @@ 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_GAZ,
+    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_EB, 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_GAZ,
+    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_GAZ, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_GAZ, 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_EB, GBP_EB,
+    GBP_EB, GBP_OTHER, GBP_OTHER, GBP_EB,
+    GBP_OTHER, GBP_OTHER, GBP_EB, GBP_EB,
+    GBP_EB, 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_GAZ,
+    GBP_OTHER, GBP_GAZ, 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_EM,
     GBP_EM, GBP_EM, GBP_EM, GBP_EM,
@@ -3772,6 +3900,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_GAZ,
+    GBP_GAZ, 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,
@@ -3797,7 +3927,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_GAZ,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
+    GBP_GAZ, 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,
@@ -3815,11 +3947,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_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_OTHER, GBP_EB, GBP_OTHER, GBP_OTHER,
+    GBP_EB, GBP_EB, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_EB, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
@@ -3886,11 +4014,11 @@ 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_GAZ, 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_GAZ, 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,
@@ -3905,7 +4033,7 @@ unigbrkprop =
     GBP_EB, 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_EB, 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,
@@ -3925,15 +4053,22 @@ unigbrkprop =
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_EB, GBP_EB, GBP_EB, GBP_EB,
-    GBP_EB, GBP_EB, GBP_EB, GBP_OTHER,
+    GBP_EB, GBP_OTHER, GBP_EB, GBP_EB,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_EB, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
     GBP_OTHER, GBP_OTHER, GBP_OTHER, GBP_OTHER,
-    GBP_EB, GBP_OTHER, GBP_OTHER, GBP_EB,
+    GBP_EB, GBP_EB, GBP_EB, GBP_EB,
     GBP_EB, GBP_EB, GBP_EB, GBP_EB,
     GBP_EB, GBP_EB, GBP_OTHER, GBP_OTHER,
-    GBP_EB, GBP_EB, GBP_EB, GBP_OTHER,
+    GBP_OTHER, GBP_EB, GBP_EB, 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,
@@ -3950,6 +4085,31 @@ 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_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_EB, GBP_EB, GBP_EB,
+    GBP_EB, GBP_EB, GBP_EB, GBP_EB,
+    GBP_EB, GBP_EB, GBP_EB, GBP_EB,
+    GBP_EB, GBP_EB, 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_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
     GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
     GBP_CONTROL, GBP_CONTROL, GBP_CONTROL, GBP_CONTROL,
diff --git a/lib/unilbrk/lbrkprop1.h b/lib/unilbrk/lbrkprop1.h
index b800fa62cc..fa84834fe7 100644
--- a/lib/unilbrk/lbrkprop1.h
+++ b/lib/unilbrk/lbrkprop1.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
 
@@ -34,8 +34,8 @@
 typedef struct
   {
     int level1[15];
-    int level2[4 << 9];
-    unsigned char level3[210 << 7];
+    int level2[5 << 9];
+    unsigned char level3[217 << 7];
   }
 lbrkprop_t;
 extern const lbrkprop_t unilbrkprop;
diff --git a/lib/unilbrk/lbrkprop2.h b/lib/unilbrk/lbrkprop2.h
index 8798025bae..7034229846 100644
--- a/lib/unilbrk/lbrkprop2.h
+++ b/lib/unilbrk/lbrkprop2.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Line breaking properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
 
@@ -28,8 +28,8 @@
 const lbrkprop_t unilbrkprop =
 {
   {
-        0,   512,  1024,  1024,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,  1536
+        0,   512,  1024,  1536,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  2048
   },
   {
         0,   128,   256,   256,   256,   384,   512,   640,
@@ -102,18 +102,18 @@ const lbrkprop_t unilbrkprop =
     17280, 17408,    -1,    -1, 17536,    -1,    -1,    -1,
     17664, 17792, 17920, 18048, 18176, 18304, 18432,    -1,
     18560, 18688,    -1, 18816, 18944, 19072, 19200,    -1,
-       -1, 19328,    -1,    -1,    -1, 19456,    -1,    -1,
-    19584, 19712,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256,   256,   256,   256, 19840,
-    19968,   256, 20096,    -1,    -1,    -1,    -1,    -1,
+       -1, 19328,    -1,    -1, 19456, 19584,    -1,    -1,
+    19712, 19840, 19968,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256,   256,   256,   256, 20096,
+    20224,   256, 20352,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 20224, 20352, 20480,   256,
-    20608,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256, 20480, 20608, 20736,   256,
+    20864,    -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,
-      256,   256,   256, 20736, 20864,    -1,    -1,    -1,
+      256,   256,   256, 20992, 21120,    -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,
@@ -122,15 +122,15 @@ const lbrkprop_t unilbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 20992, 21120, 21248, 21376,
-       -1,    -1,    -1,    -1,    -1,    -1, 21504, 21632,
+      256,   256,   256,   256, 21248, 21376, 21504, 21632,
+       -1,    -1,    -1,    -1,    -1,    -1, 21760, 21888,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
-    10112, 10112, 10112, 10112, 10112, 10112, 10112, 21760,
-    10112, 10112, 10112, 10112, 10112, 21888,    -1,    -1,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 22016,
+    10112, 10112, 10112, 10112, 10112, 22144,    -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,
@@ -140,26 +140,26 @@ const lbrkprop_t unilbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    22016,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    22272,   256, 22400,   256,   256, 22528,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    22144, 22272,    -1,    -1,    -1,    -1,    -1,    -1,
+    22656, 22784,    -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,
-      256, 22400, 22528, 22656, 22784,    -1, 22912,    -1,
-    23040, 23168, 23296,   256,   256, 23424,   256, 23552,
-      256,   256,   256,   256, 23680, 23808,    -1,    -1,
+      256, 22912, 23040, 23168, 23296,    -1, 23424,    -1,
+    23552, 23680, 23808,   256,   256, 23936,   256, 24064,
+      256,   256,   256,   256, 24192, 24320,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    23936,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    24448,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256, 24064, 24192,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 24320, 24448,    -1,    -1,
-    10112, 10112, 24576, 24704, 10112, 10112, 10112, 24832,
-    24960, 25088, 25216, 25344, 25472, 25600, 25728, 25856,
-    25984, 26112, 26240, 10112, 10112, 10112, 10112, 10112,
-    10112, 10112, 10112, 10112, 10112, 10112, 10112, 26368,
+      256, 24576, 24704,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 24832, 24960,    -1,    -1,
+    10112, 10112, 25088, 25216, 25344, 10112, 10112, 25472,
+    25600, 25728, 25856, 25984, 26112, 26240, 26368, 26496,
+    26624, 26752, 26880, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 27008,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
@@ -211,10 +211,19 @@ const lbrkprop_t unilbrkprop =
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 27136,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256,   256,
+      256,   256,   256,   256,   256,   256,   256, 27264,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 27008,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
@@ -223,8 +232,63 @@ const lbrkprop_t unilbrkprop =
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
     10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
-    10112, 10112, 10112, 10112, 10112, 10112, 10112, 26368,
-    26496,    -1, 26624, 26752,    -1,    -1,    -1,    -1,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 10112,
+    10112, 10112, 10112, 10112, 10112, 10112, 10112, 27008,
+    27392,    -1, 27520, 27648,    -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,
@@ -510,8 +574,8 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_AL, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -561,7 +625,7 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_AL, LBP_AL, LBP_PO, LBP_PO, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_PO, LBP_AL, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_PO, LBP_AL, LBP_PR, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -593,7 +657,7 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_NU, LBP_NU,
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_AL, LBP_PR, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL,
     LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -658,14 +722,14 @@ const lbrkprop_t unilbrkprop =
     LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
     LBP_XX, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
     LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_CM, LBP_CM,
+    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_CM, LBP_CM,
     LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
@@ -1104,7 +1168,7 @@ const lbrkprop_t unilbrkprop =
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_XX,
+    LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_CM,
     LBP_CM, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1120,8 +1184,8 @@ const lbrkprop_t unilbrkprop =
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
-    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX,
@@ -1281,7 +1345,7 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1452,7 +1516,7 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
-    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -1530,8 +1594,8 @@ const lbrkprop_t unilbrkprop =
     LBP_OP, LBP_CL, LBP_BA, LBP_BA, LBP_BA, LBP_BA, LBP_EX, LBP_AL,
     LBP_BA, LBP_BA, LBP_AL, LBP_BA, LBP_BA, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_B2, LBP_B2, LBP_BA, LBP_BA, LBP_BA, LBP_AL,
-    LBP_BA, LBP_BA, LBP_OP, LBP_BA, LBP_BA, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_BA, LBP_BA, LBP_OP, LBP_BA, LBP_BA, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -1623,7 +1687,7 @@ const lbrkprop_t unilbrkprop =
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX,
     LBP_XX, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -2247,7 +2311,7 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -2722,11 +2786,27 @@ const lbrkprop_t unilbrkprop =
     LBP_NU, LBP_NU, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_AL,
+    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_CM,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM,
+    LBP_CM, LBP_CM, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -2770,6 +2850,22 @@ const lbrkprop_t unilbrkprop =
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
+    LBP_AL, LBP_AL, LBP_XX, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_XX,
+    LBP_XX, LBP_XX, LBP_CM, LBP_XX, LBP_CM, LBP_CM, LBP_XX, LBP_CM,
+    LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_CM, LBP_AL, LBP_CM,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU, LBP_NU,
+    LBP_NU, LBP_NU, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -3006,7 +3102,7 @@ const lbrkprop_t unilbrkprop =
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_NS, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_NS, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -3042,12 +3138,26 @@ const lbrkprop_t unilbrkprop =
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_ID, LBP_ID, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
-    LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
@@ -3071,6 +3181,24 @@ const lbrkprop_t unilbrkprop =
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_XX, LBP_XX, LBP_XX,
@@ -3394,6 +3522,22 @@ const lbrkprop_t unilbrkprop =
     LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI,
     LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI,
     LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI, LBP_RI,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_EB, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
@@ -3504,8 +3648,8 @@ const lbrkprop_t unilbrkprop =
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
-    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_AL,
+    LBP_AL, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
     LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
@@ -3602,6 +3746,38 @@ const lbrkprop_t unilbrkprop =
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_XX, LBP_XX,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL, LBP_AL,
+    LBP_AL, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
+    LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID, LBP_ID,
     LBP_XX, LBP_CM, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
     LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX, LBP_XX,
diff --git a/lib/uninorm/composition-table.gperf b/lib/uninorm/composition-table.gperf
index 1069c162aa..b2368c2982 100644
--- a/lib/uninorm/composition-table.gperf
+++ b/lib/uninorm/composition-table.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Canonical composition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2009 Free Software Foundation, Inc.
 
diff --git a/lib/uninorm/decomposition-table1.h b/lib/uninorm/decomposition-table1.h
index cd4905db46..8a9deafede 100644
--- a/lib/uninorm/decomposition-table1.h
+++ b/lib/uninorm/decomposition-table1.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decomposition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/uninorm/decomposition-table2.h b/lib/uninorm/decomposition-table2.h
index fa3b15ec6a..616a84afa9 100644
--- a/lib/uninorm/decomposition-table2.h
+++ b/lib/uninorm/decomposition-table2.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decomposition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
diff --git a/lib/uniwbrk/wbrkprop.h b/lib/uniwbrk/wbrkprop.h
index 0390213a78..de875b59ed 100644
--- a/lib/uniwbrk/wbrkprop.h
+++ b/lib/uniwbrk/wbrkprop.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Word breaking properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2002, 2004, 2007-2009 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ typedef struct
   {
     int level1[15];
     int level2[3 << 9];
-    unsigned char level3[174 << 7];
+    unsigned char level3[176 << 7];
   }
 wbrkprop_t;
 static const wbrkprop_t uniwbrkprop =
@@ -115,18 +115,18 @@ static const wbrkprop_t uniwbrkprop =
     14336, 14464,    -1,    -1,    -1,    -1,    -1,    -1,
     14592, 14720, 14848, 14976, 15104, 15232, 15360,    -1,
     15488, 15616,    -1, 15744, 15872, 16000, 16128,    -1,
-       -1, 16256,    -1,    -1,    -1, 16384,    -1,    -1,
-    16512, 16640,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256,   256,   256,   256, 16768,
-    16896,   256, 17024,    -1,    -1,    -1,    -1,    -1,
+       -1, 16256,    -1,    -1, 16384, 16512,    -1,    -1,
+    16640, 16768, 16896,    -1,    -1,    -1,    -1,    -1,
+      256,   256,   256,   256,   256,   256,   256, 17024,
+    17152,   256, 17280,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       256,   256,   256,   256,   256,   256,   256,   256,
-    17152,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    17408,    -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,
-      256,   256,   256,   256, 17280,    -1,    -1,    -1,
+      256,   256,   256,   256, 17536,    -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,
@@ -135,8 +135,8 @@ static const wbrkprop_t uniwbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256,   256,   256,   256, 17408, 17536, 17664, 17792,
-       -1,    -1,    -1,    -1,    -1,    -1, 17920, 18048,
+      256,   256,   256,   256, 17664, 17792, 17920, 18048,
+       -1,    -1,    -1,    -1,    -1,    -1, 18176, 18304,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -153,27 +153,27 @@ static const wbrkprop_t uniwbrkprop =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    18176,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    18432,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    18304, 18432,    -1,    -1,    -1,    -1,    -1,    -1,
+    18560, 18688,    -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, 18560, 18688, 18816,    -1,    -1,    -1,
-    18944, 19072, 19200,   256,   256, 19328, 19456, 19584,
-       -1,    -1,    -1,    -1, 19712, 19840,    -1,    -1,
+       -1,    -1, 18816, 18944, 19072,    -1,    -1,    -1,
+    19200, 19328, 19456,   256,   256, 19584, 19712, 19840,
+       -1,    -1,    -1,    -1, 19968, 20096,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    19968,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    20224,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      256, 20096, 20224,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1, 20352, 20480,    -1,    -1,
-       -1,    -1, 20608, 20736,    -1,    -1,    -1, 20864,
-    20992, 21120, 21248, 21376, 21504, 21632,    -1,    -1,
-       -1,    -1, 21760,    -1,    -1,    -1,    -1,    -1,
+      256, 20352, 20480,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1, 20608, 20736,    -1,    -1,
+       -1,    -1, 20864, 20992,    -1,    -1,    -1, 21120,
+    21248, 21376, 21504, 21632, 21760, 21888,    -1,    -1,
+       -1,    -1, 22016,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    21888,    -1, 22016, 22144,    -1,    -1,    -1,    -1,
+    22144,    -1, 22272, 22400,    -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,
@@ -679,9 +679,9 @@ static const wbrkprop_t uniwbrkprop =
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
@@ -782,7 +782,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_ALETTER, WBP_ALETTER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_OTHER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
@@ -845,8 +845,8 @@ static const wbrkprop_t uniwbrkprop =
     WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_ALETTER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_ALETTER, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_OTHER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_OTHER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -975,7 +975,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_OTHER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_OTHER, WBP_ALETTER, WBP_ALETTER,
@@ -989,8 +989,8 @@ static const wbrkprop_t uniwbrkprop =
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
-    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
-    WBP_OTHER, WBP_ALETTER, WBP_EXTEND, WBP_EXTEND,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_EXTEND,
+    WBP_EXTEND, WBP_ALETTER, WBP_EXTEND, WBP_EXTEND,
     WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_EXTEND, WBP_OTHER, WBP_EXTEND, WBP_EXTEND,
     WBP_EXTEND, WBP_OTHER, WBP_EXTEND, WBP_EXTEND,
@@ -1836,7 +1836,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_EXTEND, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_EXTEND, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_EXTEND, WBP_EXTEND,
-    WBP_EXTEND, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
+    WBP_EXTEND, WBP_ALETTER, WBP_ALETTER, WBP_EXTEND,
     WBP_EXTEND, WBP_EXTEND, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -1868,8 +1868,8 @@ static const wbrkprop_t uniwbrkprop =
     WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
-    WBP_EXTEND, WBP_EXTEND, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_OTHER, WBP_EXTEND,
     WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -2426,7 +2426,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
-    WBP_ALETTER, WBP_ALETTER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
     WBP_OTHER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -3418,7 +3418,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -4335,13 +4335,45 @@ static const wbrkprop_t uniwbrkprop =
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_ALETTER,
+    WBP_ALETTER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_ALETTER, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_EXTEND,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_OTHER, WBP_OTHER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
@@ -4432,6 +4464,38 @@ static const wbrkprop_t uniwbrkprop =
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_OTHER,
+    WBP_ALETTER, WBP_ALETTER, WBP_OTHER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
+    WBP_ALETTER, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_EXTEND, WBP_OTHER,
+    WBP_EXTEND, WBP_EXTEND, WBP_OTHER, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_EXTEND, WBP_EXTEND,
+    WBP_EXTEND, WBP_EXTEND, WBP_ALETTER, WBP_EXTEND,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC,
+    WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC, WBP_NUMERIC,
+    WBP_NUMERIC, WBP_NUMERIC, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
     WBP_ALETTER, WBP_ALETTER, WBP_ALETTER, WBP_ALETTER,
@@ -4775,7 +4839,7 @@ static const wbrkprop_t uniwbrkprop =
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
-    WBP_ALETTER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
+    WBP_ALETTER, WBP_ALETTER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
     WBP_OTHER, WBP_OTHER, WBP_OTHER, WBP_OTHER,
diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c
index 9ba07d3314..cc3dd6eb88 100644
--- a/lib/uniwidth/width.c
+++ b/lib/uniwidth/width.c
@@ -32,7 +32,7 @@
  * - Zero width characters; generated from
  *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
  */
-static const unsigned char nonspacing_table_data[38*64] = {
+static const unsigned char nonspacing_table_data[39*64] = {
   /* 0x0000-0x01ff */
   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -82,7 +82,7 @@ static const unsigned char nonspacing_table_data[38*64] = {
   0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */
   0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */
   0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */
-  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */
+  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0xfc, /* 0x0ac0-0x0aff */
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */
   0x1e, 0x20, 0x40, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */
   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */
@@ -92,7 +92,7 @@ static const unsigned char nonspacing_table_data[38*64] = {
   0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */
   0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, /* 0x0d00-0x0d3f */
   0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */
   0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */
@@ -158,7 +158,7 @@ static const unsigned char nonspacing_table_data[38*64] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf8, /* 0x1dc0-0x1dff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, /* 0x1dc0-0x1dff */
   /* 0x2000-0x21ff */
   0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
   0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0x00, 0x00, /* 0x2040-0x207f */
@@ -294,13 +294,22 @@ static const unsigned char nonspacing_table_data[38*64] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */
+  /* 0x11a00-0x11bff */
+  0x7e, 0x06, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x79, /* 0x11a00-0x11a3f */
+  0x80, 0x00, 0x7e, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x11a40-0x11a7f */
+  0x00, 0xfc, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, /* 0x11a80-0x11abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11ac0-0x11aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b00-0x11b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b40-0x11b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b80-0x11bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11bc0-0x11bff */
   /* 0x11c00-0x11dff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x3f, /* 0x11c00-0x11c3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c40-0x11c7f */
   0x00, 0x00, 0xfc, 0xff, 0xff, 0xfc, 0x6d, 0x00, /* 0x11c80-0x11cbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11cc0-0x11cff */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d00-0x11d3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d40-0x11d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xb4, /* 0x11d00-0x11d3f */
+  0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d40-0x11d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d80-0x11dbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11dc0-0x11dff */
   /* 0x16a00-0x16bff */
@@ -394,20 +403,20 @@ static const signed char nonspacing_table_ind[248] = {
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
   -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
   22, 23, -1, -1, -1, 24, -1, -1, /* 0x10000-0x10fff */
-  25, 26, 27, 28, -1, -1, 29, -1, /* 0x11000-0x11fff */
+  25, 26, 27, 28, -1, 29, 30, -1, /* 0x11000-0x11fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
-  -1, -1, -1, -1, -1, 30, -1, 31, /* 0x16000-0x16fff */
+  -1, -1, -1, -1, -1, 31, -1, 32, /* 0x16000-0x16fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
-  -1, -1, -1, -1, -1, -1, 32, -1, /* 0x1b000-0x1bfff */
+  -1, -1, -1, -1, -1, -1, 33, -1, /* 0x1b000-0x1bfff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
-  33, 34, -1, -1, -1, 35, -1, -1, /* 0x1d000-0x1dfff */
-  36, -1, -1, -1, 37, -1, -1, -1  /* 0x1e000-0x1efff */
+  34, 35, -1, -1, -1, 36, -1, -1, /* 0x1d000-0x1dfff */
+  37, -1, -1, -1, 38, -1, -1, -1  /* 0x1e000-0x1efff */
 };
 
 /* Determine number of column positions required for UC.  */
diff --git a/modules/unicase/empty-prefix-context b/modules/unicase/empty-prefix-context
index 6e69a4c977..12406b8832 100644
--- a/modules/unicase/empty-prefix-context
+++ b/modules/unicase/empty-prefix-context
@@ -8,7 +8,7 @@ Depends-on:
 unicase/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-prefix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/empty-prefix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_EMPTY_PREFIX_CONTEXT
diff --git a/modules/unicase/empty-suffix-context b/modules/unicase/empty-suffix-context
index 0534752f8d..0226e12526 100644
--- a/modules/unicase/empty-suffix-context
+++ b/modules/unicase/empty-suffix-context
@@ -8,7 +8,7 @@ Depends-on:
 unicase/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-suffix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/empty-suffix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_EMPTY_SUFFIX_CONTEXT
diff --git a/modules/unicase/tolower b/modules/unicase/tolower
index e7075b18df..732e8e7f31 100644
--- a/modules/unicase/tolower
+++ b/modules/unicase/tolower
@@ -10,7 +10,7 @@ Depends-on:
 unicase/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_TOLOWER
diff --git a/modules/unicase/totitle b/modules/unicase/totitle
index 27a1d5c6a7..7dee1958c4 100644
--- a/modules/unicase/totitle
+++ b/modules/unicase/totitle
@@ -10,7 +10,7 @@ Depends-on:
 unicase/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_TOTITLE
diff --git a/modules/unicase/toupper b/modules/unicase/toupper
index 9321ad8d27..d1fb7bd8b1 100644
--- a/modules/unicase/toupper
+++ b/modules/unicase/toupper
@@ -10,7 +10,7 @@ Depends-on:
 unicase/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_TOUPPER
diff --git a/modules/unicase/u16-casecmp b/modules/unicase/u16-casecmp
index 9aec2c828f..f01831b685 100644
--- a/modules/unicase/u16-casecmp
+++ b/modules/unicase/u16-casecmp
@@ -13,7 +13,7 @@ unistr/u16-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-casecmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CASECMP
diff --git a/modules/unicase/u16-casecoll b/modules/unicase/u16-casecoll
index b770f40f71..7434374ef5 100644
--- a/modules/unicase/u16-casecoll
+++ b/modules/unicase/u16-casecoll
@@ -12,7 +12,7 @@ unicase/u16-casexfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-casecoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CASECOLL
diff --git a/modules/unicase/u16-casefold b/modules/unicase/u16-casefold
index d6de54d833..c8faba8c84 100644
--- a/modules/unicase/u16-casefold
+++ b/modules/unicase/u16-casefold
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CASEFOLD
diff --git a/modules/unicase/u16-casexfrm b/modules/unicase/u16-casexfrm
index 05524acaae..21f43ca684 100644
--- a/modules/unicase/u16-casexfrm
+++ b/modules/unicase/u16-casexfrm
@@ -14,7 +14,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-casexfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casexfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CASEXFRM
diff --git a/modules/unicase/u16-ct-casefold b/modules/unicase/u16-ct-casefold
index da5a37c90b..9cd694af98 100644
--- a/modules/unicase/u16-ct-casefold
+++ b/modules/unicase/u16-ct-casefold
@@ -15,7 +15,7 @@ uninorm/u16-normalize
 uninorm/nfd
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-ct-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CT_CASEFOLD
diff --git a/modules/unicase/u16-ct-tolower b/modules/unicase/u16-ct-tolower
index 782ab3a861..5284588046 100644
--- a/modules/unicase/u16-ct-tolower
+++ b/modules/unicase/u16-ct-tolower
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-ct-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOLOWER
diff --git a/modules/unicase/u16-ct-totitle b/modules/unicase/u16-ct-totitle
index b0e54a993b..26bb338e0a 100644
--- a/modules/unicase/u16-ct-totitle
+++ b/modules/unicase/u16-ct-totitle
@@ -23,7 +23,7 @@ uninorm/u16-normalize
 stdbool
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-ct-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOTITLE
diff --git a/modules/unicase/u16-ct-toupper b/modules/unicase/u16-ct-toupper
index 3d7103b6b8..3678c47d4d 100644
--- a/modules/unicase/u16-ct-toupper
+++ b/modules/unicase/u16-ct-toupper
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-ct-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_CT_TOUPPER
diff --git a/modules/unicase/u16-is-cased b/modules/unicase/u16-is-cased
index 0b63394c7b..0a05090008 100644
--- a/modules/unicase/u16-is-cased
+++ b/modules/unicase/u16-is-cased
@@ -15,7 +15,7 @@ uninorm/nfd
 unistr/u16-cmp
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-is-cased])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-cased])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASED
diff --git a/modules/unicase/u16-is-casefolded b/modules/unicase/u16-is-casefolded
index cb3969a76e..9fa5593470 100644
--- a/modules/unicase/u16-is-casefolded
+++ b/modules/unicase/u16-is-casefolded
@@ -10,7 +10,7 @@ unicase/u16-is-invariant
 unicase/u16-casefold
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-is-casefolded])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-casefolded])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_IS_CASEFOLDED
diff --git a/modules/unicase/u16-is-lowercase b/modules/unicase/u16-is-lowercase
index a8a3a8d7a9..47170f4739 100644
--- a/modules/unicase/u16-is-lowercase
+++ b/modules/unicase/u16-is-lowercase
@@ -10,7 +10,7 @@ unicase/u16-is-invariant
 unicase/u16-tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-is-lowercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-lowercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_IS_LOWERCASE
diff --git a/modules/unicase/u16-is-titlecase b/modules/unicase/u16-is-titlecase
index 18fc57cabd..01a478601c 100644
--- a/modules/unicase/u16-is-titlecase
+++ b/modules/unicase/u16-is-titlecase
@@ -10,7 +10,7 @@ unicase/u16-is-invariant
 unicase/u16-totitle
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-is-titlecase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-titlecase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_IS_TITLECASE
diff --git a/modules/unicase/u16-is-uppercase b/modules/unicase/u16-is-uppercase
index 87304c78c8..ded36a0d70 100644
--- a/modules/unicase/u16-is-uppercase
+++ b/modules/unicase/u16-is-uppercase
@@ -10,7 +10,7 @@ unicase/u16-is-invariant
 unicase/u16-toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-is-uppercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-uppercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_IS_UPPERCASE
diff --git a/modules/unicase/u16-prefix-context b/modules/unicase/u16-prefix-context
index 70c95585db..82e6b52ab1 100644
--- a/modules/unicase/u16-prefix-context
+++ b/modules/unicase/u16-prefix-context
@@ -15,7 +15,7 @@ unistr/u16-mbtouc-unsafe
 unistr/u16-prev
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u16-prefix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-prefix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_PREFIX_CONTEXT
diff --git a/modules/unicase/u16-suffix-context b/modules/unicase/u16-suffix-context
index b8876a15fc..ca8bf46ed0 100644
--- a/modules/unicase/u16-suffix-context
+++ b/modules/unicase/u16-suffix-context
@@ -14,7 +14,7 @@ unictype/combining-class
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u16-suffix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-suffix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_SUFFIX_CONTEXT
diff --git a/modules/unicase/u16-tolower b/modules/unicase/u16-tolower
index 462f45f4a6..b69b158a76 100644
--- a/modules/unicase/u16-tolower
+++ b/modules/unicase/u16-tolower
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_TOLOWER
diff --git a/modules/unicase/u16-totitle b/modules/unicase/u16-totitle
index 1b7f010dba..77e526b4c4 100644
--- a/modules/unicase/u16-totitle
+++ b/modules/unicase/u16-totitle
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_TOTITLE
diff --git a/modules/unicase/u16-toupper b/modules/unicase/u16-toupper
index 8f730d6305..3490139670 100644
--- a/modules/unicase/u16-toupper
+++ b/modules/unicase/u16-toupper
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u16-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U16_TOUPPER
diff --git a/modules/unicase/u32-casecmp b/modules/unicase/u32-casecmp
index b31759aa7f..8bff45171a 100644
--- a/modules/unicase/u32-casecmp
+++ b/modules/unicase/u32-casecmp
@@ -13,7 +13,7 @@ unistr/u32-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-casecmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CASECMP
diff --git a/modules/unicase/u32-casecoll b/modules/unicase/u32-casecoll
index 32d44497e5..d8b357fe50 100644
--- a/modules/unicase/u32-casecoll
+++ b/modules/unicase/u32-casecoll
@@ -12,7 +12,7 @@ unicase/u32-casexfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-casecoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CASECOLL
diff --git a/modules/unicase/u32-casefold b/modules/unicase/u32-casefold
index 739ff9bf00..15264e3ab9 100644
--- a/modules/unicase/u32-casefold
+++ b/modules/unicase/u32-casefold
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CASEFOLD
diff --git a/modules/unicase/u32-casexfrm b/modules/unicase/u32-casexfrm
index e5c7c97918..59d03a4e2f 100644
--- a/modules/unicase/u32-casexfrm
+++ b/modules/unicase/u32-casexfrm
@@ -14,7 +14,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-casexfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casexfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CASEXFRM
diff --git a/modules/unicase/u32-ct-casefold b/modules/unicase/u32-ct-casefold
index 8e425e332f..96e4322643 100644
--- a/modules/unicase/u32-ct-casefold
+++ b/modules/unicase/u32-ct-casefold
@@ -15,7 +15,7 @@ uninorm/u32-normalize
 uninorm/nfd
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-ct-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CT_CASEFOLD
diff --git a/modules/unicase/u32-ct-tolower b/modules/unicase/u32-ct-tolower
index de5fa896b8..05f4bb1682 100644
--- a/modules/unicase/u32-ct-tolower
+++ b/modules/unicase/u32-ct-tolower
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-ct-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOLOWER
diff --git a/modules/unicase/u32-ct-totitle b/modules/unicase/u32-ct-totitle
index 7f7fb64bff..e87edf8987 100644
--- a/modules/unicase/u32-ct-totitle
+++ b/modules/unicase/u32-ct-totitle
@@ -23,7 +23,7 @@ uninorm/u32-normalize
 stdbool
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-ct-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOTITLE
diff --git a/modules/unicase/u32-ct-toupper b/modules/unicase/u32-ct-toupper
index 5aa3f04aa6..dc92236616 100644
--- a/modules/unicase/u32-ct-toupper
+++ b/modules/unicase/u32-ct-toupper
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-ct-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_CT_TOUPPER
diff --git a/modules/unicase/u32-is-cased b/modules/unicase/u32-is-cased
index 7d76367b4c..01d105068e 100644
--- a/modules/unicase/u32-is-cased
+++ b/modules/unicase/u32-is-cased
@@ -15,7 +15,7 @@ uninorm/nfd
 unistr/u32-cmp
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-is-cased])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-cased])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASED
diff --git a/modules/unicase/u32-is-casefolded b/modules/unicase/u32-is-casefolded
index 3aef9675ea..47a4b9947d 100644
--- a/modules/unicase/u32-is-casefolded
+++ b/modules/unicase/u32-is-casefolded
@@ -10,7 +10,7 @@ unicase/u32-is-invariant
 unicase/u32-casefold
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-is-casefolded])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-casefolded])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_IS_CASEFOLDED
diff --git a/modules/unicase/u32-is-lowercase b/modules/unicase/u32-is-lowercase
index aff3b4b22d..d3720e01a5 100644
--- a/modules/unicase/u32-is-lowercase
+++ b/modules/unicase/u32-is-lowercase
@@ -10,7 +10,7 @@ unicase/u32-is-invariant
 unicase/u32-tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-is-lowercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-lowercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_IS_LOWERCASE
diff --git a/modules/unicase/u32-is-titlecase b/modules/unicase/u32-is-titlecase
index ea29be66c5..d38968713b 100644
--- a/modules/unicase/u32-is-titlecase
+++ b/modules/unicase/u32-is-titlecase
@@ -10,7 +10,7 @@ unicase/u32-is-invariant
 unicase/u32-totitle
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-is-titlecase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-titlecase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_IS_TITLECASE
diff --git a/modules/unicase/u32-is-uppercase b/modules/unicase/u32-is-uppercase
index dfdf98192e..dfd96ab268 100644
--- a/modules/unicase/u32-is-uppercase
+++ b/modules/unicase/u32-is-uppercase
@@ -10,7 +10,7 @@ unicase/u32-is-invariant
 unicase/u32-toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-is-uppercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-uppercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_IS_UPPERCASE
diff --git a/modules/unicase/u32-prefix-context b/modules/unicase/u32-prefix-context
index 835e172cbe..2d2c09eced 100644
--- a/modules/unicase/u32-prefix-context
+++ b/modules/unicase/u32-prefix-context
@@ -15,7 +15,7 @@ unistr/u32-mbtouc-unsafe
 unistr/u32-prev
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u32-prefix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-prefix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_PREFIX_CONTEXT
diff --git a/modules/unicase/u32-suffix-context b/modules/unicase/u32-suffix-context
index 2b9c2e09ab..739331693e 100644
--- a/modules/unicase/u32-suffix-context
+++ b/modules/unicase/u32-suffix-context
@@ -14,7 +14,7 @@ unictype/combining-class
 unistr/u32-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u32-suffix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-suffix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_SUFFIX_CONTEXT
diff --git a/modules/unicase/u32-tolower b/modules/unicase/u32-tolower
index d627f06173..741711045e 100644
--- a/modules/unicase/u32-tolower
+++ b/modules/unicase/u32-tolower
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_TOLOWER
diff --git a/modules/unicase/u32-totitle b/modules/unicase/u32-totitle
index b47f004f98..8fcb656c23 100644
--- a/modules/unicase/u32-totitle
+++ b/modules/unicase/u32-totitle
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_TOTITLE
diff --git a/modules/unicase/u32-toupper b/modules/unicase/u32-toupper
index c6d456fa6f..3277ddb783 100644
--- a/modules/unicase/u32-toupper
+++ b/modules/unicase/u32-toupper
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u32-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U32_TOUPPER
diff --git a/modules/unicase/u8-casecmp b/modules/unicase/u8-casecmp
index d5a5d78ff8..cbd14b4540 100644
--- a/modules/unicase/u8-casecmp
+++ b/modules/unicase/u8-casecmp
@@ -13,7 +13,7 @@ unistr/u8-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-casecmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CASECMP
diff --git a/modules/unicase/u8-casecoll b/modules/unicase/u8-casecoll
index 83e4cab60c..33db7f6ea8 100644
--- a/modules/unicase/u8-casecoll
+++ b/modules/unicase/u8-casecoll
@@ -12,7 +12,7 @@ unicase/u8-casexfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-casecoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CASECOLL
diff --git a/modules/unicase/u8-casefold b/modules/unicase/u8-casefold
index 11885ae952..2c6df55ce3 100644
--- a/modules/unicase/u8-casefold
+++ b/modules/unicase/u8-casefold
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CASEFOLD
diff --git a/modules/unicase/u8-casexfrm b/modules/unicase/u8-casexfrm
index 97df83c1f6..6e9ddb4b51 100644
--- a/modules/unicase/u8-casexfrm
+++ b/modules/unicase/u8-casexfrm
@@ -14,7 +14,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-casexfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casexfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CASEXFRM
diff --git a/modules/unicase/u8-ct-casefold b/modules/unicase/u8-ct-casefold
index 1fc574a89f..9d29e5dd23 100644
--- a/modules/unicase/u8-ct-casefold
+++ b/modules/unicase/u8-ct-casefold
@@ -15,7 +15,7 @@ uninorm/u8-normalize
 uninorm/nfd
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-ct-casefold])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-casefold])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CT_CASEFOLD
diff --git a/modules/unicase/u8-ct-tolower b/modules/unicase/u8-ct-tolower
index 5e823575d2..3dcbdc11a8 100644
--- a/modules/unicase/u8-ct-tolower
+++ b/modules/unicase/u8-ct-tolower
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-ct-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOLOWER
diff --git a/modules/unicase/u8-ct-totitle b/modules/unicase/u8-ct-totitle
index f94177c6d0..f2f3f6b27c 100644
--- a/modules/unicase/u8-ct-totitle
+++ b/modules/unicase/u8-ct-totitle
@@ -23,7 +23,7 @@ uninorm/u8-normalize
 stdbool
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-ct-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOTITLE
diff --git a/modules/unicase/u8-ct-toupper b/modules/unicase/u8-ct-toupper
index f751775516..b03739a760 100644
--- a/modules/unicase/u8-ct-toupper
+++ b/modules/unicase/u8-ct-toupper
@@ -11,7 +11,7 @@ unicase/special-casing
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-ct-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_CT_TOUPPER
diff --git a/modules/unicase/u8-is-cased b/modules/unicase/u8-is-cased
index 3b06714ec4..3a34ae8a7e 100644
--- a/modules/unicase/u8-is-cased
+++ b/modules/unicase/u8-is-cased
@@ -15,7 +15,7 @@ uninorm/nfd
 unistr/u8-cmp
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-is-cased])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-cased])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASED
diff --git a/modules/unicase/u8-is-casefolded b/modules/unicase/u8-is-casefolded
index e19e67bf8e..94458e78b1 100644
--- a/modules/unicase/u8-is-casefolded
+++ b/modules/unicase/u8-is-casefolded
@@ -10,7 +10,7 @@ unicase/u8-is-invariant
 unicase/u8-casefold
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-is-casefolded])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-casefolded])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_IS_CASEFOLDED
diff --git a/modules/unicase/u8-is-lowercase b/modules/unicase/u8-is-lowercase
index 2bbb430326..394d1266b6 100644
--- a/modules/unicase/u8-is-lowercase
+++ b/modules/unicase/u8-is-lowercase
@@ -10,7 +10,7 @@ unicase/u8-is-invariant
 unicase/u8-tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-is-lowercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-lowercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_IS_LOWERCASE
diff --git a/modules/unicase/u8-is-titlecase b/modules/unicase/u8-is-titlecase
index 78c7745337..1726c0a247 100644
--- a/modules/unicase/u8-is-titlecase
+++ b/modules/unicase/u8-is-titlecase
@@ -10,7 +10,7 @@ unicase/u8-is-invariant
 unicase/u8-totitle
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-is-titlecase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-titlecase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_IS_TITLECASE
diff --git a/modules/unicase/u8-is-uppercase b/modules/unicase/u8-is-uppercase
index 21e0432432..13dede5aee 100644
--- a/modules/unicase/u8-is-uppercase
+++ b/modules/unicase/u8-is-uppercase
@@ -10,7 +10,7 @@ unicase/u8-is-invariant
 unicase/u8-toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-is-uppercase])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-uppercase])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_IS_UPPERCASE
diff --git a/modules/unicase/u8-prefix-context b/modules/unicase/u8-prefix-context
index bfe417a089..fd441d13ad 100644
--- a/modules/unicase/u8-prefix-context
+++ b/modules/unicase/u8-prefix-context
@@ -15,7 +15,7 @@ unistr/u8-mbtouc-unsafe
 unistr/u8-prev
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u8-prefix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-prefix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_PREFIX_CONTEXT
diff --git a/modules/unicase/u8-suffix-context b/modules/unicase/u8-suffix-context
index e99eb3d052..875283b98a 100644
--- a/modules/unicase/u8-suffix-context
+++ b/modules/unicase/u8-suffix-context
@@ -14,7 +14,7 @@ unictype/combining-class
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.10], [unicase/u8-suffix-context])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-suffix-context])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_SUFFIX_CONTEXT
diff --git a/modules/unicase/u8-tolower b/modules/unicase/u8-tolower
index 5213908234..57bbff5798 100644
--- a/modules/unicase/u8-tolower
+++ b/modules/unicase/u8-tolower
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/tolower
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-tolower])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-tolower])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER
diff --git a/modules/unicase/u8-totitle b/modules/unicase/u8-totitle
index 55c13009cb..046a0f24f6 100644
--- a/modules/unicase/u8-totitle
+++ b/modules/unicase/u8-totitle
@@ -12,7 +12,7 @@ unicase/empty-prefix-context
 unicase/empty-suffix-context
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-totitle])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-totitle])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_TOTITLE
diff --git a/modules/unicase/u8-toupper b/modules/unicase/u8-toupper
index 583e775b01..41534a2db6 100644
--- a/modules/unicase/u8-toupper
+++ b/modules/unicase/u8-toupper
@@ -13,7 +13,7 @@ unicase/empty-suffix-context
 unicase/toupper
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/u8-toupper])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-toupper])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_U8_TOUPPER
diff --git a/modules/unicase/ulc-casecmp b/modules/unicase/ulc-casecmp
index e7d6bccc06..d2e6710327 100644
--- a/modules/unicase/ulc-casecmp
+++ b/modules/unicase/ulc-casecmp
@@ -15,7 +15,7 @@ localcharset
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/ulc-casecmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECMP
diff --git a/modules/unicase/ulc-casecoll b/modules/unicase/ulc-casecoll
index f50d5bc86d..bf61aaf467 100644
--- a/modules/unicase/ulc-casecoll
+++ b/modules/unicase/ulc-casecoll
@@ -11,7 +11,7 @@ unicase/ulc-casexfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/ulc-casecoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_ULC_CASECOLL
diff --git a/modules/unicase/ulc-casexfrm b/modules/unicase/ulc-casexfrm
index 6d4bc97b71..727300f07f 100644
--- a/modules/unicase/ulc-casexfrm
+++ b/modules/unicase/ulc-casexfrm
@@ -11,7 +11,7 @@ uniconv/u8-conv-from-enc
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unicase/ulc-casexfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casexfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICASE_ULC_CASEXFRM
diff --git a/modules/unictype/base b/modules/unictype/base
index 42be0b3075..b2d22f8762 100644
--- a/modules/unictype/base
+++ b/modules/unictype/base
@@ -11,7 +11,7 @@ unitypes
 stdbool
 
 configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.8], [unictype.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unictype.h])
 AC_PROG_MKDIR_P
 
 Makefile.am:
diff --git a/modules/unictype/bidiclass-byname b/modules/unictype/bidiclass-byname
index b053f10684..8726128060 100644
--- a/modules/unictype/bidiclass-byname
+++ b/modules/unictype/bidiclass-byname
@@ -10,7 +10,7 @@ unictype/base
 gperf
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/bidiclass-byname])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-byname])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_BYNAME
diff --git a/modules/unictype/bidiclass-longname b/modules/unictype/bidiclass-longname
index 9019ce1332..03e07597d0 100644
--- a/modules/unictype/bidiclass-longname
+++ b/modules/unictype/bidiclass-longname
@@ -8,7 +8,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/bidiclass-longname])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-longname])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_LONGNAME
diff --git a/modules/unictype/bidiclass-name b/modules/unictype/bidiclass-name
index 84f6ea855a..0045e31a1e 100644
--- a/modules/unictype/bidiclass-name
+++ b/modules/unictype/bidiclass-name
@@ -8,7 +8,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/bidiclass-name])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-name])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_NAME
diff --git a/modules/unictype/bidiclass-of b/modules/unictype/bidiclass-of
index 94fb2d1f44..ed6ed904ba 100644
--- a/modules/unictype/bidiclass-of
+++ b/modules/unictype/bidiclass-of
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/bidiclass-of])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-of])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF
diff --git a/modules/unictype/bidiclass-test b/modules/unictype/bidiclass-test
index 27718f61c9..9bf8d5c00c 100644
--- a/modules/unictype/bidiclass-test
+++ b/modules/unictype/bidiclass-test
@@ -9,7 +9,7 @@ unictype/base
 unictype/bidiclass-of
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/bidiclass-test])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-test])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_TEST
diff --git a/modules/unictype/block-list b/modules/unictype/block-list
index af3b19878d..a8cb3634b6 100644
--- a/modules/unictype/block-list
+++ b/modules/unictype/block-list
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/block-list])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-list])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_LIST
diff --git a/modules/unictype/block-test b/modules/unictype/block-test
index 673d7e5063..97baa29e94 100644
--- a/modules/unictype/block-test
+++ b/modules/unictype/block-test
@@ -8,7 +8,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/block-test])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-test])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_BLOCK_TEST
diff --git a/modules/unictype/category-C b/modules/unictype/category-C
index bac1b356a7..8c7f09f998 100644
--- a/modules/unictype/category-C
+++ b/modules/unictype/category-C
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-C])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-C])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_C
diff --git a/modules/unictype/category-Cn b/modules/unictype/category-Cn
index 02e9ba7d57..8f770b429a 100644
--- a/modules/unictype/category-Cn
+++ b/modules/unictype/category-Cn
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cn])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Cn])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_CN
diff --git a/modules/unictype/category-L b/modules/unictype/category-L
index 8143289124..bae53bd4b5 100644
--- a/modules/unictype/category-L
+++ b/modules/unictype/category-L
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-L])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-L])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_L
diff --git a/modules/unictype/category-Lm b/modules/unictype/category-Lm
index 28a6118f66..e6d4bf2f07 100644
--- a/modules/unictype/category-Lm
+++ b/modules/unictype/category-Lm
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Lm])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LM
diff --git a/modules/unictype/category-Lo b/modules/unictype/category-Lo
index 20bf343f23..d27f75eb81 100644
--- a/modules/unictype/category-Lo
+++ b/modules/unictype/category-Lo
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Lo])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lo])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_LO
diff --git a/modules/unictype/category-M b/modules/unictype/category-M
index ba53399c7b..fea4705f0a 100644
--- a/modules/unictype/category-M
+++ b/modules/unictype/category-M
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-M])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-M])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M
diff --git a/modules/unictype/category-Mc b/modules/unictype/category-Mc
index 4f37b15683..81b93056c8 100644
--- a/modules/unictype/category-Mc
+++ b/modules/unictype/category-Mc
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Mc])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mc])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MC
diff --git a/modules/unictype/category-Mn b/modules/unictype/category-Mn
index 390699ae65..32396f25ed 100644
--- a/modules/unictype/category-Mn
+++ b/modules/unictype/category-Mn
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Mn])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mn])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_MN
diff --git a/modules/unictype/category-N b/modules/unictype/category-N
index 3647669e6d..cc61df38aa 100644
--- a/modules/unictype/category-N
+++ b/modules/unictype/category-N
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-N])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-N])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_N
diff --git a/modules/unictype/category-Nd b/modules/unictype/category-Nd
index 96d2597cbf..5e522c3c91 100644
--- a/modules/unictype/category-Nd
+++ b/modules/unictype/category-Nd
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Nd])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Nd])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_ND
diff --git a/modules/unictype/category-P b/modules/unictype/category-P
index ed2aa4ec1d..e3623bb09e 100644
--- a/modules/unictype/category-P
+++ b/modules/unictype/category-P
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-P])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-P])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_P
diff --git a/modules/unictype/category-Po b/modules/unictype/category-Po
index a1906eab0d..a9677de2d7 100644
--- a/modules/unictype/category-Po
+++ b/modules/unictype/category-Po
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Po])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Po])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_PO
diff --git a/modules/unictype/category-S b/modules/unictype/category-S
index f01b58ed8d..d934e5db59 100644
--- a/modules/unictype/category-S
+++ b/modules/unictype/category-S
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-S])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-S])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_S
diff --git a/modules/unictype/category-Sc b/modules/unictype/category-Sc
index 8c122d5009..fdf8461a55 100644
--- a/modules/unictype/category-Sc
+++ b/modules/unictype/category-Sc
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Sc])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sc])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SC
diff --git a/modules/unictype/category-So b/modules/unictype/category-So
index daeff9a64b..cd6d927cc2 100644
--- a/modules/unictype/category-So
+++ b/modules/unictype/category-So
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-So])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-So])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_SO
diff --git a/modules/unictype/category-of b/modules/unictype/category-of
index e064e045d6..77648815ec 100644
--- a/modules/unictype/category-of
+++ b/modules/unictype/category-of
@@ -11,7 +11,7 @@ unictype/category-none
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-of])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-of])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF
diff --git a/modules/unictype/combining-class b/modules/unictype/combining-class
index 8a63417c7f..49f353a8e7 100644
--- a/modules/unictype/combining-class
+++ b/modules/unictype/combining-class
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/combining-class])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS
diff --git a/modules/unictype/ctype-alnum b/modules/unictype/ctype-alnum
index 319792ef3b..8006eb1817 100644
--- a/modules/unictype/ctype-alnum
+++ b/modules/unictype/ctype-alnum
@@ -12,7 +12,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-alnum])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alnum])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM
diff --git a/modules/unictype/ctype-alpha b/modules/unictype/ctype-alpha
index b5869bcb46..7ce2a62ca9 100644
--- a/modules/unictype/ctype-alpha
+++ b/modules/unictype/ctype-alpha
@@ -12,7 +12,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-alpha])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alpha])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA
diff --git a/modules/unictype/ctype-graph b/modules/unictype/ctype-graph
index d2ece83932..a73a719e7c 100644
--- a/modules/unictype/ctype-graph
+++ b/modules/unictype/ctype-graph
@@ -12,7 +12,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-graph])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-graph])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH
diff --git a/modules/unictype/ctype-print b/modules/unictype/ctype-print
index 4846edfa58..fe0e4080e7 100644
--- a/modules/unictype/ctype-print
+++ b/modules/unictype/ctype-print
@@ -12,7 +12,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-print])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-print])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT
diff --git a/modules/unictype/ctype-punct b/modules/unictype/ctype-punct
index f036a797ab..f112085797 100644
--- a/modules/unictype/ctype-punct
+++ b/modules/unictype/ctype-punct
@@ -12,7 +12,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-punct])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-punct])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT
diff --git a/modules/unictype/decimal-digit b/modules/unictype/decimal-digit
index ac92fc3a07..48895ec011 100644
--- a/modules/unictype/decimal-digit
+++ b/modules/unictype/decimal-digit
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/decimal-digit])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/decimal-digit])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_DECIMAL_DIGIT
diff --git a/modules/unictype/digit b/modules/unictype/digit
index 518db0fcbe..14fde6bf2d 100644
--- a/modules/unictype/digit
+++ b/modules/unictype/digit
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/digit])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/digit])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_DIGIT
diff --git a/modules/unictype/joininggroup-byname b/modules/unictype/joininggroup-byname
index 30c8bcc3bc..9c01f1adda 100644
--- a/modules/unictype/joininggroup-byname
+++ b/modules/unictype/joininggroup-byname
@@ -10,7 +10,7 @@ unictype/base
 gperf
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joininggroup-byname])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-byname])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_BYNAME
diff --git a/modules/unictype/joininggroup-name b/modules/unictype/joininggroup-name
index 3b654e4159..a90eac9451 100644
--- a/modules/unictype/joininggroup-name
+++ b/modules/unictype/joininggroup-name
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joininggroup-name])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-name])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_NAME
diff --git a/modules/unictype/joininggroup-of b/modules/unictype/joininggroup-of
index 4455461448..c0af8b66d9 100644
--- a/modules/unictype/joininggroup-of
+++ b/modules/unictype/joininggroup-of
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joininggroup-of])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-of])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_JOININGGROUP_OF
diff --git a/modules/unictype/joiningtype-of b/modules/unictype/joiningtype-of
index 1cf92cfb83..69b15dc28b 100644
--- a/modules/unictype/joiningtype-of
+++ b/modules/unictype/joiningtype-of
@@ -10,7 +10,7 @@ unictype/base
 unictype/category-test-withtable
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-of])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joiningtype-of])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF
diff --git a/modules/unictype/numeric b/modules/unictype/numeric
index 1728bdeec8..b497b31d39 100644
--- a/modules/unictype/numeric
+++ b/modules/unictype/numeric
@@ -9,7 +9,7 @@ Depends-on:
 unictype/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/numeric])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/numeric])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_NUMERIC
diff --git a/modules/unictype/property-all b/modules/unictype/property-all
index bef5ab8a3a..facfdd24f4 100644
--- a/modules/unictype/property-all
+++ b/modules/unictype/property-all
@@ -78,6 +78,7 @@ unictype/property-private-use
 unictype/property-punctuation
 unictype/property-quotation-mark
 unictype/property-radical
+unictype/property-regional-indicator
 unictype/property-sentence-terminal
 unictype/property-soft-dotted
 unictype/property-space
diff --git a/modules/unictype/property-alphabetic b/modules/unictype/property-alphabetic
index a849075c24..629a9f1bcf 100644
--- a/modules/unictype/property-alphabetic
+++ b/modules/unictype/property-alphabetic
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-alphabetic])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-alphabetic])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ALPHABETIC
diff --git a/modules/unictype/property-bidi-arabic-right-to-left b/modules/unictype/property-bidi-arabic-right-to-left
index 09df192d14..bea6b5f31b 100644
--- a/modules/unictype/property-bidi-arabic-right-to-left
+++ b/modules/unictype/property-bidi-arabic-right-to-left
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-arabic-right-to-left])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-arabic-right-to-left])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT
diff --git a/modules/unictype/property-bidi-eur-num-terminator b/modules/unictype/property-bidi-eur-num-terminator
index 57d3b1f527..7422545d2d 100644
--- a/modules/unictype/property-bidi-eur-num-terminator
+++ b/modules/unictype/property-bidi-eur-num-terminator
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-eur-num-terminator])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-eur-num-terminator])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR
diff --git a/modules/unictype/property-bidi-hebrew-right-to-left b/modules/unictype/property-bidi-hebrew-right-to-left
index e1bdb8609b..33295a3a45 100644
--- a/modules/unictype/property-bidi-hebrew-right-to-left
+++ b/modules/unictype/property-bidi-hebrew-right-to-left
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-hebrew-right-to-left])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-hebrew-right-to-left])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT
diff --git a/modules/unictype/property-bidi-left-to-right b/modules/unictype/property-bidi-left-to-right
index b92c6e4019..74c1e2d115 100644
--- a/modules/unictype/property-bidi-left-to-right
+++ b/modules/unictype/property-bidi-left-to-right
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-left-to-right])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-left-to-right])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT
diff --git a/modules/unictype/property-bidi-non-spacing-mark b/modules/unictype/property-bidi-non-spacing-mark
index 67c4716256..a26a4bce2d 100644
--- a/modules/unictype/property-bidi-non-spacing-mark
+++ b/modules/unictype/property-bidi-non-spacing-mark
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-non-spacing-mark])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-non-spacing-mark])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK
diff --git a/modules/unictype/property-bidi-other-neutral b/modules/unictype/property-bidi-other-neutral
index 1e9524a5c7..87f62e3ef9 100644
--- a/modules/unictype/property-bidi-other-neutral
+++ b/modules/unictype/property-bidi-other-neutral
@@ -12,7 +12,7 @@ unictype/bidiclass-of
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-other-neutral])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-other-neutral])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL
diff --git a/modules/unictype/property-byname b/modules/unictype/property-byname
index bef3e1c84d..6e3d143ff8 100644
--- a/modules/unictype/property-byname
+++ b/modules/unictype/property-byname
@@ -80,6 +80,7 @@ unictype/property-private-use
 unictype/property-punctuation
 unictype/property-quotation-mark
 unictype/property-radical
+unictype/property-regional-indicator
 unictype/property-sentence-terminal
 unictype/property-soft-dotted
 unictype/property-space
@@ -96,7 +97,7 @@ unictype/property-zero-width
 gperf
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-byname])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-byname])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_BYNAME
diff --git a/modules/unictype/property-case-ignorable b/modules/unictype/property-case-ignorable
index 422f2186c0..201768ff15 100644
--- a/modules/unictype/property-case-ignorable
+++ b/modules/unictype/property-case-ignorable
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-case-ignorable])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-case-ignorable])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CASE_IGNORABLE
diff --git a/modules/unictype/property-combining b/modules/unictype/property-combining
index f91261ceee..18fdb4b424 100644
--- a/modules/unictype/property-combining
+++ b/modules/unictype/property-combining
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-combining])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-combining])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_COMBINING
diff --git a/modules/unictype/property-currency-symbol b/modules/unictype/property-currency-symbol
index eda2cd5aec..a1f3ce95b4 100644
--- a/modules/unictype/property-currency-symbol
+++ b/modules/unictype/property-currency-symbol
@@ -13,7 +13,7 @@ unictype/category-Sc
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-currency-symbol])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-currency-symbol])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_CURRENCY_SYMBOL
diff --git a/modules/unictype/property-decimal-digit b/modules/unictype/property-decimal-digit
index 8e73e8ce8f..3b186ece9d 100644
--- a/modules/unictype/property-decimal-digit
+++ b/modules/unictype/property-decimal-digit
@@ -13,7 +13,7 @@ unictype/category-Nd
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-decimal-digit])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-decimal-digit])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DECIMAL_DIGIT
diff --git a/modules/unictype/property-diacritic b/modules/unictype/property-diacritic
index 38cdc06c50..fab6f937b3 100644
--- a/modules/unictype/property-diacritic
+++ b/modules/unictype/property-diacritic
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-diacritic])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-diacritic])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_DIACRITIC
diff --git a/modules/unictype/property-extender b/modules/unictype/property-extender
index 121fc4f174..b6c2bb1328 100644
--- a/modules/unictype/property-extender
+++ b/modules/unictype/property-extender
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-extender])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-extender])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_EXTENDER
diff --git a/modules/unictype/property-grapheme-base b/modules/unictype/property-grapheme-base
index e0bc3a5dda..3195ac21de 100644
--- a/modules/unictype/property-grapheme-base
+++ b/modules/unictype/property-grapheme-base
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-grapheme-base])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-base])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_BASE
diff --git a/modules/unictype/property-grapheme-extend b/modules/unictype/property-grapheme-extend
index 45b3a0f8de..b04548b9bd 100644
--- a/modules/unictype/property-grapheme-extend
+++ b/modules/unictype/property-grapheme-extend
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-grapheme-extend])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-extend])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_EXTEND
diff --git a/modules/unictype/property-grapheme-link b/modules/unictype/property-grapheme-link
index b373f8595c..657bee260d 100644
--- a/modules/unictype/property-grapheme-link
+++ b/modules/unictype/property-grapheme-link
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-grapheme-link])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-link])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_GRAPHEME_LINK
diff --git a/modules/unictype/property-id-continue b/modules/unictype/property-id-continue
index c6f1f9ef99..8e1f9b77c8 100644
--- a/modules/unictype/property-id-continue
+++ b/modules/unictype/property-id-continue
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-id-continue])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-continue])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_CONTINUE
diff --git a/modules/unictype/property-id-start b/modules/unictype/property-id-start
index 86a239bb06..40b8fc6c07 100644
--- a/modules/unictype/property-id-start
+++ b/modules/unictype/property-id-start
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-id-start])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-start])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_ID_START
diff --git a/modules/unictype/property-ideographic b/modules/unictype/property-ideographic
index 4a344d5780..f0136c5cb4 100644
--- a/modules/unictype/property-ideographic
+++ b/modules/unictype/property-ideographic
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ideographic])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-ideographic])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_IDEOGRAPHIC
diff --git a/modules/unictype/property-numeric b/modules/unictype/property-numeric
index 366f20be4a..4e5cc270e0 100644
--- a/modules/unictype/property-numeric
+++ b/modules/unictype/property-numeric
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-numeric])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-numeric])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NUMERIC
diff --git a/modules/unictype/property-other-alphabetic b/modules/unictype/property-other-alphabetic
index 716acbd2a3..5a35001354 100644
--- a/modules/unictype/property-other-alphabetic
+++ b/modules/unictype/property-other-alphabetic
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-alphabetic])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-alphabetic])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_OTHER_ALPHABETIC
diff --git a/modules/unictype/property-punctuation b/modules/unictype/property-punctuation
index 620a8ca4fd..4dd07419dd 100644
--- a/modules/unictype/property-punctuation
+++ b/modules/unictype/property-punctuation
@@ -13,7 +13,7 @@ unictype/category-P
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-punctuation])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-punctuation])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_PUNCTUATION
diff --git a/modules/unictype/property-regional-indicator b/modules/unictype/property-regional-indicator
new file mode 100644
index 0000000000..c36e098cc3
--- /dev/null
+++ b/modules/unictype/property-regional-indicator
@@ -0,0 +1,26 @@
+Description:
+Test whether a Unicode character is "regional indicator".
+
+Files:
+lib/unictype/pr_regional_indicator.c
+
+Depends-on:
+unictype/base
+
+configure.ac:
+AC_REQUIRE([AC_C_INLINE])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-regional-indicator])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_REGIONAL_INDICATOR
+lib_SOURCES += unictype/pr_regional_indicator.c
+endif
+
+Include:
+"unictype.h"
+
+License:
+LGPLv3+ or GPLv2+
+
+Maintainer:
+all
diff --git a/modules/unictype/property-regional-indicator-tests b/modules/unictype/property-regional-indicator-tests
new file mode 100644
index 0000000000..34092b7d61
--- /dev/null
+++ b/modules/unictype/property-regional-indicator-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-pr_regional_indicator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_regional_indicator
+check_PROGRAMS += test-pr_regional_indicator
+test_pr_regional_indicator_SOURCES = unictype/test-pr_regional_indicator.c
+test_pr_regional_indicator_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/modules/unictype/property-sentence-terminal b/modules/unictype/property-sentence-terminal
index bf6ae2b88d..c7dc9023d8 100644
--- a/modules/unictype/property-sentence-terminal
+++ b/modules/unictype/property-sentence-terminal
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-sentence-terminal])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-sentence-terminal])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_SENTENCE_TERMINAL
diff --git a/modules/unictype/property-terminal-punctuation b/modules/unictype/property-terminal-punctuation
index e2a19aeed2..13bb33742d 100644
--- a/modules/unictype/property-terminal-punctuation
+++ b/modules/unictype/property-terminal-punctuation
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-terminal-punctuation])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-terminal-punctuation])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION
diff --git a/modules/unictype/property-unassigned-code-value b/modules/unictype/property-unassigned-code-value
index e7eb791149..0e7a065716 100644
--- a/modules/unictype/property-unassigned-code-value
+++ b/modules/unictype/property-unassigned-code-value
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-unassigned-code-value])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unassigned-code-value])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE
diff --git a/modules/unictype/property-unified-ideograph b/modules/unictype/property-unified-ideograph
index 72e8a26d89..b3b4e5293c 100644
--- a/modules/unictype/property-unified-ideograph
+++ b/modules/unictype/property-unified-ideograph
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-unified-ideograph])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unified-ideograph])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH
diff --git a/modules/unictype/property-xid-continue b/modules/unictype/property-xid-continue
index 6792e54bdb..81804736ce 100644
--- a/modules/unictype/property-xid-continue
+++ b/modules/unictype/property-xid-continue
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-xid-continue])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-continue])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_CONTINUE
diff --git a/modules/unictype/property-xid-start b/modules/unictype/property-xid-start
index 72a79e80cb..2445d6bb31 100644
--- a/modules/unictype/property-xid-start
+++ b/modules/unictype/property-xid-start
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-xid-start])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-start])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_XID_START
diff --git a/modules/unictype/scripts b/modules/unictype/scripts
index 12185e09a7..4cee3c42d4 100644
--- a/modules/unictype/scripts
+++ b/modules/unictype/scripts
@@ -11,7 +11,7 @@ unictype/base
 gperf
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/scripts])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/scripts])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS
diff --git a/modules/unictype/syntax-java-ident b/modules/unictype/syntax-java-ident
index 8f22bbdddb..ac410b67e9 100644
--- a/modules/unictype/syntax-java-ident
+++ b/modules/unictype/syntax-java-ident
@@ -11,7 +11,7 @@ unictype/base
 
 configure.ac:
 AC_REQUIRE([AC_C_INLINE])
-gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-java-ident])
+gl_LIBUNISTRING_MODULE([0.9.11], [unictype/syntax-java-ident])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNICTYPE_SYNTAX_JAVA_IDENT
diff --git a/modules/unigbrk/base b/modules/unigbrk/base
index 599f52ba67..e0dc3c6bcd 100644
--- a/modules/unigbrk/base
+++ b/modules/unigbrk/base
@@ -11,7 +11,7 @@ unitypes
 stdbool
 
 configure.ac:
-gl_LIBUNISTRING_LIBHEADER([0.9.8], [unigbrk.h])
+gl_LIBUNISTRING_LIBHEADER([0.9.11], [unigbrk.h])
 AC_PROG_MKDIR_P
 
 Makefile.am:
diff --git a/modules/unigbrk/u16-grapheme-breaks b/modules/unigbrk/u16-grapheme-breaks
index 89ca9df141..787d0c7d28 100644
--- a/modules/unigbrk/u16-grapheme-breaks
+++ b/modules/unigbrk/u16-grapheme-breaks
@@ -12,7 +12,7 @@ unistr/u16-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u16-grapheme-breaks])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u16-grapheme-breaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-breaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_BREAKS
diff --git a/modules/unigbrk/u16-grapheme-next b/modules/unigbrk/u16-grapheme-next
index 7b12a97013..bd84c76990 100644
--- a/modules/unigbrk/u16-grapheme-next
+++ b/modules/unigbrk/u16-grapheme-next
@@ -11,7 +11,7 @@ unistr/u16-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u16-grapheme-next])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u16-grapheme-next])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-next])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_NEXT
diff --git a/modules/unigbrk/u16-grapheme-prev b/modules/unigbrk/u16-grapheme-prev
index 69b45e5ecd..400a552887 100644
--- a/modules/unigbrk/u16-grapheme-prev
+++ b/modules/unigbrk/u16-grapheme-prev
@@ -11,7 +11,7 @@ unistr/u16-prev
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u16-grapheme-prev])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u16-grapheme-prev])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-prev])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U16_GRAPHEME_PREV
diff --git a/modules/unigbrk/u32-grapheme-breaks b/modules/unigbrk/u32-grapheme-breaks
index 9960924c74..adc1400993 100644
--- a/modules/unigbrk/u32-grapheme-breaks
+++ b/modules/unigbrk/u32-grapheme-breaks
@@ -12,7 +12,7 @@ unistr/u32-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u32-grapheme-breaks])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u32-grapheme-breaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-breaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_BREAKS
diff --git a/modules/unigbrk/u32-grapheme-next b/modules/unigbrk/u32-grapheme-next
index a0d5658795..4aa695481c 100644
--- a/modules/unigbrk/u32-grapheme-next
+++ b/modules/unigbrk/u32-grapheme-next
@@ -11,7 +11,7 @@ unistr/u32-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u32-grapheme-next])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u32-grapheme-next])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-next])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_NEXT
diff --git a/modules/unigbrk/u32-grapheme-prev b/modules/unigbrk/u32-grapheme-prev
index 7cd8108228..60d8c9c43c 100644
--- a/modules/unigbrk/u32-grapheme-prev
+++ b/modules/unigbrk/u32-grapheme-prev
@@ -11,7 +11,7 @@ unistr/u32-prev
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u32-grapheme-prev])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u32-grapheme-prev])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-prev])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_PREV
diff --git a/modules/unigbrk/u8-grapheme-breaks b/modules/unigbrk/u8-grapheme-breaks
index 1adbd544c3..f8282e4eb1 100644
--- a/modules/unigbrk/u8-grapheme-breaks
+++ b/modules/unigbrk/u8-grapheme-breaks
@@ -12,7 +12,7 @@ unistr/u8-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u8-grapheme-breaks])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u8-grapheme-breaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-breaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_BREAKS
diff --git a/modules/unigbrk/u8-grapheme-next b/modules/unigbrk/u8-grapheme-next
index dc283df988..a5de65d9d3 100644
--- a/modules/unigbrk/u8-grapheme-next
+++ b/modules/unigbrk/u8-grapheme-next
@@ -11,7 +11,7 @@ unistr/u8-mbtouc
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u8-grapheme-next])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u8-grapheme-next])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-next])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_NEXT
diff --git a/modules/unigbrk/u8-grapheme-prev b/modules/unigbrk/u8-grapheme-prev
index bbd2a74ea6..4c1172e0f7 100644
--- a/modules/unigbrk/u8-grapheme-prev
+++ b/modules/unigbrk/u8-grapheme-prev
@@ -11,7 +11,7 @@ unistr/u8-prev
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/u8-grapheme-prev])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/u8-grapheme-prev])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-prev])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_U8_GRAPHEME_PREV
diff --git a/modules/unigbrk/uc-gbrk-prop b/modules/unigbrk/uc-gbrk-prop
index 317a48c7d3..0942ce20cb 100644
--- a/modules/unigbrk/uc-gbrk-prop
+++ b/modules/unigbrk/uc-gbrk-prop
@@ -9,7 +9,7 @@ Depends-on:
 unigbrk/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/uc-gbrk-prop])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-gbrk-prop])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_UC_GBRK_PROP
diff --git a/modules/unigbrk/uc-grapheme-breaks b/modules/unigbrk/uc-grapheme-breaks
index 30cf2e5567..9131170200 100644
--- a/modules/unigbrk/uc-grapheme-breaks
+++ b/modules/unigbrk/uc-grapheme-breaks
@@ -11,7 +11,7 @@ unigbrk/uc-gbrk-prop
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/uc-grapheme-breaks])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/uc-grapheme-breaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-grapheme-breaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_UC_GRAPHEME_BREAKS
diff --git a/modules/unigbrk/uc-is-grapheme-break b/modules/unigbrk/uc-is-grapheme-break
index e2496852f2..d993057115 100644
--- a/modules/unigbrk/uc-is-grapheme-break
+++ b/modules/unigbrk/uc-is-grapheme-break
@@ -9,7 +9,7 @@ unigbrk/base
 unigbrk/uc-gbrk-prop
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/uc-is-grapheme-break])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-is-grapheme-break])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_UC_IS_GRAPHEME_BREAK
diff --git a/modules/unigbrk/ulc-grapheme-breaks b/modules/unigbrk/ulc-grapheme-breaks
index a5fca66637..4ad98012e3 100644
--- a/modules/unigbrk/ulc-grapheme-breaks
+++ b/modules/unigbrk/ulc-grapheme-breaks
@@ -13,7 +13,7 @@ localcharset
 
 configure.ac:
 gl_MODULE_INDICATOR([unigbrk/ulc-grapheme-breaks])
-gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/ulc-grapheme-breaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/ulc-grapheme-breaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIGBRK_ULC_GRAPHEME_BREAKS
diff --git a/modules/unilbrk/u16-possible-linebreaks b/modules/unilbrk/u16-possible-linebreaks
index 2c2fd947a9..1446d29b36 100644
--- a/modules/unilbrk/u16-possible-linebreaks
+++ b/modules/unilbrk/u16-possible-linebreaks
@@ -12,7 +12,7 @@ unistr/u16-mbtouc-unsafe
 streq
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u16-possible-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-possible-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U16_POSSIBLE_LINEBREAKS
diff --git a/modules/unilbrk/u16-width-linebreaks b/modules/unilbrk/u16-width-linebreaks
index 9e98925d13..5b1bb55a21 100644
--- a/modules/unilbrk/u16-width-linebreaks
+++ b/modules/unilbrk/u16-width-linebreaks
@@ -11,7 +11,7 @@ uniwidth/width
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u16-width-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-width-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U16_WIDTH_LINEBREAKS
diff --git a/modules/unilbrk/u32-possible-linebreaks b/modules/unilbrk/u32-possible-linebreaks
index 1424914062..b42848aa4f 100644
--- a/modules/unilbrk/u32-possible-linebreaks
+++ b/modules/unilbrk/u32-possible-linebreaks
@@ -11,7 +11,7 @@ unilbrk/tables
 streq
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u32-possible-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-possible-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U32_POSSIBLE_LINEBREAKS
diff --git a/modules/unilbrk/u32-width-linebreaks b/modules/unilbrk/u32-width-linebreaks
index 1f1eabab3b..5f884cef31 100644
--- a/modules/unilbrk/u32-width-linebreaks
+++ b/modules/unilbrk/u32-width-linebreaks
@@ -10,7 +10,7 @@ unilbrk/u32-possible-linebreaks
 uniwidth/width
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u32-width-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-width-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U32_WIDTH_LINEBREAKS
diff --git a/modules/unilbrk/u8-possible-linebreaks b/modules/unilbrk/u8-possible-linebreaks
index d7f74868db..7e7f61e32f 100644
--- a/modules/unilbrk/u8-possible-linebreaks
+++ b/modules/unilbrk/u8-possible-linebreaks
@@ -12,7 +12,7 @@ unistr/u8-mbtouc-unsafe
 streq
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u8-possible-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-possible-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS
diff --git a/modules/unilbrk/u8-width-linebreaks b/modules/unilbrk/u8-width-linebreaks
index cd1bab4b75..d2260f0614 100644
--- a/modules/unilbrk/u8-width-linebreaks
+++ b/modules/unilbrk/u8-width-linebreaks
@@ -11,7 +11,7 @@ uniwidth/width
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/u8-width-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-width-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS
diff --git a/modules/unilbrk/ulc-possible-linebreaks b/modules/unilbrk/ulc-possible-linebreaks
index d72d80c0e8..664628c732 100644
--- a/modules/unilbrk/ulc-possible-linebreaks
+++ b/modules/unilbrk/ulc-possible-linebreaks
@@ -12,7 +12,7 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/ulc-possible-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-possible-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_ULC_POSSIBLE_LINEBREAKS
diff --git a/modules/unilbrk/ulc-width-linebreaks b/modules/unilbrk/ulc-width-linebreaks
index 824ac708d0..74dace8f0c 100644
--- a/modules/unilbrk/ulc-width-linebreaks
+++ b/modules/unilbrk/ulc-width-linebreaks
@@ -12,7 +12,7 @@ uniconv/u8-conv-from-enc
 c-ctype
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [unilbrk/ulc-width-linebreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-width-linebreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS
diff --git a/modules/uniname/uniname b/modules/uniname/uniname
index b083ea378d..b35437d314 100644
--- a/modules/uniname/uniname
+++ b/modules/uniname/uniname
@@ -13,7 +13,7 @@ memcmp
 c99
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniname/uniname])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniname/uniname])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINAME_UNINAME
diff --git a/modules/uninorm/canonical-decomposition b/modules/uninorm/canonical-decomposition
index 7664375cfb..006adf5254 100644
--- a/modules/uninorm/canonical-decomposition
+++ b/modules/uninorm/canonical-decomposition
@@ -9,7 +9,7 @@ uninorm/base
 uninorm/decomposition-table
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/canonical-decomposition])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/canonical-decomposition])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION
diff --git a/modules/uninorm/composition b/modules/uninorm/composition
index 3299644595..d17b7d70d5 100644
--- a/modules/uninorm/composition
+++ b/modules/uninorm/composition
@@ -10,7 +10,7 @@ uninorm/base
 gperf
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/composition])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/composition])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_COMPOSITION
diff --git a/modules/uninorm/decomposing-form b/modules/uninorm/decomposing-form
index e3a66fe65a..74f37380ea 100644
--- a/modules/uninorm/decomposing-form
+++ b/modules/uninorm/decomposing-form
@@ -9,7 +9,7 @@ Depends-on:
 uninorm/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.5], [uninorm/decomposing-form])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposing-form])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSING_FORM
diff --git a/modules/uninorm/decomposition b/modules/uninorm/decomposition
index 22e770e5c6..3afee5f110 100644
--- a/modules/uninorm/decomposition
+++ b/modules/uninorm/decomposition
@@ -9,7 +9,7 @@ uninorm/base
 uninorm/decomposition-table
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/decomposition])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposition])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_DECOMPOSITION
diff --git a/modules/uninorm/filter b/modules/uninorm/filter
index 65f14fb3f0..25ed47874d 100644
--- a/modules/uninorm/filter
+++ b/modules/uninorm/filter
@@ -12,7 +12,7 @@ uninorm/decompose-internal
 malloc-posix
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/filter])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/filter])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_FILTER
diff --git a/modules/uninorm/nfc b/modules/uninorm/nfc
index 59fe387ded..8c89faf7c9 100644
--- a/modules/uninorm/nfc
+++ b/modules/uninorm/nfc
@@ -12,7 +12,7 @@ uninorm/composition
 uninorm/nfd
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/nfc])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfc])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_NFC
diff --git a/modules/uninorm/nfd b/modules/uninorm/nfd
index b4f7ee8422..35a7102f63 100644
--- a/modules/uninorm/nfd
+++ b/modules/uninorm/nfd
@@ -10,7 +10,7 @@ uninorm/base
 uninorm/canonical-decomposition
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/nfd])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfd])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_NFD
diff --git a/modules/uninorm/nfkc b/modules/uninorm/nfkc
index 0cabda83b4..10cae51150 100644
--- a/modules/uninorm/nfkc
+++ b/modules/uninorm/nfkc
@@ -12,7 +12,7 @@ uninorm/composition
 uninorm/nfkd
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/nfkc])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkc])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_NFKC
diff --git a/modules/uninorm/nfkd b/modules/uninorm/nfkd
index 77d22bba38..812426645e 100644
--- a/modules/uninorm/nfkd
+++ b/modules/uninorm/nfkd
@@ -10,7 +10,7 @@ uninorm/base
 uninorm/compat-decomposition
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/nfkd])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkd])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_NFKD
diff --git a/modules/uninorm/u16-normalize b/modules/uninorm/u16-normalize
index c48f37653f..4c262dbf88 100644
--- a/modules/uninorm/u16-normalize
+++ b/modules/uninorm/u16-normalize
@@ -16,7 +16,7 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize])
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u16-normalize])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normalize])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U16_NORMALIZE
diff --git a/modules/uninorm/u16-normcmp b/modules/uninorm/u16-normcmp
index ceaffe7e4f..4f7664af8d 100644
--- a/modules/uninorm/u16-normcmp
+++ b/modules/uninorm/u16-normcmp
@@ -12,7 +12,7 @@ unistr/u16-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u16-normcmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCMP
diff --git a/modules/uninorm/u16-normcoll b/modules/uninorm/u16-normcoll
index a0466f6fa8..17aa1fed44 100644
--- a/modules/uninorm/u16-normcoll
+++ b/modules/uninorm/u16-normcoll
@@ -11,7 +11,7 @@ uninorm/u16-normxfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u16-normcoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U16_NORMCOLL
diff --git a/modules/uninorm/u16-normxfrm b/modules/uninorm/u16-normxfrm
index 89fc0966e4..4aa65974ec 100644
--- a/modules/uninorm/u16-normxfrm
+++ b/modules/uninorm/u16-normxfrm
@@ -13,7 +13,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u16-normxfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normxfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U16_NORMXFRM
diff --git a/modules/uninorm/u32-normalize b/modules/uninorm/u32-normalize
index 207b5bcd5d..d1e7a2fa8b 100644
--- a/modules/uninorm/u32-normalize
+++ b/modules/uninorm/u32-normalize
@@ -16,7 +16,7 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize])
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u32-normalize])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normalize])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE
diff --git a/modules/uninorm/u32-normcmp b/modules/uninorm/u32-normcmp
index 47b0d829d4..5dae6312da 100644
--- a/modules/uninorm/u32-normcmp
+++ b/modules/uninorm/u32-normcmp
@@ -12,7 +12,7 @@ unistr/u32-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u32-normcmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCMP
diff --git a/modules/uninorm/u32-normcoll b/modules/uninorm/u32-normcoll
index e8a4088a90..f5dbd84d2e 100644
--- a/modules/uninorm/u32-normcoll
+++ b/modules/uninorm/u32-normcoll
@@ -11,7 +11,7 @@ uninorm/u32-normxfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u32-normcoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U32_NORMCOLL
diff --git a/modules/uninorm/u32-normxfrm b/modules/uninorm/u32-normxfrm
index 6fc637db71..3a43aaa093 100644
--- a/modules/uninorm/u32-normxfrm
+++ b/modules/uninorm/u32-normxfrm
@@ -13,7 +13,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u32-normxfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normxfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U32_NORMXFRM
diff --git a/modules/uninorm/u8-normalize b/modules/uninorm/u8-normalize
index 878be8be8a..099383aeeb 100644
--- a/modules/uninorm/u8-normalize
+++ b/modules/uninorm/u8-normalize
@@ -16,7 +16,7 @@ uninorm/decompose-internal
 
 configure.ac:
 gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize])
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u8-normalize])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normalize])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U8_NORMALIZE
diff --git a/modules/uninorm/u8-normcmp b/modules/uninorm/u8-normcmp
index 24fef1ca17..1b449e0de8 100644
--- a/modules/uninorm/u8-normcmp
+++ b/modules/uninorm/u8-normcmp
@@ -12,7 +12,7 @@ unistr/u8-cmp2
 minmax
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u8-normcmp])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcmp])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCMP
diff --git a/modules/uninorm/u8-normcoll b/modules/uninorm/u8-normcoll
index 84854feea1..aefab9808c 100644
--- a/modules/uninorm/u8-normcoll
+++ b/modules/uninorm/u8-normcoll
@@ -11,7 +11,7 @@ uninorm/u8-normxfrm
 memcmp2
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u8-normcoll])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcoll])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U8_NORMCOLL
diff --git a/modules/uninorm/u8-normxfrm b/modules/uninorm/u8-normxfrm
index 80350d001a..5cd119c7ac 100644
--- a/modules/uninorm/u8-normxfrm
+++ b/modules/uninorm/u8-normxfrm
@@ -13,7 +13,7 @@ localcharset
 amemxfrm
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uninorm/u8-normxfrm])
+gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normxfrm])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNINORM_U8_NORMXFRM
diff --git a/modules/uniwbrk/u16-wordbreaks b/modules/uniwbrk/u16-wordbreaks
index d98dbf39d6..f0fc463f68 100644
--- a/modules/uniwbrk/u16-wordbreaks
+++ b/modules/uniwbrk/u16-wordbreaks
@@ -12,7 +12,7 @@ uniwbrk/table
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwbrk/u16-wordbreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u16-wordbreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWBRK_U16_WORDBREAKS
diff --git a/modules/uniwbrk/u32-wordbreaks b/modules/uniwbrk/u32-wordbreaks
index 590e592656..5bba487623 100644
--- a/modules/uniwbrk/u32-wordbreaks
+++ b/modules/uniwbrk/u32-wordbreaks
@@ -12,7 +12,7 @@ uniwbrk/table
 unistr/u32-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwbrk/u32-wordbreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u32-wordbreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWBRK_U32_WORDBREAKS
diff --git a/modules/uniwbrk/u8-wordbreaks b/modules/uniwbrk/u8-wordbreaks
index 95c53bbfe8..81a7f6931c 100644
--- a/modules/uniwbrk/u8-wordbreaks
+++ b/modules/uniwbrk/u8-wordbreaks
@@ -12,7 +12,7 @@ uniwbrk/table
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwbrk/u8-wordbreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u8-wordbreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWBRK_U8_WORDBREAKS
diff --git a/modules/uniwbrk/ulc-wordbreaks b/modules/uniwbrk/ulc-wordbreaks
index 2f6765935f..8e30e85720 100644
--- a/modules/uniwbrk/ulc-wordbreaks
+++ b/modules/uniwbrk/ulc-wordbreaks
@@ -13,7 +13,7 @@ c-ctype
 localcharset
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwbrk/ulc-wordbreaks])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/ulc-wordbreaks])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWBRK_ULC_WORDBREAKS
diff --git a/modules/uniwbrk/wordbreak-property b/modules/uniwbrk/wordbreak-property
index b8cef64b0a..6a3dd2da47 100644
--- a/modules/uniwbrk/wordbreak-property
+++ b/modules/uniwbrk/wordbreak-property
@@ -9,7 +9,7 @@ Depends-on:
 uniwbrk/base
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwbrk/wordbreak-property])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/wordbreak-property])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWBRK_WORDBREAK_PROPERTY
diff --git a/modules/uniwidth/u16-strwidth b/modules/uniwidth/u16-strwidth
index 2ead0f3455..b931ef4081 100644
--- a/modules/uniwidth/u16-strwidth
+++ b/modules/uniwidth/u16-strwidth
@@ -10,7 +10,7 @@ uniwidth/u16-width
 unistr/u16-strlen
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u16-strwidth])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-strwidth])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U16_STRWIDTH
diff --git a/modules/uniwidth/u16-width b/modules/uniwidth/u16-width
index 74dd7ed8bf..5be41380ac 100644
--- a/modules/uniwidth/u16-width
+++ b/modules/uniwidth/u16-width
@@ -10,7 +10,7 @@ uniwidth/width
 unistr/u16-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u16-width])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-width])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U16_WIDTH
diff --git a/modules/uniwidth/u32-strwidth b/modules/uniwidth/u32-strwidth
index eae9aabb8b..7119fa7dbf 100644
--- a/modules/uniwidth/u32-strwidth
+++ b/modules/uniwidth/u32-strwidth
@@ -10,7 +10,7 @@ uniwidth/u32-width
 unistr/u32-strlen
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u32-strwidth])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-strwidth])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U32_STRWIDTH
diff --git a/modules/uniwidth/u32-width b/modules/uniwidth/u32-width
index 8f6cf1e8f9..6f06a288be 100644
--- a/modules/uniwidth/u32-width
+++ b/modules/uniwidth/u32-width
@@ -9,7 +9,7 @@ uniwidth/base
 uniwidth/width
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u32-width])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-width])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U32_WIDTH
diff --git a/modules/uniwidth/u8-strwidth b/modules/uniwidth/u8-strwidth
index bc0e930556..759a9f8e0c 100644
--- a/modules/uniwidth/u8-strwidth
+++ b/modules/uniwidth/u8-strwidth
@@ -10,7 +10,7 @@ uniwidth/u8-width
 unistr/u8-strlen
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u8-strwidth])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-strwidth])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U8_STRWIDTH
diff --git a/modules/uniwidth/u8-width b/modules/uniwidth/u8-width
index f4e613e302..6adbb72ced 100644
--- a/modules/uniwidth/u8-width
+++ b/modules/uniwidth/u8-width
@@ -10,7 +10,7 @@ uniwidth/width
 unistr/u8-mbtouc-unsafe
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/u8-width])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-width])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_U8_WIDTH
diff --git a/modules/uniwidth/width b/modules/uniwidth/width
index 714a6b47a7..3c0c9675b2 100644
--- a/modules/uniwidth/width
+++ b/modules/uniwidth/width
@@ -10,7 +10,7 @@ uniwidth/base
 streq
 
 configure.ac:
-gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/width])
+gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/width])
 
 Makefile.am:
 if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
diff --git a/tests/unicase/test-ignorable.c b/tests/unicase/test-ignorable.c
index 7187a258f5..79600213a0 100644
--- a/tests/unicase/test-ignorable.c
+++ b/tests/unicase/test-ignorable.c
@@ -85,6 +85,7 @@
     { 0x0AC7, 0x0AC8 },
     { 0x0ACD, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B01 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3F, 0x0B3F },
@@ -107,7 +108,8 @@
     { 0x0CC6, 0x0CC6 },
     { 0x0CCC, 0x0CCD },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D01 },
+    { 0x0D00, 0x0D01 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D41, 0x0D44 },
     { 0x0D4D, 0x0D4D },
     { 0x0D62, 0x0D63 },
@@ -197,7 +199,7 @@
     { 0x1CED, 0x1CED },
     { 0x1CF4, 0x1CF4 },
     { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x1FBD, 0x1FBD },
     { 0x1FBF, 0x1FC1 },
@@ -339,6 +341,15 @@
     { 0x1171D, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
+    { 0x11A01, 0x11A06 },
+    { 0x11A09, 0x11A0A },
+    { 0x11A33, 0x11A38 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 },
+    { 0x11A59, 0x11A5B },
+    { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 },
     { 0x11C30, 0x11C36 },
     { 0x11C38, 0x11C3D },
     { 0x11C3F, 0x11C3F },
@@ -346,11 +357,16 @@
     { 0x11CAA, 0x11CB0 },
     { 0x11CB2, 0x11CB3 },
     { 0x11CB5, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16B40, 0x16B43 },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x1BC9D, 0x1BC9E },
     { 0x1BCA0, 0x1BCA3 },
     { 0x1D167, 0x1D169 },
diff --git a/tests/unicase/test-uc_tolower.c b/tests/unicase/test-uc_tolower.c
index 0bf7436657..fb855207bb 100644
--- a/tests/unicase/test-uc_tolower.c
+++ b/tests/unicase/test-uc_tolower.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 #include "test-mapping-part1.h"
 
diff --git a/tests/unicase/test-uc_totitle.c b/tests/unicase/test-uc_totitle.c
index 5fa1266632..e04f84270e 100644
--- a/tests/unicase/test-uc_totitle.c
+++ b/tests/unicase/test-uc_totitle.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 #include "test-mapping-part1.h"
 
diff --git a/tests/unicase/test-uc_toupper.c b/tests/unicase/test-uc_toupper.c
index 0f35505458..cb946a9817 100644
--- a/tests/unicase/test-uc_toupper.c
+++ b/tests/unicase/test-uc_toupper.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 #include "test-mapping-part1.h"
 
diff --git a/tests/unictype/test-categ_C.c b/tests/unictype/test-categ_C.c
index cbe7de1c33..c8b0a98941 100644
--- a/tests/unictype/test-categ_C.c
+++ b/tests/unictype/test-categ_C.c
@@ -43,7 +43,8 @@
     { 0x082E, 0x082F },
     { 0x083F, 0x083F },
     { 0x085C, 0x085D },
-    { 0x085F, 0x089F },
+    { 0x085F, 0x085F },
+    { 0x086B, 0x089F },
     { 0x08B5, 0x08B5 },
     { 0x08BE, 0x08D3 },
     { 0x08E2, 0x08E2 },
@@ -60,7 +61,7 @@
     { 0x09D8, 0x09DB },
     { 0x09DE, 0x09DE },
     { 0x09E4, 0x09E5 },
-    { 0x09FC, 0x0A00 },
+    { 0x09FE, 0x0A00 },
     { 0x0A04, 0x0A04 },
     { 0x0A0B, 0x0A0E },
     { 0x0A11, 0x0A12 },
@@ -90,7 +91,7 @@
     { 0x0AD1, 0x0ADF },
     { 0x0AE4, 0x0AE5 },
     { 0x0AF2, 0x0AF8 },
-    { 0x0AFA, 0x0B00 },
+    { 0x0B00, 0x0B00 },
     { 0x0B04, 0x0B04 },
     { 0x0B0D, 0x0B0E },
     { 0x0B11, 0x0B12 },
@@ -146,11 +147,10 @@
     { 0x0CDF, 0x0CDF },
     { 0x0CE4, 0x0CE5 },
     { 0x0CF0, 0x0CF0 },
-    { 0x0CF3, 0x0D00 },
+    { 0x0CF3, 0x0CFF },
     { 0x0D04, 0x0D04 },
     { 0x0D0D, 0x0D0D },
     { 0x0D11, 0x0D11 },
-    { 0x0D3B, 0x0D3C },
     { 0x0D45, 0x0D45 },
     { 0x0D49, 0x0D49 },
     { 0x0D50, 0x0D53 },
@@ -257,9 +257,8 @@
     { 0x1C4A, 0x1C4C },
     { 0x1C89, 0x1CBF },
     { 0x1CC8, 0x1CCF },
-    { 0x1CF7, 0x1CF7 },
     { 0x1CFA, 0x1CFF },
-    { 0x1DF6, 0x1DFA },
+    { 0x1DFA, 0x1DFA },
     { 0x1F16, 0x1F17 },
     { 0x1F1E, 0x1F1F },
     { 0x1F46, 0x1F47 },
@@ -282,17 +281,16 @@
     { 0x2072, 0x2073 },
     { 0x208F, 0x208F },
     { 0x209D, 0x209F },
-    { 0x20BF, 0x20CF },
+    { 0x20C0, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x23FF, 0x23FF },
     { 0x2427, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B97 },
     { 0x2BBA, 0x2BBC },
     { 0x2BC9, 0x2BC9 },
-    { 0x2BD2, 0x2BEB },
+    { 0x2BD3, 0x2BEB },
     { 0x2BF0, 0x2BFF },
     { 0x2C2F, 0x2C2F },
     { 0x2C5F, 0x2C5F },
@@ -311,7 +309,7 @@
     { 0x2DCF, 0x2DCF },
     { 0x2DD7, 0x2DD7 },
     { 0x2DDF, 0x2DDF },
-    { 0x2E45, 0x2E7F },
+    { 0x2E4A, 0x2E7F },
     { 0x2E9A, 0x2E9A },
     { 0x2EF4, 0x2EFF },
     { 0x2FD6, 0x2FEF },
@@ -319,14 +317,14 @@
     { 0x3040, 0x3040 },
     { 0x3097, 0x3098 },
     { 0x3100, 0x3104 },
-    { 0x312E, 0x3130 },
+    { 0x312F, 0x3130 },
     { 0x318F, 0x318F },
     { 0x31BB, 0x31BF },
     { 0x31E4, 0x31EF },
     { 0x321F, 0x321F },
     { 0x32FF, 0x32FF },
     { 0x4DB6, 0x4DBF },
-    { 0x9FD6, 0x9FFF },
+    { 0x9FEB, 0x9FFF },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
@@ -404,7 +402,7 @@
     { 0x1029D, 0x1029F },
     { 0x102D1, 0x102DF },
     { 0x102FC, 0x102FF },
-    { 0x10324, 0x1032F },
+    { 0x10324, 0x1032C },
     { 0x1034B, 0x1034F },
     { 0x1037B, 0x1037F },
     { 0x1039E, 0x1039E },
@@ -509,7 +507,11 @@
     { 0x1172C, 0x1172F },
     { 0x11740, 0x1189F },
     { 0x118F3, 0x118FE },
-    { 0x11900, 0x11ABF },
+    { 0x11900, 0x119FF },
+    { 0x11A48, 0x11A4F },
+    { 0x11A84, 0x11A85 },
+    { 0x11A9D, 0x11A9D },
+    { 0x11AA3, 0x11ABF },
     { 0x11AF9, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
@@ -517,7 +519,14 @@
     { 0x11C6D, 0x11C6F },
     { 0x11C90, 0x11C91 },
     { 0x11CA8, 0x11CA8 },
-    { 0x11CB7, 0x11FFF },
+    { 0x11CB7, 0x11CFF },
+    { 0x11D07, 0x11D07 },
+    { 0x11D0A, 0x11D0A },
+    { 0x11D37, 0x11D39 },
+    { 0x11D3B, 0x11D3B },
+    { 0x11D3E, 0x11D3E },
+    { 0x11D48, 0x11D4F },
+    { 0x11D5A, 0x11FFF },
     { 0x1239A, 0x123FF },
     { 0x1246F, 0x1246F },
     { 0x12475, 0x1247F },
@@ -538,10 +547,11 @@
     { 0x16F45, 0x16F4F },
     { 0x16F7F, 0x16F8E },
     { 0x16FA0, 0x16FDF },
-    { 0x16FE1, 0x16FFF },
+    { 0x16FE2, 0x16FFF },
     { 0x187ED, 0x187FF },
     { 0x18AF3, 0x1AFFF },
-    { 0x1B002, 0x1BBFF },
+    { 0x1B11F, 0x1B16F },
+    { 0x1B2FC, 0x1BBFF },
     { 0x1BC6B, 0x1BC6F },
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
@@ -634,29 +644,30 @@
     { 0x1F203, 0x1F20F },
     { 0x1F23C, 0x1F23F },
     { 0x1F249, 0x1F24F },
-    { 0x1F252, 0x1F2FF },
-    { 0x1F6D3, 0x1F6DF },
+    { 0x1F252, 0x1F25F },
+    { 0x1F266, 0x1F2FF },
+    { 0x1F6D5, 0x1F6DF },
     { 0x1F6ED, 0x1F6EF },
-    { 0x1F6F7, 0x1F6FF },
+    { 0x1F6F9, 0x1F6FF },
     { 0x1F774, 0x1F77F },
     { 0x1F7D5, 0x1F7FF },
     { 0x1F80C, 0x1F80F },
     { 0x1F848, 0x1F84F },
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
-    { 0x1F8AE, 0x1F90F },
-    { 0x1F91F, 0x1F91F },
-    { 0x1F928, 0x1F92F },
-    { 0x1F931, 0x1F932 },
+    { 0x1F8AE, 0x1F8FF },
+    { 0x1F90C, 0x1F90F },
     { 0x1F93F, 0x1F93F },
-    { 0x1F94C, 0x1F94F },
-    { 0x1F95F, 0x1F97F },
-    { 0x1F992, 0x1F9BF },
-    { 0x1F9C1, 0x1FFFF },
+    { 0x1F94D, 0x1F94F },
+    { 0x1F96C, 0x1F97F },
+    { 0x1F998, 0x1F9BF },
+    { 0x1F9C1, 0x1F9CF },
+    { 0x1F9E7, 0x1FFFF },
     { 0x2A6D7, 0x2A6FF },
     { 0x2B735, 0x2B73F },
     { 0x2B81E, 0x2B81F },
-    { 0x2CEA2, 0x2F7FF },
+    { 0x2CEA2, 0x2CEAF },
+    { 0x2EBE1, 0x2F7FF },
     { 0x2FA1E, 0xE00FF },
     { 0xE01F0, 0x10FFFF }
 
diff --git a/tests/unictype/test-categ_Cn.c b/tests/unictype/test-categ_Cn.c
index 22759a13de..813c8baa73 100644
--- a/tests/unictype/test-categ_Cn.c
+++ b/tests/unictype/test-categ_Cn.c
@@ -39,7 +39,8 @@
     { 0x082E, 0x082F },
     { 0x083F, 0x083F },
     { 0x085C, 0x085D },
-    { 0x085F, 0x089F },
+    { 0x085F, 0x085F },
+    { 0x086B, 0x089F },
     { 0x08B5, 0x08B5 },
     { 0x08BE, 0x08D3 },
     { 0x0984, 0x0984 },
@@ -55,7 +56,7 @@
     { 0x09D8, 0x09DB },
     { 0x09DE, 0x09DE },
     { 0x09E4, 0x09E5 },
-    { 0x09FC, 0x0A00 },
+    { 0x09FE, 0x0A00 },
     { 0x0A04, 0x0A04 },
     { 0x0A0B, 0x0A0E },
     { 0x0A11, 0x0A12 },
@@ -85,7 +86,7 @@
     { 0x0AD1, 0x0ADF },
     { 0x0AE4, 0x0AE5 },
     { 0x0AF2, 0x0AF8 },
-    { 0x0AFA, 0x0B00 },
+    { 0x0B00, 0x0B00 },
     { 0x0B04, 0x0B04 },
     { 0x0B0D, 0x0B0E },
     { 0x0B11, 0x0B12 },
@@ -141,11 +142,10 @@
     { 0x0CDF, 0x0CDF },
     { 0x0CE4, 0x0CE5 },
     { 0x0CF0, 0x0CF0 },
-    { 0x0CF3, 0x0D00 },
+    { 0x0CF3, 0x0CFF },
     { 0x0D04, 0x0D04 },
     { 0x0D0D, 0x0D0D },
     { 0x0D11, 0x0D11 },
-    { 0x0D3B, 0x0D3C },
     { 0x0D45, 0x0D45 },
     { 0x0D49, 0x0D49 },
     { 0x0D50, 0x0D53 },
@@ -252,9 +252,8 @@
     { 0x1C4A, 0x1C4C },
     { 0x1C89, 0x1CBF },
     { 0x1CC8, 0x1CCF },
-    { 0x1CF7, 0x1CF7 },
     { 0x1CFA, 0x1CFF },
-    { 0x1DF6, 0x1DFA },
+    { 0x1DFA, 0x1DFA },
     { 0x1F16, 0x1F17 },
     { 0x1F1E, 0x1F1F },
     { 0x1F46, 0x1F47 },
@@ -275,17 +274,16 @@
     { 0x2072, 0x2073 },
     { 0x208F, 0x208F },
     { 0x209D, 0x209F },
-    { 0x20BF, 0x20CF },
+    { 0x20C0, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x23FF, 0x23FF },
     { 0x2427, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B97 },
     { 0x2BBA, 0x2BBC },
     { 0x2BC9, 0x2BC9 },
-    { 0x2BD2, 0x2BEB },
+    { 0x2BD3, 0x2BEB },
     { 0x2BF0, 0x2BFF },
     { 0x2C2F, 0x2C2F },
     { 0x2C5F, 0x2C5F },
@@ -304,7 +302,7 @@
     { 0x2DCF, 0x2DCF },
     { 0x2DD7, 0x2DD7 },
     { 0x2DDF, 0x2DDF },
-    { 0x2E45, 0x2E7F },
+    { 0x2E4A, 0x2E7F },
     { 0x2E9A, 0x2E9A },
     { 0x2EF4, 0x2EFF },
     { 0x2FD6, 0x2FEF },
@@ -312,14 +310,14 @@
     { 0x3040, 0x3040 },
     { 0x3097, 0x3098 },
     { 0x3100, 0x3104 },
-    { 0x312E, 0x3130 },
+    { 0x312F, 0x3130 },
     { 0x318F, 0x318F },
     { 0x31BB, 0x31BF },
     { 0x31E4, 0x31EF },
     { 0x321F, 0x321F },
     { 0x32FF, 0x32FF },
     { 0x4DB6, 0x4DBF },
-    { 0x9FD6, 0x9FFF },
+    { 0x9FEB, 0x9FFF },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
@@ -398,7 +396,7 @@
     { 0x1029D, 0x1029F },
     { 0x102D1, 0x102DF },
     { 0x102FC, 0x102FF },
-    { 0x10324, 0x1032F },
+    { 0x10324, 0x1032C },
     { 0x1034B, 0x1034F },
     { 0x1037B, 0x1037F },
     { 0x1039E, 0x1039E },
@@ -502,7 +500,11 @@
     { 0x1172C, 0x1172F },
     { 0x11740, 0x1189F },
     { 0x118F3, 0x118FE },
-    { 0x11900, 0x11ABF },
+    { 0x11900, 0x119FF },
+    { 0x11A48, 0x11A4F },
+    { 0x11A84, 0x11A85 },
+    { 0x11A9D, 0x11A9D },
+    { 0x11AA3, 0x11ABF },
     { 0x11AF9, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
@@ -510,7 +512,14 @@
     { 0x11C6D, 0x11C6F },
     { 0x11C90, 0x11C91 },
     { 0x11CA8, 0x11CA8 },
-    { 0x11CB7, 0x11FFF },
+    { 0x11CB7, 0x11CFF },
+    { 0x11D07, 0x11D07 },
+    { 0x11D0A, 0x11D0A },
+    { 0x11D37, 0x11D39 },
+    { 0x11D3B, 0x11D3B },
+    { 0x11D3E, 0x11D3E },
+    { 0x11D48, 0x11D4F },
+    { 0x11D5A, 0x11FFF },
     { 0x1239A, 0x123FF },
     { 0x1246F, 0x1246F },
     { 0x12475, 0x1247F },
@@ -531,10 +540,11 @@
     { 0x16F45, 0x16F4F },
     { 0x16F7F, 0x16F8E },
     { 0x16FA0, 0x16FDF },
-    { 0x16FE1, 0x16FFF },
+    { 0x16FE2, 0x16FFF },
     { 0x187ED, 0x187FF },
     { 0x18AF3, 0x1AFFF },
-    { 0x1B002, 0x1BBFF },
+    { 0x1B11F, 0x1B16F },
+    { 0x1B2FC, 0x1BBFF },
     { 0x1BC6B, 0x1BC6F },
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
@@ -626,29 +636,30 @@
     { 0x1F203, 0x1F20F },
     { 0x1F23C, 0x1F23F },
     { 0x1F249, 0x1F24F },
-    { 0x1F252, 0x1F2FF },
-    { 0x1F6D3, 0x1F6DF },
+    { 0x1F252, 0x1F25F },
+    { 0x1F266, 0x1F2FF },
+    { 0x1F6D5, 0x1F6DF },
     { 0x1F6ED, 0x1F6EF },
-    { 0x1F6F7, 0x1F6FF },
+    { 0x1F6F9, 0x1F6FF },
     { 0x1F774, 0x1F77F },
     { 0x1F7D5, 0x1F7FF },
     { 0x1F80C, 0x1F80F },
     { 0x1F848, 0x1F84F },
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
-    { 0x1F8AE, 0x1F90F },
-    { 0x1F91F, 0x1F91F },
-    { 0x1F928, 0x1F92F },
-    { 0x1F931, 0x1F932 },
+    { 0x1F8AE, 0x1F8FF },
+    { 0x1F90C, 0x1F90F },
     { 0x1F93F, 0x1F93F },
-    { 0x1F94C, 0x1F94F },
-    { 0x1F95F, 0x1F97F },
-    { 0x1F992, 0x1F9BF },
-    { 0x1F9C1, 0x1FFFF },
+    { 0x1F94D, 0x1F94F },
+    { 0x1F96C, 0x1F97F },
+    { 0x1F998, 0x1F9BF },
+    { 0x1F9C1, 0x1F9CF },
+    { 0x1F9E7, 0x1FFFF },
     { 0x2A6D7, 0x2A6FF },
     { 0x2B735, 0x2B73F },
     { 0x2B81E, 0x2B81F },
-    { 0x2CEA2, 0x2F7FF },
+    { 0x2CEA2, 0x2CEAF },
+    { 0x2EBE1, 0x2F7FF },
     { 0x2FA1E, 0xE0000 },
     { 0xE0002, 0xE001F },
     { 0xE0080, 0xE00FF },
diff --git a/tests/unictype/test-categ_L.c b/tests/unictype/test-categ_L.c
index 9c7f598334..d59a410d40 100644
--- a/tests/unictype/test-categ_L.c
+++ b/tests/unictype/test-categ_L.c
@@ -65,6 +65,7 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -83,6 +84,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09F0, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -313,12 +315,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -408,7 +410,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x10340 },
+    { 0x1032D, 0x10340 },
     { 0x10342, 0x10349 },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
@@ -491,11 +493,21 @@
     { 0x11700, 0x11719 },
     { 0x118A0, 0x118DF },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
     { 0x12000, 0x12399 },
     { 0x12480, 0x12543 },
     { 0x13000, 0x1342E },
@@ -510,10 +522,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F50 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -587,6 +600,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_L)
diff --git a/tests/unictype/test-categ_Lm.c b/tests/unictype/test-categ_Lm.c
index 56264bceee..86a2f6cdae 100644
--- a/tests/unictype/test-categ_Lm.c
+++ b/tests/unictype/test-categ_Lm.c
@@ -73,7 +73,7 @@
     { 0xFF9E, 0xFF9F },
     { 0x16B40, 0x16B43 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 }
+    { 0x16FE0, 0x16FE1 }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lm)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-categ_Lo.c b/tests/unictype/test-categ_Lo.c
index 0b48353ad3..47b01f1120 100644
--- a/tests/unictype/test-categ_Lo.c
+++ b/tests/unictype/test-categ_Lo.c
@@ -39,6 +39,7 @@
     { 0x07CA, 0x07EA },
     { 0x0800, 0x0815 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -57,6 +58,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09F0, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -232,12 +234,12 @@
     { 0x309F, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FF, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA014 },
     { 0xA016, 0xA48C },
     { 0xA4D0, 0xA4F7 },
@@ -321,7 +323,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x10340 },
+    { 0x1032D, 0x10340 },
     { 0x10342, 0x10349 },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
@@ -399,11 +401,21 @@
     { 0x11680, 0x116AA },
     { 0x11700, 0x11719 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
     { 0x12000, 0x12399 },
     { 0x12480, 0x12543 },
     { 0x13000, 0x1342E },
@@ -418,7 +430,8 @@
     { 0x16F50, 0x16F50 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -461,6 +474,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lo)
diff --git a/tests/unictype/test-categ_M.c b/tests/unictype/test-categ_M.c
index eb9fd5fa47..ef659d3ac0 100644
--- a/tests/unictype/test-categ_M.c
+++ b/tests/unictype/test-categ_M.c
@@ -67,6 +67,7 @@
     { 0x0AC7, 0x0AC9 },
     { 0x0ACB, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3E, 0x0B44 },
@@ -92,7 +93,8 @@
     { 0x0CCA, 0x0CCD },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D3E, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4D },
@@ -158,8 +160,8 @@
     { 0x1CD4, 0x1CE8 },
     { 0x1CED, 0x1CED },
     { 0x1CF2, 0x1CF4 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1CF7, 0x1CF9 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x20D0, 0x20F0 },
     { 0x2CEF, 0x2CF1 },
@@ -238,10 +240,21 @@
     { 0x11630, 0x11640 },
     { 0x116AB, 0x116B7 },
     { 0x1171D, 0x1172B },
+    { 0x11A01, 0x11A0A },
+    { 0x11A33, 0x11A39 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A5B },
+    { 0x11A8A, 0x11A99 },
     { 0x11C2F, 0x11C36 },
     { 0x11C38, 0x11C3F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F51, 0x16F7E },
diff --git a/tests/unictype/test-categ_Mc.c b/tests/unictype/test-categ_Mc.c
index 9e86b85e31..9dc7ca858c 100644
--- a/tests/unictype/test-categ_Mc.c
+++ b/tests/unictype/test-categ_Mc.c
@@ -104,6 +104,7 @@
     { 0x1C34, 0x1C35 },
     { 0x1CE1, 0x1CE1 },
     { 0x1CF2, 0x1CF3 },
+    { 0x1CF7, 0x1CF7 },
     { 0x302E, 0x302F },
     { 0xA823, 0xA824 },
     { 0xA827, 0xA827 },
@@ -164,6 +165,10 @@
     { 0x116B6, 0x116B6 },
     { 0x11720, 0x11721 },
     { 0x11726, 0x11726 },
+    { 0x11A07, 0x11A08 },
+    { 0x11A39, 0x11A39 },
+    { 0x11A57, 0x11A58 },
+    { 0x11A97, 0x11A97 },
     { 0x11C2F, 0x11C2F },
     { 0x11C3E, 0x11C3E },
     { 0x11CA9, 0x11CA9 },
diff --git a/tests/unictype/test-categ_Mn.c b/tests/unictype/test-categ_Mn.c
index b2453cc9c9..c9449d7081 100644
--- a/tests/unictype/test-categ_Mn.c
+++ b/tests/unictype/test-categ_Mn.c
@@ -67,6 +67,7 @@
     { 0x0AC7, 0x0AC8 },
     { 0x0ACD, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B01 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3F, 0x0B3F },
@@ -89,7 +90,8 @@
     { 0x0CC6, 0x0CC6 },
     { 0x0CCC, 0x0CCD },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D01 },
+    { 0x0D00, 0x0D01 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D41, 0x0D44 },
     { 0x0D4D, 0x0D4D },
     { 0x0D62, 0x0D63 },
@@ -173,7 +175,7 @@
     { 0x1CED, 0x1CED },
     { 0x1CF4, 0x1CF4 },
     { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x20D0, 0x20DC },
     { 0x20E1, 0x20E1 },
@@ -272,6 +274,15 @@
     { 0x1171D, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
+    { 0x11A01, 0x11A06 },
+    { 0x11A09, 0x11A0A },
+    { 0x11A33, 0x11A38 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 },
+    { 0x11A59, 0x11A5B },
+    { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 },
     { 0x11C30, 0x11C36 },
     { 0x11C38, 0x11C3D },
     { 0x11C3F, 0x11C3F },
@@ -279,6 +290,11 @@
     { 0x11CAA, 0x11CB0 },
     { 0x11CB2, 0x11CB3 },
     { 0x11CB5, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F8F, 0x16F92 },
diff --git a/tests/unictype/test-categ_N.c b/tests/unictype/test-categ_N.c
index a153ac0720..0b38eb15ed 100644
--- a/tests/unictype/test-categ_N.c
+++ b/tests/unictype/test-categ_N.c
@@ -123,6 +123,7 @@
     { 0x11730, 0x1173B },
     { 0x118E0, 0x118F2 },
     { 0x11C50, 0x11C6C },
+    { 0x11D50, 0x11D59 },
     { 0x12400, 0x1246E },
     { 0x16A60, 0x16A69 },
     { 0x16B50, 0x16B59 },
diff --git a/tests/unictype/test-categ_Nd.c b/tests/unictype/test-categ_Nd.c
index 8dcf9a667d..85de8e34e8 100644
--- a/tests/unictype/test-categ_Nd.c
+++ b/tests/unictype/test-categ_Nd.c
@@ -67,6 +67,7 @@
     { 0x11730, 0x11739 },
     { 0x118E0, 0x118E9 },
     { 0x11C50, 0x11C59 },
+    { 0x11D50, 0x11D59 },
     { 0x16A60, 0x16A69 },
     { 0x16B50, 0x16B59 },
     { 0x1D7CE, 0x1D7FF },
diff --git a/tests/unictype/test-categ_P.c b/tests/unictype/test-categ_P.c
index 30e49fd65d..aa16e162b8 100644
--- a/tests/unictype/test-categ_P.c
+++ b/tests/unictype/test-categ_P.c
@@ -53,6 +53,7 @@
     { 0x085E, 0x085E },
     { 0x0964, 0x0965 },
     { 0x0970, 0x0970 },
+    { 0x09FD, 0x09FD },
     { 0x0AF0, 0x0AF0 },
     { 0x0DF4, 0x0DF4 },
     { 0x0E4F, 0x0E4F },
@@ -102,7 +103,7 @@
     { 0x2CFE, 0x2CFF },
     { 0x2D70, 0x2D70 },
     { 0x2E00, 0x2E2E },
-    { 0x2E30, 0x2E44 },
+    { 0x2E30, 0x2E49 },
     { 0x3001, 0x3003 },
     { 0x3008, 0x3011 },
     { 0x3014, 0x301F },
@@ -175,6 +176,9 @@
     { 0x11641, 0x11643 },
     { 0x11660, 0x1166C },
     { 0x1173C, 0x1173E },
+    { 0x11A3F, 0x11A46 },
+    { 0x11A9A, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x12470, 0x12474 },
diff --git a/tests/unictype/test-categ_Po.c b/tests/unictype/test-categ_Po.c
index fd0f1c4065..5408f41496 100644
--- a/tests/unictype/test-categ_Po.c
+++ b/tests/unictype/test-categ_Po.c
@@ -49,6 +49,7 @@
     { 0x085E, 0x085E },
     { 0x0964, 0x0965 },
     { 0x0970, 0x0970 },
+    { 0x09FD, 0x09FD },
     { 0x0AF0, 0x0AF0 },
     { 0x0DF4, 0x0DF4 },
     { 0x0E4F, 0x0E4F },
@@ -100,7 +101,7 @@
     { 0x2E30, 0x2E39 },
     { 0x2E3C, 0x2E3F },
     { 0x2E41, 0x2E41 },
-    { 0x2E43, 0x2E44 },
+    { 0x2E43, 0x2E49 },
     { 0x3001, 0x3003 },
     { 0x303D, 0x303D },
     { 0x30FB, 0x30FB },
@@ -172,6 +173,9 @@
     { 0x11641, 0x11643 },
     { 0x11660, 0x1166C },
     { 0x1173C, 0x1173E },
+    { 0x11A3F, 0x11A46 },
+    { 0x11A9A, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x12470, 0x12474 },
diff --git a/tests/unictype/test-categ_S.c b/tests/unictype/test-categ_S.c
index 8746edaab2..a832600dbe 100644
--- a/tests/unictype/test-categ_S.c
+++ b/tests/unictype/test-categ_S.c
@@ -86,7 +86,7 @@
     { 0x2052, 0x2052 },
     { 0x207A, 0x207C },
     { 0x208A, 0x208C },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x2100, 0x2101 },
     { 0x2103, 0x2106 },
     { 0x2108, 0x2109 },
@@ -104,8 +104,7 @@
     { 0x218A, 0x218B },
     { 0x2190, 0x2307 },
     { 0x230C, 0x2328 },
-    { 0x232B, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x232B, 0x2426 },
     { 0x2440, 0x244A },
     { 0x249C, 0x24E9 },
     { 0x2500, 0x2767 },
@@ -118,7 +117,7 @@
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2CE5, 0x2CEA },
     { 0x2E80, 0x2E99 },
@@ -217,9 +216,10 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -227,14 +227,13 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
-    { 0x1F9C0, 0x1F9C0 }
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
+    { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_S)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-categ_Sc.c b/tests/unictype/test-categ_Sc.c
index 3550701378..bfc099cdba 100644
--- a/tests/unictype/test-categ_Sc.c
+++ b/tests/unictype/test-categ_Sc.c
@@ -27,7 +27,7 @@
     { 0x0BF9, 0x0BF9 },
     { 0x0E3F, 0x0E3F },
     { 0x17DB, 0x17DB },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0xA838, 0xA838 },
     { 0xFDFC, 0xFDFC },
     { 0xFE69, 0xFE69 },
diff --git a/tests/unictype/test-categ_So.c b/tests/unictype/test-categ_So.c
index 6c4867070a..6831888413 100644
--- a/tests/unictype/test-categ_So.c
+++ b/tests/unictype/test-categ_So.c
@@ -82,8 +82,7 @@
     { 0x232B, 0x237B },
     { 0x237D, 0x239A },
     { 0x23B4, 0x23DB },
-    { 0x23E2, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x23E2, 0x2426 },
     { 0x2440, 0x244A },
     { 0x249C, 0x24E9 },
     { 0x2500, 0x25B6 },
@@ -99,7 +98,7 @@
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2CE5, 0x2CEA },
     { 0x2E80, 0x2E99 },
@@ -172,10 +171,11 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
+    { 0x1F260, 0x1F265 },
     { 0x1F300, 0x1F3FA },
-    { 0x1F400, 0x1F6D2 },
+    { 0x1F400, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -183,14 +183,13 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
-    { 0x1F9C0, 0x1F9C0 }
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
+    { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_So)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-ctype_alnum.c b/tests/unictype/test-ctype_alnum.c
index 31f64d9b1f..cca855925e 100644
--- a/tests/unictype/test-ctype_alnum.c
+++ b/tests/unictype/test-ctype_alnum.c
@@ -67,6 +67,7 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -86,6 +87,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09E6, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -335,12 +337,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -433,7 +435,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -526,12 +528,23 @@
     { 0x11730, 0x11739 },
     { 0x118A0, 0x118E9 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C50, 0x11C59 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -549,10 +562,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F50 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -634,6 +648,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_alnum (c)
diff --git a/tests/unictype/test-ctype_alpha.c b/tests/unictype/test-ctype_alpha.c
index be42c1df5b..bc928b6ef4 100644
--- a/tests/unictype/test-ctype_alpha.c
+++ b/tests/unictype/test-ctype_alpha.c
@@ -66,6 +66,7 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -85,6 +86,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09E6, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -334,12 +336,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -432,7 +434,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -525,12 +527,23 @@
     { 0x11730, 0x11739 },
     { 0x118A0, 0x118E9 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C50, 0x11C59 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -548,10 +561,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F50 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -633,6 +647,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_alpha (c)
diff --git a/tests/unictype/test-ctype_graph.c b/tests/unictype/test-ctype_graph.c
index f339b54b4d..57e880c5a5 100644
--- a/tests/unictype/test-ctype_graph.c
+++ b/tests/unictype/test-ctype_graph.c
@@ -41,6 +41,7 @@
     { 0x0830, 0x083E },
     { 0x0840, 0x085B },
     { 0x085E, 0x085E },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x08D4, 0x0983 },
@@ -56,7 +57,7 @@
     { 0x09D7, 0x09D7 },
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E3 },
-    { 0x09E6, 0x09FB },
+    { 0x09E6, 0x09FD },
     { 0x0A01, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -86,7 +87,7 @@
     { 0x0AD0, 0x0AD0 },
     { 0x0AE0, 0x0AE3 },
     { 0x0AE6, 0x0AF1 },
-    { 0x0AF9, 0x0AF9 },
+    { 0x0AF9, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B05, 0x0B0C },
     { 0x0B0F, 0x0B10 },
@@ -143,11 +144,10 @@
     { 0x0CE0, 0x0CE3 },
     { 0x0CE6, 0x0CEF },
     { 0x0CF1, 0x0CF2 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D05, 0x0D0C },
     { 0x0D0E, 0x0D10 },
-    { 0x0D12, 0x0D3A },
-    { 0x0D3D, 0x0D44 },
+    { 0x0D12, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4F },
     { 0x0D54, 0x0D63 },
@@ -254,9 +254,8 @@
     { 0x1C3B, 0x1C49 },
     { 0x1C4D, 0x1C88 },
     { 0x1CC0, 0x1CC7 },
-    { 0x1CD0, 0x1CF6 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1D00, 0x1DF5 },
+    { 0x1CD0, 0x1CF9 },
+    { 0x1D00, 0x1DF9 },
     { 0x1DFB, 0x1F15 },
     { 0x1F18, 0x1F1D },
     { 0x1F20, 0x1F45 },
@@ -280,17 +279,16 @@
     { 0x2066, 0x2071 },
     { 0x2074, 0x208E },
     { 0x2090, 0x209C },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x20D0, 0x20F0 },
     { 0x2100, 0x218B },
-    { 0x2190, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x2190, 0x2426 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2C00, 0x2C2E },
     { 0x2C30, 0x2C5E },
@@ -309,7 +307,7 @@
     { 0x2DC8, 0x2DCE },
     { 0x2DD0, 0x2DD6 },
     { 0x2DD8, 0x2DDE },
-    { 0x2DE0, 0x2E44 },
+    { 0x2DE0, 0x2E49 },
     { 0x2E80, 0x2E99 },
     { 0x2E9B, 0x2EF3 },
     { 0x2F00, 0x2FD5 },
@@ -317,14 +315,14 @@
     { 0x3001, 0x303F },
     { 0x3041, 0x3096 },
     { 0x3099, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x3190, 0x31BA },
     { 0x31C0, 0x31E3 },
     { 0x31F0, 0x321E },
     { 0x3220, 0x32FE },
     { 0x3300, 0x4DB5 },
-    { 0x4DC0, 0x9FD5 },
+    { 0x4DC0, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA490, 0xA4C6 },
     { 0xA4D0, 0xA62B },
@@ -404,7 +402,7 @@
     { 0x102A0, 0x102D0 },
     { 0x102E0, 0x102FB },
     { 0x10300, 0x10323 },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x1037A },
     { 0x10380, 0x1039D },
     { 0x1039F, 0x103C3 },
@@ -508,6 +506,10 @@
     { 0x11730, 0x1173F },
     { 0x118A0, 0x118F2 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A47 },
+    { 0x11A50, 0x11A83 },
+    { 0x11A86, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
@@ -516,6 +518,13 @@
     { 0x11C70, 0x11C8F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D47 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12470, 0x12474 },
@@ -536,10 +545,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -632,9 +642,10 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -642,18 +653,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
     { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 },
     { 0x20000, 0x2A6D6 },
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D },
     { 0xE0001, 0xE0001 },
     { 0xE0020, 0xE007F },
diff --git a/tests/unictype/test-ctype_print.c b/tests/unictype/test-ctype_print.c
index 0bff57e8e0..ac4c3471c9 100644
--- a/tests/unictype/test-ctype_print.c
+++ b/tests/unictype/test-ctype_print.c
@@ -41,6 +41,7 @@
     { 0x0830, 0x083E },
     { 0x0840, 0x085B },
     { 0x085E, 0x085E },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x08D4, 0x0983 },
@@ -56,7 +57,7 @@
     { 0x09D7, 0x09D7 },
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E3 },
-    { 0x09E6, 0x09FB },
+    { 0x09E6, 0x09FD },
     { 0x0A01, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -86,7 +87,7 @@
     { 0x0AD0, 0x0AD0 },
     { 0x0AE0, 0x0AE3 },
     { 0x0AE6, 0x0AF1 },
-    { 0x0AF9, 0x0AF9 },
+    { 0x0AF9, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B05, 0x0B0C },
     { 0x0B0F, 0x0B10 },
@@ -143,11 +144,10 @@
     { 0x0CE0, 0x0CE3 },
     { 0x0CE6, 0x0CEF },
     { 0x0CF1, 0x0CF2 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D05, 0x0D0C },
     { 0x0D0E, 0x0D10 },
-    { 0x0D12, 0x0D3A },
-    { 0x0D3D, 0x0D44 },
+    { 0x0D12, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4F },
     { 0x0D54, 0x0D63 },
@@ -253,9 +253,8 @@
     { 0x1C3B, 0x1C49 },
     { 0x1C4D, 0x1C88 },
     { 0x1CC0, 0x1CC7 },
-    { 0x1CD0, 0x1CF6 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1D00, 0x1DF5 },
+    { 0x1CD0, 0x1CF9 },
+    { 0x1D00, 0x1DF9 },
     { 0x1DFB, 0x1F15 },
     { 0x1F18, 0x1F1D },
     { 0x1F20, 0x1F45 },
@@ -277,17 +276,16 @@
     { 0x2066, 0x2071 },
     { 0x2074, 0x208E },
     { 0x2090, 0x209C },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x20D0, 0x20F0 },
     { 0x2100, 0x218B },
-    { 0x2190, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x2190, 0x2426 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2C00, 0x2C2E },
     { 0x2C30, 0x2C5E },
@@ -306,7 +304,7 @@
     { 0x2DC8, 0x2DCE },
     { 0x2DD0, 0x2DD6 },
     { 0x2DD8, 0x2DDE },
-    { 0x2DE0, 0x2E44 },
+    { 0x2DE0, 0x2E49 },
     { 0x2E80, 0x2E99 },
     { 0x2E9B, 0x2EF3 },
     { 0x2F00, 0x2FD5 },
@@ -314,14 +312,14 @@
     { 0x3000, 0x303F },
     { 0x3041, 0x3096 },
     { 0x3099, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x3190, 0x31BA },
     { 0x31C0, 0x31E3 },
     { 0x31F0, 0x321E },
     { 0x3220, 0x32FE },
     { 0x3300, 0x4DB5 },
-    { 0x4DC0, 0x9FD5 },
+    { 0x4DC0, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA490, 0xA4C6 },
     { 0xA4D0, 0xA62B },
@@ -401,7 +399,7 @@
     { 0x102A0, 0x102D0 },
     { 0x102E0, 0x102FB },
     { 0x10300, 0x10323 },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x1037A },
     { 0x10380, 0x1039D },
     { 0x1039F, 0x103C3 },
@@ -505,6 +503,10 @@
     { 0x11730, 0x1173F },
     { 0x118A0, 0x118F2 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A47 },
+    { 0x11A50, 0x11A83 },
+    { 0x11A86, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
@@ -513,6 +515,13 @@
     { 0x11C70, 0x11C8F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D47 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12470, 0x12474 },
@@ -533,10 +542,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -629,9 +639,10 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -639,18 +650,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
     { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 },
     { 0x20000, 0x2A6D6 },
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D },
     { 0xE0001, 0xE0001 },
     { 0xE0020, 0xE007F },
diff --git a/tests/unictype/test-ctype_punct.c b/tests/unictype/test-ctype_punct.c
index f027755e44..29b9ee0002 100644
--- a/tests/unictype/test-ctype_punct.c
+++ b/tests/unictype/test-ctype_punct.c
@@ -81,6 +81,7 @@
     { 0x09D7, 0x09D7 },
     { 0x09E2, 0x09E3 },
     { 0x09F2, 0x09FB },
+    { 0x09FD, 0x09FD },
     { 0x0A01, 0x0A03 },
     { 0x0A3C, 0x0A3C },
     { 0x0A3E, 0x0A42 },
@@ -96,6 +97,7 @@
     { 0x0ACB, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
     { 0x0AF0, 0x0AF1 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3E, 0x0B44 },
@@ -125,7 +127,8 @@
     { 0x0CCA, 0x0CCD },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D3E, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4D },
@@ -211,8 +214,8 @@
     { 0x1CD0, 0x1CE8 },
     { 0x1CED, 0x1CED },
     { 0x1CF2, 0x1CF4 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1CF7, 0x1CF9 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x1FBD, 0x1FBD },
     { 0x1FBF, 0x1FC1 },
@@ -227,7 +230,7 @@
     { 0x2066, 0x2070 },
     { 0x2074, 0x207E },
     { 0x2080, 0x208E },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x20D0, 0x20F0 },
     { 0x2100, 0x2101 },
     { 0x2103, 0x2106 },
@@ -243,15 +246,14 @@
     { 0x214A, 0x214D },
     { 0x214F, 0x215F },
     { 0x2189, 0x218B },
-    { 0x2190, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x2190, 0x2426 },
     { 0x2440, 0x244A },
     { 0x2460, 0x249B },
     { 0x24EA, 0x2B73 },
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2CE5, 0x2CEA },
     { 0x2CEF, 0x2CF1 },
@@ -259,7 +261,7 @@
     { 0x2D70, 0x2D70 },
     { 0x2D7F, 0x2D7F },
     { 0x2DE0, 0x2E2E },
-    { 0x2E30, 0x2E44 },
+    { 0x2E30, 0x2E49 },
     { 0x2E80, 0x2E99 },
     { 0x2E9B, 0x2EF3 },
     { 0x2F00, 0x2FD5 },
@@ -423,6 +425,12 @@
     { 0x1171D, 0x1172B },
     { 0x1173A, 0x1173F },
     { 0x118EA, 0x118F2 },
+    { 0x11A01, 0x11A0A },
+    { 0x11A33, 0x11A39 },
+    { 0x11A3B, 0x11A47 },
+    { 0x11A51, 0x11A5B },
+    { 0x11A8A, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11C2F, 0x11C36 },
     { 0x11C38, 0x11C3F },
     { 0x11C41, 0x11C45 },
@@ -430,6 +438,11 @@
     { 0x11C70, 0x11C71 },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x12470, 0x12474 },
     { 0x16A6E, 0x16A6F },
     { 0x16AF0, 0x16AF5 },
@@ -483,9 +496,10 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -493,14 +507,13 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
     { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 },
     { 0xE0001, 0xE0001 },
     { 0xE0020, 0xE007F },
     { 0xE0100, 0xE01EF },
diff --git a/tests/unictype/test-decdigit.h b/tests/unictype/test-decdigit.h
index 395bcdbed7..8c856c4003 100644
--- a/tests/unictype/test-decdigit.h
+++ b/tests/unictype/test-decdigit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decimal digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -517,6 +517,16 @@
     { 0x11C57, 7 },
     { 0x11C58, 8 },
     { 0x11C59, 9 },
+    { 0x11D50, 0 },
+    { 0x11D51, 1 },
+    { 0x11D52, 2 },
+    { 0x11D53, 3 },
+    { 0x11D54, 4 },
+    { 0x11D55, 5 },
+    { 0x11D56, 6 },
+    { 0x11D57, 7 },
+    { 0x11D58, 8 },
+    { 0x11D59, 9 },
     { 0x16A60, 0 },
     { 0x16A61, 1 },
     { 0x16A62, 2 },
diff --git a/tests/unictype/test-digit.h b/tests/unictype/test-digit.h
index 919178c64a..0c5c23b376 100644
--- a/tests/unictype/test-digit.h
+++ b/tests/unictype/test-digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -634,6 +634,16 @@
     { 0x11C57, 7 },
     { 0x11C58, 8 },
     { 0x11C59, 9 },
+    { 0x11D50, 0 },
+    { 0x11D51, 1 },
+    { 0x11D52, 2 },
+    { 0x11D53, 3 },
+    { 0x11D54, 4 },
+    { 0x11D55, 5 },
+    { 0x11D56, 6 },
+    { 0x11D57, 7 },
+    { 0x11D58, 8 },
+    { 0x11D59, 9 },
     { 0x16A60, 0 },
     { 0x16A61, 1 },
     { 0x16A62, 2 },
diff --git a/tests/unictype/test-joininggroup_of.h b/tests/unictype/test-joininggroup_of.h
index e67102e444..d370bacac1 100644
--- a/tests/unictype/test-joininggroup_of.h
+++ b/tests/unictype/test-joininggroup_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining group of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -247,6 +247,17 @@
     { 0x077D, UC_JOINING_GROUP_SEEN },
     { 0x077E, UC_JOINING_GROUP_SEEN },
     { 0x077F, UC_JOINING_GROUP_KAF },
+    { 0x0860, UC_JOINING_GROUP_MALAYALAM_NGA },
+    { 0x0861, UC_JOINING_GROUP_MALAYALAM_JA },
+    { 0x0862, UC_JOINING_GROUP_MALAYALAM_NYA },
+    { 0x0863, UC_JOINING_GROUP_MALAYALAM_TTA },
+    { 0x0864, UC_JOINING_GROUP_MALAYALAM_NNA },
+    { 0x0865, UC_JOINING_GROUP_MALAYALAM_NNNA },
+    { 0x0866, UC_JOINING_GROUP_MALAYALAM_BHA },
+    { 0x0867, UC_JOINING_GROUP_MALAYALAM_RA },
+    { 0x0868, UC_JOINING_GROUP_MALAYALAM_LLA },
+    { 0x0869, UC_JOINING_GROUP_MALAYALAM_LLLA },
+    { 0x086A, UC_JOINING_GROUP_MALAYALAM_SSA },
     { 0x08A0, UC_JOINING_GROUP_BEH },
     { 0x08A1, UC_JOINING_GROUP_BEH },
     { 0x08A2, UC_JOINING_GROUP_HAH },
diff --git a/tests/unictype/test-joiningtype_of.h b/tests/unictype/test-joiningtype_of.h
index 58b7baf792..6e06ccc91b 100644
--- a/tests/unictype/test-joiningtype_of.h
+++ b/tests/unictype/test-joiningtype_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining type of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -318,6 +318,17 @@
     { 0x0856, UC_JOINING_TYPE_U },
     { 0x0857, UC_JOINING_TYPE_U },
     { 0x0858, UC_JOINING_TYPE_U },
+    { 0x0860, UC_JOINING_TYPE_D },
+    { 0x0861, UC_JOINING_TYPE_U },
+    { 0x0862, UC_JOINING_TYPE_D },
+    { 0x0863, UC_JOINING_TYPE_D },
+    { 0x0864, UC_JOINING_TYPE_D },
+    { 0x0865, UC_JOINING_TYPE_D },
+    { 0x0866, UC_JOINING_TYPE_U },
+    { 0x0867, UC_JOINING_TYPE_R },
+    { 0x0868, UC_JOINING_TYPE_D },
+    { 0x0869, UC_JOINING_TYPE_R },
+    { 0x086A, UC_JOINING_TYPE_R },
     { 0x08A0, UC_JOINING_TYPE_D },
     { 0x08A1, UC_JOINING_TYPE_D },
     { 0x08A2, UC_JOINING_TYPE_D },
diff --git a/tests/unictype/test-numeric.h b/tests/unictype/test-numeric.h
index c4b3918c4c..2794d31460 100644
--- a/tests/unictype/test-numeric.h
+++ b/tests/unictype/test-numeric.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Numeric values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 9.0.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 10.0.0.  */
 
 /* Copyright (C) 2000-2021 Free Software Foundation, Inc.
 
@@ -1278,6 +1278,16 @@
     { 0x11C6A, 80, 1 },
     { 0x11C6B, 90, 1 },
     { 0x11C6C, 100, 1 },
+    { 0x11D50, 0, 1 },
+    { 0x11D51, 1, 1 },
+    { 0x11D52, 2, 1 },
+    { 0x11D53, 3, 1 },
+    { 0x11D54, 4, 1 },
+    { 0x11D55, 5, 1 },
+    { 0x11D56, 6, 1 },
+    { 0x11D57, 7, 1 },
+    { 0x11D58, 8, 1 },
+    { 0x11D59, 9, 1 },
     { 0x12400, 2, 1 },
     { 0x12401, 3, 1 },
     { 0x12402, 4, 1 },
diff --git a/tests/unictype/test-pr_alphabetic.c b/tests/unictype/test-pr_alphabetic.c
index 474a4511e3..aacbcea91a 100644
--- a/tests/unictype/test-pr_alphabetic.c
+++ b/tests/unictype/test-pr_alphabetic.c
@@ -68,6 +68,7 @@
     { 0x0800, 0x0817 },
     { 0x081A, 0x082C },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x08D4, 0x08DF },
@@ -91,6 +92,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E3 },
     { 0x09F0, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A01, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -118,7 +120,7 @@
     { 0x0ACB, 0x0ACC },
     { 0x0AD0, 0x0AD0 },
     { 0x0AE0, 0x0AE3 },
-    { 0x0AF9, 0x0AF9 },
+    { 0x0AF9, 0x0AFC },
     { 0x0B01, 0x0B03 },
     { 0x0B05, 0x0B0C },
     { 0x0B0F, 0x0B10 },
@@ -172,7 +174,7 @@
     { 0x0CDE, 0x0CDE },
     { 0x0CE0, 0x0CE3 },
     { 0x0CF1, 0x0CF2 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D05, 0x0D0C },
     { 0x0D0E, 0x0D10 },
     { 0x0D12, 0x0D3A },
@@ -363,12 +365,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -456,7 +458,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x1037A },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -550,6 +552,10 @@
     { 0x1171D, 0x1172A },
     { 0x118A0, 0x118DF },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A32 },
+    { 0x11A35, 0x11A3E },
+    { 0x11A50, 0x11A83 },
+    { 0x11A86, 0x11A97 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
@@ -558,6 +564,14 @@
     { 0x11C72, 0x11C8F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D41 },
+    { 0x11D43, 0x11D43 },
+    { 0x11D46, 0x11D47 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -573,10 +587,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -660,6 +675,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_property_alphabetic (c)
diff --git a/tests/unictype/test-pr_bidi_arabic_right_to_left.c b/tests/unictype/test-pr_bidi_arabic_right_to_left.c
index 79247df022..118c12c20a 100644
--- a/tests/unictype/test-pr_bidi_arabic_right_to_left.c
+++ b/tests/unictype/test-pr_bidi_arabic_right_to_left.c
@@ -29,6 +29,7 @@
     { 0x0712, 0x072F },
     { 0x074B, 0x07A5 },
     { 0x07B1, 0x07BF },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x2065, 0x2065 },
diff --git a/tests/unictype/test-pr_bidi_eur_num_terminator.c b/tests/unictype/test-pr_bidi_eur_num_terminator.c
index 89b01e4825..92e58f1e7c 100644
--- a/tests/unictype/test-pr_bidi_eur_num_terminator.c
+++ b/tests/unictype/test-pr_bidi_eur_num_terminator.c
@@ -30,7 +30,7 @@
     { 0x0E3F, 0x0E3F },
     { 0x17DB, 0x17DB },
     { 0x2030, 0x2034 },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x212E, 0x212E },
     { 0x2213, 0x2213 },
     { 0xA838, 0xA839 },
diff --git a/tests/unictype/test-pr_bidi_hebrew_right_to_left.c b/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
index 6141319e67..ec9267fe7c 100644
--- a/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
+++ b/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
@@ -30,7 +30,8 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x082E, 0x0858 },
-    { 0x085C, 0x089F },
+    { 0x085C, 0x085F },
+    { 0x086B, 0x089F },
     { 0x08B5, 0x08B5 },
     { 0x08BE, 0x08D3 },
     { 0x200F, 0x200F },
diff --git a/tests/unictype/test-pr_bidi_left_to_right.c b/tests/unictype/test-pr_bidi_left_to_right.c
index 3b0e39fde1..76db9a511c 100644
--- a/tests/unictype/test-pr_bidi_left_to_right.c
+++ b/tests/unictype/test-pr_bidi_left_to_right.c
@@ -65,7 +65,8 @@
     { 0x0AC9, 0x0ACC },
     { 0x0ACE, 0x0AE1 },
     { 0x0AE4, 0x0AF0 },
-    { 0x0AF2, 0x0B00 },
+    { 0x0AF2, 0x0AF9 },
+    { 0x0B00, 0x0B00 },
     { 0x0B02, 0x0B3B },
     { 0x0B3D, 0x0B3E },
     { 0x0B40, 0x0B40 },
@@ -87,8 +88,9 @@
     { 0x0C82, 0x0CBB },
     { 0x0CBD, 0x0CCB },
     { 0x0CCE, 0x0CE1 },
-    { 0x0CE4, 0x0D00 },
-    { 0x0D02, 0x0D40 },
+    { 0x0CE4, 0x0CFF },
+    { 0x0D02, 0x0D3A },
+    { 0x0D3D, 0x0D40 },
     { 0x0D45, 0x0D4C },
     { 0x0D4E, 0x0D61 },
     { 0x0D64, 0x0DC9 },
@@ -182,7 +184,7 @@
     { 0x1CEE, 0x1CF3 },
     { 0x1CF5, 0x1CF7 },
     { 0x1CFA, 0x1DBF },
-    { 0x1DF6, 0x1DFA },
+    { 0x1DFA, 0x1DFA },
     { 0x1E00, 0x1FBC },
     { 0x1FBE, 0x1FBE },
     { 0x1FC2, 0x1FCC },
@@ -194,7 +196,7 @@
     { 0x2071, 0x2073 },
     { 0x207F, 0x207F },
     { 0x208F, 0x209F },
-    { 0x20BF, 0x20CF },
+    { 0x20C0, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x2102, 0x2102 },
     { 0x2107, 0x2107 },
@@ -213,7 +215,6 @@
     { 0x218C, 0x218F },
     { 0x2336, 0x237A },
     { 0x2395, 0x2395 },
-    { 0x23FF, 0x23FF },
     { 0x2427, 0x243F },
     { 0x244B, 0x245F },
     { 0x249C, 0x24E9 },
@@ -223,13 +224,13 @@
     { 0x2B96, 0x2B97 },
     { 0x2BBA, 0x2BBC },
     { 0x2BC9, 0x2BC9 },
-    { 0x2BD2, 0x2BEB },
+    { 0x2BD3, 0x2BEB },
     { 0x2BF0, 0x2CE4 },
     { 0x2CEB, 0x2CEE },
     { 0x2CF2, 0x2CF8 },
     { 0x2D00, 0x2D7E },
     { 0x2D80, 0x2DDF },
-    { 0x2E45, 0x2E7F },
+    { 0x2E4A, 0x2E7F },
     { 0x2E9A, 0x2E9A },
     { 0x2EF4, 0x2EFF },
     { 0x2FD6, 0x2FEF },
@@ -352,13 +353,27 @@
     { 0x116B8, 0x1171C },
     { 0x11720, 0x11721 },
     { 0x11726, 0x11726 },
-    { 0x1172C, 0x11C2F },
+    { 0x1172C, 0x11A00 },
+    { 0x11A07, 0x11A08 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A39, 0x11A3A },
+    { 0x11A3F, 0x11A46 },
+    { 0x11A48, 0x11A50 },
+    { 0x11A57, 0x11A58 },
+    { 0x11A5C, 0x11A89 },
+    { 0x11A97, 0x11A97 },
+    { 0x11A9A, 0x11C2F },
     { 0x11C37, 0x11C37 },
     { 0x11C3E, 0x11C91 },
     { 0x11CA8, 0x11CA9 },
     { 0x11CB1, 0x11CB1 },
     { 0x11CB4, 0x11CB4 },
-    { 0x11CB7, 0x16AEF },
+    { 0x11CB7, 0x11D30 },
+    { 0x11D37, 0x11D39 },
+    { 0x11D3B, 0x11D3B },
+    { 0x11D3E, 0x11D3E },
+    { 0x11D46, 0x11D46 },
+    { 0x11D48, 0x16AEF },
     { 0x16AF5, 0x16B2F },
     { 0x16B37, 0x16F8E },
     { 0x16F93, 0x1BC9C },
@@ -433,25 +448,25 @@
     { 0x1F0D0, 0x1F0D0 },
     { 0x1F0F6, 0x1F0FF },
     { 0x1F10D, 0x1F169 },
-    { 0x1F16C, 0x1F2FF },
-    { 0x1F6D3, 0x1F6DF },
+    { 0x1F16C, 0x1F25F },
+    { 0x1F266, 0x1F2FF },
+    { 0x1F6D5, 0x1F6DF },
     { 0x1F6ED, 0x1F6EF },
-    { 0x1F6F7, 0x1F6FF },
+    { 0x1F6F9, 0x1F6FF },
     { 0x1F774, 0x1F77F },
     { 0x1F7D5, 0x1F7FF },
     { 0x1F80C, 0x1F80F },
     { 0x1F848, 0x1F84F },
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
-    { 0x1F8AE, 0x1F90F },
-    { 0x1F91F, 0x1F91F },
-    { 0x1F928, 0x1F92F },
-    { 0x1F931, 0x1F932 },
+    { 0x1F8AE, 0x1F8FF },
+    { 0x1F90C, 0x1F90F },
     { 0x1F93F, 0x1F93F },
-    { 0x1F94C, 0x1F94F },
-    { 0x1F95F, 0x1F97F },
-    { 0x1F992, 0x1F9BF },
-    { 0x1F9C1, 0x1FFFD },
+    { 0x1F94D, 0x1F94F },
+    { 0x1F96C, 0x1F97F },
+    { 0x1F998, 0x1F9BF },
+    { 0x1F9C1, 0x1F9CF },
+    { 0x1F9E7, 0x1FFFD },
     { 0x20000, 0x2FFFD },
     { 0x30000, 0x3FFFD },
     { 0x40000, 0x4FFFD },
diff --git a/tests/unictype/test-pr_bidi_non_spacing_mark.c b/tests/unictype/test-pr_bidi_non_spacing_mark.c
index 931eddf886..33cf1ccdbf 100644
--- a/tests/unictype/test-pr_bidi_non_spacing_mark.c
+++ b/tests/unictype/test-pr_bidi_non_spacing_mark.c
@@ -67,6 +67,7 @@
     { 0x0AC7, 0x0AC8 },
     { 0x0ACD, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B01 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3F, 0x0B3F },
@@ -87,7 +88,8 @@
     { 0x0CBC, 0x0CBC },
     { 0x0CCC, 0x0CCD },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D01 },
+    { 0x0D00, 0x0D01 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D41, 0x0D44 },
     { 0x0D4D, 0x0D4D },
     { 0x0D62, 0x0D63 },
@@ -171,7 +173,7 @@
     { 0x1CED, 0x1CED },
     { 0x1CF4, 0x1CF4 },
     { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x20D0, 0x20F0 },
     { 0x2CEF, 0x2CF1 },
@@ -268,12 +270,26 @@
     { 0x1171D, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
+    { 0x11A01, 0x11A06 },
+    { 0x11A09, 0x11A0A },
+    { 0x11A33, 0x11A38 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 },
+    { 0x11A59, 0x11A5B },
+    { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 },
     { 0x11C30, 0x11C36 },
     { 0x11C38, 0x11C3D },
     { 0x11C92, 0x11CA7 },
     { 0x11CAA, 0x11CB0 },
     { 0x11CB2, 0x11CB3 },
     { 0x11CB5, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F8F, 0x16F92 },
diff --git a/tests/unictype/test-pr_bidi_other_neutral.c b/tests/unictype/test-pr_bidi_other_neutral.c
index 1638e2fd7e..19b9344f8c 100644
--- a/tests/unictype/test-pr_bidi_other_neutral.c
+++ b/tests/unictype/test-pr_bidi_other_neutral.c
@@ -88,8 +88,7 @@
     { 0x2190, 0x2211 },
     { 0x2214, 0x2335 },
     { 0x237B, 0x2394 },
-    { 0x2396, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x2396, 0x2426 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2487 },
     { 0x24EA, 0x26AB },
@@ -98,11 +97,11 @@
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2CE5, 0x2CEA },
     { 0x2CF9, 0x2CFF },
-    { 0x2E00, 0x2E44 },
+    { 0x2E00, 0x2E49 },
     { 0x2E80, 0x2E99 },
     { 0x2E9B, 0x2EF3 },
     { 0x2F00, 0x2FD5 },
@@ -177,9 +176,10 @@
     { 0x1F0D1, 0x1F0F5 },
     { 0x1F10B, 0x1F10C },
     { 0x1F16A, 0x1F16B },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -187,14 +187,13 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
-    { 0x1F9C0, 0x1F9C0 }
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
+    { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 }
 
 #define PREDICATE(c) uc_is_property_bidi_other_neutral (c)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_case_ignorable.c b/tests/unictype/test-pr_case_ignorable.c
index d846bbe732..06ec1bafe7 100644
--- a/tests/unictype/test-pr_case_ignorable.c
+++ b/tests/unictype/test-pr_case_ignorable.c
@@ -84,6 +84,7 @@
     { 0x0AC7, 0x0AC8 },
     { 0x0ACD, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B01 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3F, 0x0B3F },
@@ -106,7 +107,8 @@
     { 0x0CC6, 0x0CC6 },
     { 0x0CCC, 0x0CCD },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D01 },
+    { 0x0D00, 0x0D01 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D41, 0x0D44 },
     { 0x0D4D, 0x0D4D },
     { 0x0D62, 0x0D63 },
@@ -198,7 +200,7 @@
     { 0x1CF8, 0x1CF9 },
     { 0x1D2C, 0x1D6A },
     { 0x1D78, 0x1D78 },
-    { 0x1D9B, 0x1DF5 },
+    { 0x1D9B, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x1FBD, 0x1FBD },
     { 0x1FBF, 0x1FC1 },
@@ -346,6 +348,15 @@
     { 0x1171D, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
+    { 0x11A01, 0x11A06 },
+    { 0x11A09, 0x11A0A },
+    { 0x11A33, 0x11A38 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 },
+    { 0x11A59, 0x11A5B },
+    { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 },
     { 0x11C30, 0x11C36 },
     { 0x11C38, 0x11C3D },
     { 0x11C3F, 0x11C3F },
@@ -353,11 +364,16 @@
     { 0x11CAA, 0x11CB0 },
     { 0x11CB2, 0x11CB3 },
     { 0x11CB5, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16B40, 0x16B43 },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x1BC9D, 0x1BC9E },
     { 0x1BCA0, 0x1BCA3 },
     { 0x1D167, 0x1D169 },
diff --git a/tests/unictype/test-pr_combining.c b/tests/unictype/test-pr_combining.c
index 85c2531d8c..fc443cc416 100644
--- a/tests/unictype/test-pr_combining.c
+++ b/tests/unictype/test-pr_combining.c
@@ -67,6 +67,7 @@
     { 0x0AC7, 0x0AC9 },
     { 0x0ACB, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3E, 0x0B44 },
@@ -92,7 +93,8 @@
     { 0x0CCA, 0x0CCD },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D3E, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4D },
@@ -158,8 +160,8 @@
     { 0x1CD4, 0x1CE8 },
     { 0x1CED, 0x1CED },
     { 0x1CF2, 0x1CF4 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1CF7, 0x1CF9 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x20D0, 0x20F0 },
     { 0x2CEF, 0x2CF1 },
@@ -238,10 +240,21 @@
     { 0x11630, 0x11640 },
     { 0x116AB, 0x116B7 },
     { 0x1171D, 0x1172B },
+    { 0x11A01, 0x11A0A },
+    { 0x11A33, 0x11A39 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A5B },
+    { 0x11A8A, 0x11A99 },
     { 0x11C2F, 0x11C36 },
     { 0x11C38, 0x11C3F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F51, 0x16F7E },
diff --git a/tests/unictype/test-pr_currency_symbol.c b/tests/unictype/test-pr_currency_symbol.c
index aa644ce0da..05741ae41c 100644
--- a/tests/unictype/test-pr_currency_symbol.c
+++ b/tests/unictype/test-pr_currency_symbol.c
@@ -27,7 +27,7 @@
     { 0x0BF9, 0x0BF9 },
     { 0x0E3F, 0x0E3F },
     { 0x17DB, 0x17DB },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0xA838, 0xA838 },
     { 0xFDFC, 0xFDFC },
     { 0xFE69, 0xFE69 },
diff --git a/tests/unictype/test-pr_decimal_digit.c b/tests/unictype/test-pr_decimal_digit.c
index 6c15dc3dbd..d9d08e6b44 100644
--- a/tests/unictype/test-pr_decimal_digit.c
+++ b/tests/unictype/test-pr_decimal_digit.c
@@ -67,6 +67,7 @@
     { 0x11730, 0x11739 },
     { 0x118E0, 0x118E9 },
     { 0x11C50, 0x11C59 },
+    { 0x11D50, 0x11D59 },
     { 0x16A60, 0x16A69 },
     { 0x16B50, 0x16B59 },
     { 0x1D7CE, 0x1D7FF },
diff --git a/tests/unictype/test-pr_diacritic.c b/tests/unictype/test-pr_diacritic.c
index 273dec0014..19756fc8eb 100644
--- a/tests/unictype/test-pr_diacritic.c
+++ b/tests/unictype/test-pr_diacritic.c
@@ -56,12 +56,14 @@
     { 0x0A4D, 0x0A4D },
     { 0x0ABC, 0x0ABC },
     { 0x0ACD, 0x0ACD },
+    { 0x0AFD, 0x0AFF },
     { 0x0B3C, 0x0B3C },
     { 0x0B4D, 0x0B4D },
     { 0x0BCD, 0x0BCD },
     { 0x0C4D, 0x0C4D },
     { 0x0CBC, 0x0CBC },
     { 0x0CCD, 0x0CCD },
+    { 0x0D3B, 0x0D3C },
     { 0x0D4D, 0x0D4D },
     { 0x0DCA, 0x0DCA },
     { 0x0E47, 0x0E4C },
@@ -95,10 +97,10 @@
     { 0x1CD0, 0x1CE8 },
     { 0x1CED, 0x1CED },
     { 0x1CF4, 0x1CF4 },
-    { 0x1CF8, 0x1CF9 },
+    { 0x1CF7, 0x1CF9 },
     { 0x1D2C, 0x1D6A },
     { 0x1DC4, 0x1DCF },
-    { 0x1DF5, 0x1DF5 },
+    { 0x1DF5, 0x1DF9 },
     { 0x1DFD, 0x1DFF },
     { 0x1FBD, 0x1FBD },
     { 0x1FBF, 0x1FC1 },
@@ -158,7 +160,12 @@
     { 0x1163F, 0x1163F },
     { 0x116B6, 0x116B7 },
     { 0x1172B, 0x1172B },
+    { 0x11A34, 0x11A34 },
+    { 0x11A47, 0x11A47 },
+    { 0x11A99, 0x11A99 },
     { 0x11C3F, 0x11C3F },
+    { 0x11D42, 0x11D42 },
+    { 0x11D44, 0x11D45 },
     { 0x16AF0, 0x16AF4 },
     { 0x16F8F, 0x16F9F },
     { 0x1D167, 0x1D169 },
diff --git a/tests/unictype/test-pr_extender.c b/tests/unictype/test-pr_extender.c
index f6d95d1f94..5746ae0dfb 100644
--- a/tests/unictype/test-pr_extender.c
+++ b/tests/unictype/test-pr_extender.c
@@ -42,8 +42,9 @@
     { 0xFF70, 0xFF70 },
     { 0x1135D, 0x1135D },
     { 0x115C6, 0x115C8 },
+    { 0x11A98, 0x11A98 },
     { 0x16B42, 0x16B43 },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x1E944, 0x1E946 }
 
 #define PREDICATE(c) uc_is_property_extender (c)
diff --git a/tests/unictype/test-pr_grapheme_base.c b/tests/unictype/test-pr_grapheme_base.c
index bb5031d3b5..282cd46d88 100644
--- a/tests/unictype/test-pr_grapheme_base.c
+++ b/tests/unictype/test-pr_grapheme_base.c
@@ -60,6 +60,7 @@
     { 0x0830, 0x083E },
     { 0x0840, 0x0858 },
     { 0x085E, 0x085E },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0903, 0x0939 },
@@ -83,7 +84,7 @@
     { 0x09CE, 0x09CE },
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
-    { 0x09E6, 0x09FB },
+    { 0x09E6, 0x09FD },
     { 0x0A03, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -325,7 +326,7 @@
     { 0x1CE1, 0x1CE1 },
     { 0x1CE9, 0x1CEC },
     { 0x1CEE, 0x1CF3 },
-    { 0x1CF5, 0x1CF6 },
+    { 0x1CF5, 0x1CF7 },
     { 0x1D00, 0x1DBF },
     { 0x1E00, 0x1F15 },
     { 0x1F18, 0x1F1D },
@@ -349,16 +350,15 @@
     { 0x2070, 0x2071 },
     { 0x2074, 0x208E },
     { 0x2090, 0x209C },
-    { 0x20A0, 0x20BE },
+    { 0x20A0, 0x20BF },
     { 0x2100, 0x218B },
-    { 0x2190, 0x23FE },
-    { 0x2400, 0x2426 },
+    { 0x2190, 0x2426 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
     { 0x2B98, 0x2BB9 },
     { 0x2BBD, 0x2BC8 },
-    { 0x2BCA, 0x2BD1 },
+    { 0x2BCA, 0x2BD2 },
     { 0x2BEC, 0x2BEF },
     { 0x2C00, 0x2C2E },
     { 0x2C30, 0x2C5E },
@@ -378,7 +378,7 @@
     { 0x2DC8, 0x2DCE },
     { 0x2DD0, 0x2DD6 },
     { 0x2DD8, 0x2DDE },
-    { 0x2E00, 0x2E44 },
+    { 0x2E00, 0x2E49 },
     { 0x2E80, 0x2E99 },
     { 0x2E9B, 0x2EF3 },
     { 0x2F00, 0x2FD5 },
@@ -387,14 +387,14 @@
     { 0x3030, 0x303F },
     { 0x3041, 0x3096 },
     { 0x309B, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x3190, 0x31BA },
     { 0x31C0, 0x31E3 },
     { 0x31F0, 0x321E },
     { 0x3220, 0x32FE },
     { 0x3300, 0x4DB5 },
-    { 0x4DC0, 0x9FD5 },
+    { 0x4DC0, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA490, 0xA4C6 },
     { 0xA4D0, 0xA62B },
@@ -502,7 +502,7 @@
     { 0x102A0, 0x102D0 },
     { 0x102E1, 0x102FB },
     { 0x10300, 0x10323 },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
     { 0x1039F, 0x103C3 },
@@ -635,6 +635,18 @@
     { 0x11730, 0x1173F },
     { 0x118A0, 0x118F2 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A07, 0x11A08 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A39, 0x11A3A },
+    { 0x11A3F, 0x11A46 },
+    { 0x11A50, 0x11A50 },
+    { 0x11A57, 0x11A58 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
+    { 0x11A97, 0x11A97 },
+    { 0x11A9A, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2F },
@@ -645,6 +657,11 @@
     { 0x11CA9, 0x11CA9 },
     { 0x11CB1, 0x11CB1 },
     { 0x11CB4, 0x11CB4 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12470, 0x12474 },
@@ -666,10 +683,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -766,9 +784,10 @@
     { 0x1F210, 0x1F23B },
     { 0x1F240, 0x1F248 },
     { 0x1F250, 0x1F251 },
-    { 0x1F300, 0x1F6D2 },
+    { 0x1F260, 0x1F265 },
+    { 0x1F300, 0x1F6D4 },
     { 0x1F6E0, 0x1F6EC },
-    { 0x1F6F0, 0x1F6F6 },
+    { 0x1F6F0, 0x1F6F8 },
     { 0x1F700, 0x1F773 },
     { 0x1F780, 0x1F7D4 },
     { 0x1F800, 0x1F80B },
@@ -776,18 +795,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F910, 0x1F91E },
-    { 0x1F920, 0x1F927 },
-    { 0x1F930, 0x1F930 },
-    { 0x1F933, 0x1F93E },
-    { 0x1F940, 0x1F94B },
-    { 0x1F950, 0x1F95E },
-    { 0x1F980, 0x1F991 },
+    { 0x1F900, 0x1F90B },
+    { 0x1F910, 0x1F93E },
+    { 0x1F940, 0x1F94C },
+    { 0x1F950, 0x1F96B },
+    { 0x1F980, 0x1F997 },
     { 0x1F9C0, 0x1F9C0 },
+    { 0x1F9D0, 0x1F9E6 },
     { 0x20000, 0x2A6D6 },
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_property_grapheme_base (c)
diff --git a/tests/unictype/test-pr_grapheme_extend.c b/tests/unictype/test-pr_grapheme_extend.c
index 0d7bf1fca6..1ddc0b0e78 100644
--- a/tests/unictype/test-pr_grapheme_extend.c
+++ b/tests/unictype/test-pr_grapheme_extend.c
@@ -69,6 +69,7 @@
     { 0x0AC7, 0x0AC8 },
     { 0x0ACD, 0x0ACD },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFF },
     { 0x0B01, 0x0B01 },
     { 0x0B3C, 0x0B3C },
     { 0x0B3E, 0x0B3F },
@@ -95,7 +96,8 @@
     { 0x0CCC, 0x0CCD },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D01 },
+    { 0x0D00, 0x0D01 },
+    { 0x0D3B, 0x0D3C },
     { 0x0D3E, 0x0D3E },
     { 0x0D41, 0x0D44 },
     { 0x0D4D, 0x0D4D },
@@ -183,7 +185,7 @@
     { 0x1CED, 0x1CED },
     { 0x1CF4, 0x1CF4 },
     { 0x1CF8, 0x1CF9 },
-    { 0x1DC0, 0x1DF5 },
+    { 0x1DC0, 0x1DF9 },
     { 0x1DFB, 0x1DFF },
     { 0x200C, 0x200C },
     { 0x20D0, 0x20F0 },
@@ -287,6 +289,15 @@
     { 0x1171D, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
+    { 0x11A01, 0x11A06 },
+    { 0x11A09, 0x11A0A },
+    { 0x11A33, 0x11A38 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A51, 0x11A56 },
+    { 0x11A59, 0x11A5B },
+    { 0x11A8A, 0x11A96 },
+    { 0x11A98, 0x11A99 },
     { 0x11C30, 0x11C36 },
     { 0x11C38, 0x11C3D },
     { 0x11C3F, 0x11C3F },
@@ -294,6 +305,11 @@
     { 0x11CAA, 0x11CB0 },
     { 0x11CB2, 0x11CB3 },
     { 0x11CB5, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D45 },
+    { 0x11D47, 0x11D47 },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F8F, 0x16F92 },
diff --git a/tests/unictype/test-pr_grapheme_link.c b/tests/unictype/test-pr_grapheme_link.c
index 5dd2a3d309..a9d61d640e 100644
--- a/tests/unictype/test-pr_grapheme_link.c
+++ b/tests/unictype/test-pr_grapheme_link.c
@@ -25,6 +25,7 @@
     { 0x0BCD, 0x0BCD },
     { 0x0C4D, 0x0C4D },
     { 0x0CCD, 0x0CCD },
+    { 0x0D3B, 0x0D3C },
     { 0x0D4D, 0x0D4D },
     { 0x0DCA, 0x0DCA },
     { 0x0E3A, 0x0E3A },
@@ -59,7 +60,11 @@
     { 0x1163F, 0x1163F },
     { 0x116B6, 0x116B6 },
     { 0x1172B, 0x1172B },
-    { 0x11C3F, 0x11C3F }
+    { 0x11A34, 0x11A34 },
+    { 0x11A47, 0x11A47 },
+    { 0x11A99, 0x11A99 },
+    { 0x11C3F, 0x11C3F },
+    { 0x11D44, 0x11D45 }
 
 #define PREDICATE(c) uc_is_property_grapheme_link (c)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_id_continue.c b/tests/unictype/test-pr_id_continue.c
index a74e197b32..aa5a1bb516 100644
--- a/tests/unictype/test-pr_id_continue.c
+++ b/tests/unictype/test-pr_id_continue.c
@@ -66,6 +66,7 @@
     { 0x07FA, 0x07FA },
     { 0x0800, 0x082D },
     { 0x0840, 0x085B },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x08D4, 0x08E1 },
@@ -85,6 +86,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E3 },
     { 0x09E6, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A01, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -114,7 +116,7 @@
     { 0x0AD0, 0x0AD0 },
     { 0x0AE0, 0x0AE3 },
     { 0x0AE6, 0x0AEF },
-    { 0x0AF9, 0x0AF9 },
+    { 0x0AF9, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B05, 0x0B0C },
     { 0x0B0F, 0x0B10 },
@@ -172,11 +174,10 @@
     { 0x0CE0, 0x0CE3 },
     { 0x0CE6, 0x0CEF },
     { 0x0CF1, 0x0CF2 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D05, 0x0D0C },
     { 0x0D0E, 0x0D10 },
-    { 0x0D12, 0x0D3A },
-    { 0x0D3D, 0x0D44 },
+    { 0x0D12, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4E },
     { 0x0D54, 0x0D57 },
@@ -300,9 +301,8 @@
     { 0x1C4D, 0x1C7D },
     { 0x1C80, 0x1C88 },
     { 0x1CD0, 0x1CD2 },
-    { 0x1CD4, 0x1CF6 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1D00, 0x1DF5 },
+    { 0x1CD4, 0x1CF9 },
+    { 0x1D00, 0x1DF9 },
     { 0x1DFB, 0x1F15 },
     { 0x1F18, 0x1F1D },
     { 0x1F20, 0x1F45 },
@@ -370,12 +370,12 @@
     { 0x3099, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -464,7 +464,7 @@
     { 0x102A0, 0x102D0 },
     { 0x102E0, 0x102E0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x1037A },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -567,6 +567,10 @@
     { 0x11730, 0x11739 },
     { 0x118A0, 0x118E9 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A50, 0x11A83 },
+    { 0x11A86, 0x11A99 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
@@ -575,6 +579,13 @@
     { 0x11C72, 0x11C8F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D47 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -593,10 +604,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -691,6 +703,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D },
     { 0xE0100, 0xE01EF }
 
diff --git a/tests/unictype/test-pr_id_start.c b/tests/unictype/test-pr_id_start.c
index c5cb6d6e2c..458c336fbc 100644
--- a/tests/unictype/test-pr_id_start.c
+++ b/tests/unictype/test-pr_id_start.c
@@ -65,6 +65,7 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -83,6 +84,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09F0, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -311,12 +313,12 @@
     { 0x309B, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -407,7 +409,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -490,11 +492,21 @@
     { 0x11700, 0x11719 },
     { 0x118A0, 0x118DF },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -510,10 +522,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F50 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -587,6 +600,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_property_id_start (c)
diff --git a/tests/unictype/test-pr_ideographic.c b/tests/unictype/test-pr_ideographic.c
index 11e5ef0bf9..ccce4ef4a9 100644
--- a/tests/unictype/test-pr_ideographic.c
+++ b/tests/unictype/test-pr_ideographic.c
@@ -21,15 +21,17 @@
     { 0x3021, 0x3029 },
     { 0x3038, 0x303A },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xF900, 0xFA6D },
     { 0xFA70, 0xFAD9 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
+    { 0x1B170, 0x1B2FB },
     { 0x20000, 0x2A6D6 },
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_property_ideographic (c)
diff --git a/tests/unictype/test-pr_numeric.c b/tests/unictype/test-pr_numeric.c
index 524c039a6b..050daa9120 100644
--- a/tests/unictype/test-pr_numeric.c
+++ b/tests/unictype/test-pr_numeric.c
@@ -130,6 +130,7 @@
     { 0x11730, 0x1173B },
     { 0x118E0, 0x118F2 },
     { 0x11C50, 0x11C6C },
+    { 0x11D50, 0x11D59 },
     { 0x12400, 0x1246E },
     { 0x16A60, 0x16A69 },
     { 0x16B50, 0x16B59 },
diff --git a/tests/unictype/test-pr_other_alphabetic.c b/tests/unictype/test-pr_other_alphabetic.c
index 858fa26aa8..297ca120df 100644
--- a/tests/unictype/test-pr_other_alphabetic.c
+++ b/tests/unictype/test-pr_other_alphabetic.c
@@ -64,6 +64,7 @@
     { 0x0AC7, 0x0AC9 },
     { 0x0ACB, 0x0ACC },
     { 0x0AE2, 0x0AE3 },
+    { 0x0AFA, 0x0AFC },
     { 0x0B01, 0x0B03 },
     { 0x0B3E, 0x0B44 },
     { 0x0B47, 0x0B48 },
@@ -87,7 +88,7 @@
     { 0x0CCA, 0x0CCC },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D3E, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4C },
@@ -195,10 +196,21 @@
     { 0x11640, 0x11640 },
     { 0x116AB, 0x116B5 },
     { 0x1171D, 0x1172A },
+    { 0x11A01, 0x11A0A },
+    { 0x11A35, 0x11A39 },
+    { 0x11A3B, 0x11A3E },
+    { 0x11A51, 0x11A5B },
+    { 0x11A8A, 0x11A97 },
     { 0x11C2F, 0x11C36 },
     { 0x11C38, 0x11C3E },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D31, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D41 },
+    { 0x11D43, 0x11D43 },
+    { 0x11D47, 0x11D47 },
     { 0x16B30, 0x16B36 },
     { 0x16F51, 0x16F7E },
     { 0x1BC9E, 0x1BC9E },
diff --git a/tests/unictype/test-pr_punctuation.c b/tests/unictype/test-pr_punctuation.c
index a46fbcf4a2..d3cac3dd5a 100644
--- a/tests/unictype/test-pr_punctuation.c
+++ b/tests/unictype/test-pr_punctuation.c
@@ -53,6 +53,7 @@
     { 0x085E, 0x085E },
     { 0x0964, 0x0965 },
     { 0x0970, 0x0970 },
+    { 0x09FD, 0x09FD },
     { 0x0AF0, 0x0AF0 },
     { 0x0DF4, 0x0DF4 },
     { 0x0E4F, 0x0E4F },
@@ -102,7 +103,7 @@
     { 0x2CFE, 0x2CFF },
     { 0x2D70, 0x2D70 },
     { 0x2E00, 0x2E2E },
-    { 0x2E30, 0x2E44 },
+    { 0x2E30, 0x2E49 },
     { 0x3001, 0x3003 },
     { 0x3008, 0x3011 },
     { 0x3014, 0x301F },
@@ -175,6 +176,9 @@
     { 0x11641, 0x11643 },
     { 0x11660, 0x1166C },
     { 0x1173C, 0x1173E },
+    { 0x11A3F, 0x11A46 },
+    { 0x11A9A, 0x11A9C },
+    { 0x11A9E, 0x11AA2 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x12470, 0x12474 },
diff --git a/tests/unictype/test-pr_regional_indicator.c b/tests/unictype/test-pr_regional_indicator.c
new file mode 100644
index 0000000000..3b8a7893ab
--- /dev/null
+++ b/tests/unictype/test-pr_regional_indicator.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x1F1E6, 0x1F1FF }
+
+#define PREDICATE(c) uc_is_property_regional_indicator (c)
+#include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_sentence_terminal.c b/tests/unictype/test-pr_sentence_terminal.c
index 5dcc45ea06..59995251eb 100644
--- a/tests/unictype/test-pr_sentence_terminal.c
+++ b/tests/unictype/test-pr_sentence_terminal.c
@@ -76,6 +76,8 @@
     { 0x115C9, 0x115D7 },
     { 0x11641, 0x11642 },
     { 0x1173C, 0x1173E },
+    { 0x11A42, 0x11A43 },
+    { 0x11A9B, 0x11A9C },
     { 0x11C41, 0x11C42 },
     { 0x16A6E, 0x16A6F },
     { 0x16AF5, 0x16AF5 },
diff --git a/tests/unictype/test-pr_terminal_punctuation.c b/tests/unictype/test-pr_terminal_punctuation.c
index 3fd4904054..33cdb85bfe 100644
--- a/tests/unictype/test-pr_terminal_punctuation.c
+++ b/tests/unictype/test-pr_terminal_punctuation.c
@@ -102,6 +102,9 @@
     { 0x115C9, 0x115D7 },
     { 0x11641, 0x11642 },
     { 0x1173C, 0x1173E },
+    { 0x11A42, 0x11A43 },
+    { 0x11A9B, 0x11A9C },
+    { 0x11AA1, 0x11AA2 },
     { 0x11C41, 0x11C43 },
     { 0x11C71, 0x11C71 },
     { 0x12470, 0x12474 },
diff --git a/tests/unictype/test-pr_unassigned_code_value.c b/tests/unictype/test-pr_unassigned_code_value.c
index d93dbfeb3d..9cb7a2123b 100644
--- a/tests/unictype/test-pr_unassigned_code_value.c
+++ b/tests/unictype/test-pr_unassigned_code_value.c
@@ -39,7 +39,8 @@
     { 0x082E, 0x082F },
     { 0x083F, 0x083F },
     { 0x085C, 0x085D },
-    { 0x085F, 0x089F },
+    { 0x085F, 0x085F },
+    { 0x086B, 0x089F },
     { 0x08B5, 0x08B5 },
     { 0x08BE, 0x08D3 },
     { 0x0984, 0x0984 },
@@ -55,7 +56,7 @@
     { 0x09D8, 0x09DB },
     { 0x09DE, 0x09DE },
     { 0x09E4, 0x09E5 },
-    { 0x09FC, 0x0A00 },
+    { 0x09FE, 0x0A00 },
     { 0x0A04, 0x0A04 },
     { 0x0A0B, 0x0A0E },
     { 0x0A11, 0x0A12 },
@@ -85,7 +86,7 @@
     { 0x0AD1, 0x0ADF },
     { 0x0AE4, 0x0AE5 },
     { 0x0AF2, 0x0AF8 },
-    { 0x0AFA, 0x0B00 },
+    { 0x0B00, 0x0B00 },
     { 0x0B04, 0x0B04 },
     { 0x0B0D, 0x0B0E },
     { 0x0B11, 0x0B12 },
@@ -141,11 +142,10 @@
     { 0x0CDF, 0x0CDF },
     { 0x0CE4, 0x0CE5 },
     { 0x0CF0, 0x0CF0 },
-    { 0x0CF3, 0x0D00 },
+    { 0x0CF3, 0x0CFF },
     { 0x0D04, 0x0D04 },
     { 0x0D0D, 0x0D0D },
     { 0x0D11, 0x0D11 },
-    { 0x0D3B, 0x0D3C },
     { 0x0D45, 0x0D45 },
     { 0x0D49, 0x0D49 },
     { 0x0D50, 0x0D53 },
@@ -252,9 +252,8 @@
     { 0x1C4A, 0x1C4C },
     { 0x1C89, 0x1CBF },
     { 0x1CC8, 0x1CCF },
-    { 0x1CF7, 0x1CF7 },
     { 0x1CFA, 0x1CFF },
-    { 0x1DF6, 0x1DFA },
+    { 0x1DFA, 0x1DFA },
     { 0x1F16, 0x1F17 },
     { 0x1F1E, 0x1F1F },
     { 0x1F46, 0x1F47 },
@@ -275,17 +274,16 @@
     { 0x2072, 0x2073 },
     { 0x208F, 0x208F },
     { 0x209D, 0x209F },
-    { 0x20BF, 0x20CF },
+    { 0x20C0, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x23FF, 0x23FF },
     { 0x2427, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B97 },
     { 0x2BBA, 0x2BBC },
     { 0x2BC9, 0x2BC9 },
-    { 0x2BD2, 0x2BEB },
+    { 0x2BD3, 0x2BEB },
     { 0x2BF0, 0x2BFF },
     { 0x2C2F, 0x2C2F },
     { 0x2C5F, 0x2C5F },
@@ -304,7 +302,7 @@
     { 0x2DCF, 0x2DCF },
     { 0x2DD7, 0x2DD7 },
     { 0x2DDF, 0x2DDF },
-    { 0x2E45, 0x2E7F },
+    { 0x2E4A, 0x2E7F },
     { 0x2E9A, 0x2E9A },
     { 0x2EF4, 0x2EFF },
     { 0x2FD6, 0x2FEF },
@@ -312,14 +310,14 @@
     { 0x3040, 0x3040 },
     { 0x3097, 0x3098 },
     { 0x3100, 0x3104 },
-    { 0x312E, 0x3130 },
+    { 0x312F, 0x3130 },
     { 0x318F, 0x318F },
     { 0x31BB, 0x31BF },
     { 0x31E4, 0x31EF },
     { 0x321F, 0x321F },
     { 0x32FF, 0x32FF },
     { 0x4DB6, 0x4DBF },
-    { 0x9FD6, 0x9FFF },
+    { 0x9FEB, 0x9FFF },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
@@ -397,7 +395,7 @@
     { 0x1029D, 0x1029F },
     { 0x102D1, 0x102DF },
     { 0x102FC, 0x102FF },
-    { 0x10324, 0x1032F },
+    { 0x10324, 0x1032C },
     { 0x1034B, 0x1034F },
     { 0x1037B, 0x1037F },
     { 0x1039E, 0x1039E },
@@ -501,7 +499,11 @@
     { 0x1172C, 0x1172F },
     { 0x11740, 0x1189F },
     { 0x118F3, 0x118FE },
-    { 0x11900, 0x11ABF },
+    { 0x11900, 0x119FF },
+    { 0x11A48, 0x11A4F },
+    { 0x11A84, 0x11A85 },
+    { 0x11A9D, 0x11A9D },
+    { 0x11AA3, 0x11ABF },
     { 0x11AF9, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
@@ -509,7 +511,14 @@
     { 0x11C6D, 0x11C6F },
     { 0x11C90, 0x11C91 },
     { 0x11CA8, 0x11CA8 },
-    { 0x11CB7, 0x11FFF },
+    { 0x11CB7, 0x11CFF },
+    { 0x11D07, 0x11D07 },
+    { 0x11D0A, 0x11D0A },
+    { 0x11D37, 0x11D39 },
+    { 0x11D3B, 0x11D3B },
+    { 0x11D3E, 0x11D3E },
+    { 0x11D48, 0x11D4F },
+    { 0x11D5A, 0x11FFF },
     { 0x1239A, 0x123FF },
     { 0x1246F, 0x1246F },
     { 0x12475, 0x1247F },
@@ -530,10 +539,11 @@
     { 0x16F45, 0x16F4F },
     { 0x16F7F, 0x16F8E },
     { 0x16FA0, 0x16FDF },
-    { 0x16FE1, 0x16FFF },
+    { 0x16FE2, 0x16FFF },
     { 0x187ED, 0x187FF },
     { 0x18AF3, 0x1AFFF },
-    { 0x1B002, 0x1BBFF },
+    { 0x1B11F, 0x1B16F },
+    { 0x1B2FC, 0x1BBFF },
     { 0x1BC6B, 0x1BC6F },
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
@@ -625,29 +635,30 @@
     { 0x1F203, 0x1F20F },
     { 0x1F23C, 0x1F23F },
     { 0x1F249, 0x1F24F },
-    { 0x1F252, 0x1F2FF },
-    { 0x1F6D3, 0x1F6DF },
+    { 0x1F252, 0x1F25F },
+    { 0x1F266, 0x1F2FF },
+    { 0x1F6D5, 0x1F6DF },
     { 0x1F6ED, 0x1F6EF },
-    { 0x1F6F7, 0x1F6FF },
+    { 0x1F6F9, 0x1F6FF },
     { 0x1F774, 0x1F77F },
     { 0x1F7D5, 0x1F7FF },
     { 0x1F80C, 0x1F80F },
     { 0x1F848, 0x1F84F },
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
-    { 0x1F8AE, 0x1F90F },
-    { 0x1F91F, 0x1F91F },
-    { 0x1F928, 0x1F92F },
-    { 0x1F931, 0x1F932 },
+    { 0x1F8AE, 0x1F8FF },
+    { 0x1F90C, 0x1F90F },
     { 0x1F93F, 0x1F93F },
-    { 0x1F94C, 0x1F94F },
-    { 0x1F95F, 0x1F97F },
-    { 0x1F992, 0x1F9BF },
-    { 0x1F9C1, 0x1FFFD },
+    { 0x1F94D, 0x1F94F },
+    { 0x1F96C, 0x1F97F },
+    { 0x1F998, 0x1F9BF },
+    { 0x1F9C1, 0x1F9CF },
+    { 0x1F9E7, 0x1FFFD },
     { 0x2A6D7, 0x2A6FF },
     { 0x2B735, 0x2B73F },
     { 0x2B81E, 0x2B81F },
-    { 0x2CEA2, 0x2F7FF },
+    { 0x2CEA2, 0x2CEAF },
+    { 0x2EBE1, 0x2F7FF },
     { 0x2FA1E, 0x2FFFD },
     { 0x30000, 0x3FFFD },
     { 0x40000, 0x4FFFD },
diff --git a/tests/unictype/test-pr_unified_ideograph.c b/tests/unictype/test-pr_unified_ideograph.c
index cabe4e684a..c08886f90a 100644
--- a/tests/unictype/test-pr_unified_ideograph.c
+++ b/tests/unictype/test-pr_unified_ideograph.c
@@ -18,7 +18,7 @@
 #include "test-predicate-part1.h"
 
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xFA0E, 0xFA0F },
     { 0xFA11, 0xFA11 },
     { 0xFA13, 0xFA14 },
@@ -29,7 +29,8 @@
     { 0x20000, 0x2A6D6 },
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
-    { 0x2B820, 0x2CEA1 }
+    { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 }
 
 #define PREDICATE(c) uc_is_property_unified_ideograph (c)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_xid_continue.c b/tests/unictype/test-pr_xid_continue.c
index b755e51beb..7ee73de384 100644
--- a/tests/unictype/test-pr_xid_continue.c
+++ b/tests/unictype/test-pr_xid_continue.c
@@ -66,6 +66,7 @@
     { 0x07FA, 0x07FA },
     { 0x0800, 0x082D },
     { 0x0840, 0x085B },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x08D4, 0x08E1 },
@@ -85,6 +86,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E3 },
     { 0x09E6, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A01, 0x0A03 },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
@@ -114,7 +116,7 @@
     { 0x0AD0, 0x0AD0 },
     { 0x0AE0, 0x0AE3 },
     { 0x0AE6, 0x0AEF },
-    { 0x0AF9, 0x0AF9 },
+    { 0x0AF9, 0x0AFF },
     { 0x0B01, 0x0B03 },
     { 0x0B05, 0x0B0C },
     { 0x0B0F, 0x0B10 },
@@ -172,11 +174,10 @@
     { 0x0CE0, 0x0CE3 },
     { 0x0CE6, 0x0CEF },
     { 0x0CF1, 0x0CF2 },
-    { 0x0D01, 0x0D03 },
+    { 0x0D00, 0x0D03 },
     { 0x0D05, 0x0D0C },
     { 0x0D0E, 0x0D10 },
-    { 0x0D12, 0x0D3A },
-    { 0x0D3D, 0x0D44 },
+    { 0x0D12, 0x0D44 },
     { 0x0D46, 0x0D48 },
     { 0x0D4A, 0x0D4E },
     { 0x0D54, 0x0D57 },
@@ -300,9 +301,8 @@
     { 0x1C4D, 0x1C7D },
     { 0x1C80, 0x1C88 },
     { 0x1CD0, 0x1CD2 },
-    { 0x1CD4, 0x1CF6 },
-    { 0x1CF8, 0x1CF9 },
-    { 0x1D00, 0x1DF5 },
+    { 0x1CD4, 0x1CF9 },
+    { 0x1D00, 0x1DF9 },
     { 0x1DFB, 0x1F15 },
     { 0x1F18, 0x1F1D },
     { 0x1F20, 0x1F45 },
@@ -371,12 +371,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -471,7 +471,7 @@
     { 0x102A0, 0x102D0 },
     { 0x102E0, 0x102E0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x1037A },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -574,6 +574,10 @@
     { 0x11730, 0x11739 },
     { 0x118A0, 0x118E9 },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A3E },
+    { 0x11A47, 0x11A47 },
+    { 0x11A50, 0x11A83 },
+    { 0x11A86, 0x11A99 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
@@ -582,6 +586,13 @@
     { 0x11C72, 0x11C8F },
     { 0x11C92, 0x11CA7 },
     { 0x11CA9, 0x11CB6 },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D36 },
+    { 0x11D3A, 0x11D3A },
+    { 0x11D3C, 0x11D3D },
+    { 0x11D3F, 0x11D47 },
+    { 0x11D50, 0x11D59 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -600,10 +611,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F7E },
     { 0x16F8F, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -698,6 +710,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D },
     { 0xE0100, 0xE01EF }
 
diff --git a/tests/unictype/test-pr_xid_start.c b/tests/unictype/test-pr_xid_start.c
index 6a57c1f8c0..a79cd763b7 100644
--- a/tests/unictype/test-pr_xid_start.c
+++ b/tests/unictype/test-pr_xid_start.c
@@ -65,6 +65,7 @@
     { 0x0824, 0x0824 },
     { 0x0828, 0x0828 },
     { 0x0840, 0x0858 },
+    { 0x0860, 0x086A },
     { 0x08A0, 0x08B4 },
     { 0x08B6, 0x08BD },
     { 0x0904, 0x0939 },
@@ -83,6 +84,7 @@
     { 0x09DC, 0x09DD },
     { 0x09DF, 0x09E1 },
     { 0x09F0, 0x09F1 },
+    { 0x09FC, 0x09FC },
     { 0x0A05, 0x0A0A },
     { 0x0A0F, 0x0A10 },
     { 0x0A13, 0x0A28 },
@@ -311,12 +313,12 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x30FF },
-    { 0x3105, 0x312D },
+    { 0x3105, 0x312E },
     { 0x3131, 0x318E },
     { 0x31A0, 0x31BA },
     { 0x31F0, 0x31FF },
     { 0x3400, 0x4DB5 },
-    { 0x4E00, 0x9FD5 },
+    { 0x4E00, 0x9FEA },
     { 0xA000, 0xA48C },
     { 0xA4D0, 0xA4FD },
     { 0xA500, 0xA60C },
@@ -414,7 +416,7 @@
     { 0x10280, 0x1029C },
     { 0x102A0, 0x102D0 },
     { 0x10300, 0x1031F },
-    { 0x10330, 0x1034A },
+    { 0x1032D, 0x1034A },
     { 0x10350, 0x10375 },
     { 0x10380, 0x1039D },
     { 0x103A0, 0x103C3 },
@@ -497,11 +499,21 @@
     { 0x11700, 0x11719 },
     { 0x118A0, 0x118DF },
     { 0x118FF, 0x118FF },
+    { 0x11A00, 0x11A00 },
+    { 0x11A0B, 0x11A32 },
+    { 0x11A3A, 0x11A3A },
+    { 0x11A50, 0x11A50 },
+    { 0x11A5C, 0x11A83 },
+    { 0x11A86, 0x11A89 },
     { 0x11AC0, 0x11AF8 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
     { 0x11C72, 0x11C8F },
+    { 0x11D00, 0x11D06 },
+    { 0x11D08, 0x11D09 },
+    { 0x11D0B, 0x11D30 },
+    { 0x11D46, 0x11D46 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
     { 0x12480, 0x12543 },
@@ -517,10 +529,11 @@
     { 0x16F00, 0x16F44 },
     { 0x16F50, 0x16F50 },
     { 0x16F93, 0x16F9F },
-    { 0x16FE0, 0x16FE0 },
+    { 0x16FE0, 0x16FE1 },
     { 0x17000, 0x187EC },
     { 0x18800, 0x18AF2 },
-    { 0x1B000, 0x1B001 },
+    { 0x1B000, 0x1B11E },
+    { 0x1B170, 0x1B2FB },
     { 0x1BC00, 0x1BC6A },
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
@@ -594,6 +607,7 @@
     { 0x2A700, 0x2B734 },
     { 0x2B740, 0x2B81D },
     { 0x2B820, 0x2CEA1 },
+    { 0x2CEB0, 0x2EBE0 },
     { 0x2F800, 0x2FA1D }
 
 #define PREDICATE(c) uc_is_property_xid_start (c)
diff --git a/tests/unigbrk/GraphemeBreakTest.txt b/tests/unigbrk/GraphemeBreakTest.txt
index 220bb698d1..d7d8f90de0 100644
--- a/tests/unigbrk/GraphemeBreakTest.txt
+++ b/tests/unigbrk/GraphemeBreakTest.txt
@@ -1,13 +1,13 @@
-# GraphemeBreakTest-9.0.0.txt
-# Date: 2016-06-02, 18:28:17 GMT
-# © 2016 Unicode®, Inc.
+# GraphemeBreakTest-10.0.0.txt
+# Date: 2017-04-14, 05:40:29 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
 #   For documentation, see http://www.unicode.org/reports/tr44/
 #
-# Default Grapheme Break Test
+# Default Grapheme_Cluster_Break Test
 #
 # Format:
 # <string> (# <comment>)?
@@ -17,7 +17,8 @@
 #  <comment> the format can change, but currently it shows:
 #	- the sample character name
 #	- (x) the Grapheme_Cluster_Break property value for the sample character
-#	- [x] the rule that determines whether there is a break or not
+#	- [x] the rule that determines whether there is a break or not,
+#	   as listed in the Rules section of GraphemeBreakTest.html
 #
 # These samples may be extended or changed in the future.
 #
@@ -53,8 +54,8 @@
 ÷ 0020 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0020 ÷ 2764 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0020 × 0308 ÷ 2764 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0020 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0020 × 0308 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0020 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0020 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -93,8 +94,8 @@
 ÷ 000D ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000D ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000D ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -133,8 +134,8 @@
 ÷ 000A ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000A ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000A ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -173,8 +174,8 @@
 ÷ 0001 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0001 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0001 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -213,8 +214,8 @@
 ÷ 0300 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0300 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0300 × 0308 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 × 0308 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0300 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -253,8 +254,8 @@
 ÷ 0600 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0600 × 2764 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0600 × 0308 ÷ 2764 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0600 × 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0600 × 0308 ÷ 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0600 × 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] BOY (EBG) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0600 × 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] <reserved-0378> (Other) ÷ [0.3]
@@ -293,8 +294,8 @@
 ÷ 0903 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0903 ÷ 2764 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0903 × 0308 ÷ 2764 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0903 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0903 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0903 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0903 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -333,8 +334,8 @@
 ÷ 1100 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1100 ÷ 2764 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1100 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1100 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1100 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1100 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -373,8 +374,8 @@
 ÷ 1160 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1160 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1160 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1160 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1160 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1160 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1160 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -413,8 +414,8 @@
 ÷ 11A8 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 11A8 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 11A8 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 11A8 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -453,8 +454,8 @@
 ÷ AC00 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC00 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ AC00 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ AC00 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ AC00 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ AC00 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC00 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -493,8 +494,8 @@
 ÷ AC01 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC01 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ AC01 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ AC01 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ AC01 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ AC01 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -533,8 +534,8 @@
 ÷ 1F1E6 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F1E6 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F1E6 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -573,8 +574,8 @@
 ÷ 261D × 0308 × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 261D × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 261D × 0308 × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 261D ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 261D × 0308 ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 261D ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 261D × 0308 ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 261D ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D ÷ 0378 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -613,8 +614,8 @@
 ÷ 1F3FB × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F3FB × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F3FB × 0308 × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F3FB ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB × 0308 ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F3FB ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB × 0308 ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB ÷ 0378 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -653,54 +654,54 @@
 ÷ 200D × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 0308 ÷ 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 0308 ÷ 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
 ÷ 200D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 200D ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 200D × 0308 ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2764 ÷ 0020 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2764 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2764 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2764 × 0308 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2764 ÷ 0600 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2764 × 0903 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2764 × 0308 × 0903 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2764 ÷ 1100 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2764 ÷ 1160 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2764 ÷ 11A8 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2764 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2764 ÷ AC00 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2764 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2764 ÷ AC01 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2764 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2764 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 × 0308 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2764 × 0308 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2764 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 ÷ 0378 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2764 ÷ D800 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2764 × 0308 ÷ D800 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 2640 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 2640 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 2640 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 2640 × 0308 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 2640 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 2640 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 2640 × 0308 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 2640 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 2640 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 2640 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 2640 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 2640 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 2640 × 0308 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 2640 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 2640 × 0308 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 2640 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 × 0308 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 2640 × 0308 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 2640 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 × 0308 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 2640 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 2640 × 0308 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 1F466 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1F466 ÷ 000D ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -733,8 +734,8 @@
 ÷ 1F466 × 0308 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F466 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F466 × 0308 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F466 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 × 0308 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 ÷ 0378 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -773,8 +774,8 @@
 ÷ 0378 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0378 ÷ 2764 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0378 × 0308 ÷ 2764 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0378 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0378 × 0308 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0378 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0378 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -813,8 +814,8 @@
 ÷ D800 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ D800 ÷ 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ D800 ÷ 0308 × 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ D800 ÷ 2764 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ D800 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ D800 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ D800 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ D800 ÷ 0378 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -840,7 +841,7 @@
 ÷ 261D × 1F3FB ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 1F466 × 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 #
diff --git a/tests/unigbrk/test-uc-gbrk-prop.h b/tests/unigbrk/test-uc-gbrk-prop.h
index e3c265fdb1..8609b4d64b 100644
--- a/tests/unigbrk/test-uc-gbrk-prop.h
+++ b/tests/unigbrk/test-uc-gbrk-prop.h
@@ -148,6 +148,8 @@
 { 0x0ACE, GBP_EXTEND },
 { 0x0AE2, GBP_OTHER },
 { 0x0AE4, GBP_EXTEND },
+{ 0x0AFA, GBP_OTHER },
+{ 0x0B00, GBP_EXTEND },
 { 0x0B01, GBP_OTHER },
 { 0x0B02, GBP_EXTEND },
 { 0x0B04, GBP_SPACINGMARK },
@@ -215,9 +217,11 @@
 { 0x0CD7, GBP_EXTEND },
 { 0x0CE2, GBP_OTHER },
 { 0x0CE4, GBP_EXTEND },
-{ 0x0D01, GBP_OTHER },
+{ 0x0D00, GBP_OTHER },
 { 0x0D02, GBP_EXTEND },
 { 0x0D04, GBP_SPACINGMARK },
+{ 0x0D3B, GBP_OTHER },
+{ 0x0D3D, GBP_EXTEND },
 { 0x0D3E, GBP_OTHER },
 { 0x0D3F, GBP_EXTEND },
 { 0x0D41, GBP_SPACINGMARK },
@@ -420,10 +424,11 @@
 { 0x1CF2, GBP_OTHER },
 { 0x1CF4, GBP_SPACINGMARK },
 { 0x1CF5, GBP_EXTEND },
-{ 0x1CF8, GBP_OTHER },
+{ 0x1CF7, GBP_OTHER },
+{ 0x1CF8, GBP_SPACINGMARK },
 { 0x1CFA, GBP_EXTEND },
 { 0x1DC0, GBP_OTHER },
-{ 0x1DF6, GBP_EXTEND },
+{ 0x1DFA, GBP_EXTEND },
 { 0x1DFB, GBP_OTHER },
 { 0x1E00, GBP_EXTEND },
 { 0x200B, GBP_OTHER },
@@ -439,8 +444,16 @@
 { 0x20F1, GBP_EXTEND },
 { 0x261D, GBP_OTHER },
 { 0x261E, GBP_EB },
+{ 0x2640, GBP_OTHER },
+{ 0x2641, GBP_GAZ },
+{ 0x2642, GBP_OTHER },
+{ 0x2643, GBP_GAZ },
+{ 0x2695, GBP_OTHER },
+{ 0x2697, GBP_GAZ },
 { 0x26F9, GBP_OTHER },
 { 0x26FA, GBP_EB },
+{ 0x2708, GBP_OTHER },
+{ 0x2709, GBP_GAZ },
 { 0x270A, GBP_OTHER },
 { 0x270E, GBP_EB },
 { 0x2764, GBP_OTHER },
@@ -1494,6 +1507,26 @@
 { 0x11726, GBP_EXTEND },
 { 0x11727, GBP_SPACINGMARK },
 { 0x1172C, GBP_EXTEND },
+{ 0x11A01, GBP_OTHER },
+{ 0x11A07, GBP_EXTEND },
+{ 0x11A09, GBP_SPACINGMARK },
+{ 0x11A0B, GBP_EXTEND },
+{ 0x11A33, GBP_OTHER },
+{ 0x11A39, GBP_EXTEND },
+{ 0x11A3A, GBP_SPACINGMARK },
+{ 0x11A3B, GBP_PREPEND },
+{ 0x11A3F, GBP_EXTEND },
+{ 0x11A47, GBP_OTHER },
+{ 0x11A48, GBP_EXTEND },
+{ 0x11A51, GBP_OTHER },
+{ 0x11A57, GBP_EXTEND },
+{ 0x11A59, GBP_SPACINGMARK },
+{ 0x11A5C, GBP_EXTEND },
+{ 0x11A86, GBP_OTHER },
+{ 0x11A8A, GBP_PREPEND },
+{ 0x11A97, GBP_EXTEND },
+{ 0x11A98, GBP_SPACINGMARK },
+{ 0x11A9A, GBP_EXTEND },
 { 0x11C2F, GBP_OTHER },
 { 0x11C30, GBP_SPACINGMARK },
 { 0x11C37, GBP_EXTEND },
@@ -1510,6 +1543,16 @@
 { 0x11CB4, GBP_EXTEND },
 { 0x11CB5, GBP_SPACINGMARK },
 { 0x11CB7, GBP_EXTEND },
+{ 0x11D31, GBP_OTHER },
+{ 0x11D37, GBP_EXTEND },
+{ 0x11D3A, GBP_OTHER },
+{ 0x11D3B, GBP_EXTEND },
+{ 0x11D3C, GBP_OTHER },
+{ 0x11D3E, GBP_EXTEND },
+{ 0x11D3F, GBP_OTHER },
+{ 0x11D46, GBP_EXTEND },
+{ 0x11D47, GBP_PREPEND },
+{ 0x11D48, GBP_EXTEND },
 { 0x16AF0, GBP_OTHER },
 { 0x16AF5, GBP_EXTEND },
 { 0x16B30, GBP_OTHER },
@@ -1565,12 +1608,30 @@
 { 0x1E94B, GBP_EXTEND },
 { 0x1F1E6, GBP_OTHER },
 { 0x1F200, GBP_RI },
+{ 0x1F308, GBP_OTHER },
+{ 0x1F309, GBP_GAZ },
+{ 0x1F33E, GBP_OTHER },
+{ 0x1F33F, GBP_GAZ },
+{ 0x1F373, GBP_OTHER },
+{ 0x1F374, GBP_GAZ },
 { 0x1F385, GBP_OTHER },
 { 0x1F386, GBP_EB },
-{ 0x1F3C3, GBP_OTHER },
+{ 0x1F393, GBP_OTHER },
+{ 0x1F394, GBP_GAZ },
+{ 0x1F3A4, GBP_OTHER },
+{ 0x1F3A5, GBP_GAZ },
+{ 0x1F3A8, GBP_OTHER },
+{ 0x1F3A9, GBP_GAZ },
+{ 0x1F3C2, GBP_OTHER },
 { 0x1F3C5, GBP_EB },
+{ 0x1F3C7, GBP_OTHER },
+{ 0x1F3C8, GBP_EB },
 { 0x1F3CA, GBP_OTHER },
-{ 0x1F3CC, GBP_EB },
+{ 0x1F3CD, GBP_EB },
+{ 0x1F3EB, GBP_OTHER },
+{ 0x1F3EC, GBP_GAZ },
+{ 0x1F3ED, GBP_OTHER },
+{ 0x1F3EE, GBP_GAZ },
 { 0x1F3FB, GBP_OTHER },
 { 0x1F400, GBP_EM },
 { 0x1F442, GBP_OTHER },
@@ -1593,7 +1654,13 @@
 { 0x1F48C, GBP_GAZ },
 { 0x1F4AA, GBP_OTHER },
 { 0x1F4AB, GBP_EB },
-{ 0x1F575, GBP_OTHER },
+{ 0x1F4BB, GBP_OTHER },
+{ 0x1F4BD, GBP_GAZ },
+{ 0x1F527, GBP_OTHER },
+{ 0x1F528, GBP_GAZ },
+{ 0x1F52C, GBP_OTHER },
+{ 0x1F52D, GBP_GAZ },
+{ 0x1F574, GBP_OTHER },
 { 0x1F576, GBP_EB },
 { 0x1F57A, GBP_OTHER },
 { 0x1F57B, GBP_EB },
@@ -1607,22 +1674,30 @@
 { 0x1F648, GBP_EB },
 { 0x1F64B, GBP_OTHER },
 { 0x1F650, GBP_EB },
+{ 0x1F680, GBP_OTHER },
+{ 0x1F681, GBP_GAZ },
+{ 0x1F692, GBP_OTHER },
+{ 0x1F693, GBP_GAZ },
 { 0x1F6A3, GBP_OTHER },
 { 0x1F6A4, GBP_EB },
 { 0x1F6B4, GBP_OTHER },
 { 0x1F6B7, GBP_EB },
 { 0x1F6C0, GBP_OTHER },
 { 0x1F6C1, GBP_EB },
+{ 0x1F6CC, GBP_OTHER },
+{ 0x1F6CD, GBP_EB },
 { 0x1F918, GBP_OTHER },
-{ 0x1F91F, GBP_EB },
+{ 0x1F91D, GBP_EB },
+{ 0x1F91E, GBP_OTHER },
+{ 0x1F920, GBP_EB },
 { 0x1F926, GBP_OTHER },
 { 0x1F927, GBP_EB },
 { 0x1F930, GBP_OTHER },
-{ 0x1F931, GBP_EB },
-{ 0x1F933, GBP_OTHER },
 { 0x1F93A, GBP_EB },
-{ 0x1F93C, GBP_OTHER },
+{ 0x1F93D, GBP_OTHER },
 { 0x1F93F, GBP_EB },
+{ 0x1F9D1, GBP_OTHER },
+{ 0x1F9DE, GBP_EB },
 { 0xE0000, GBP_OTHER },
 { 0xE0020, GBP_CONTROL },
 { 0xE0080, GBP_EXTEND },
diff --git a/tests/uniname/NameAliases.txt b/tests/uniname/NameAliases.txt
index 4a2a15070a..f4ba3caee5 100644
--- a/tests/uniname/NameAliases.txt
+++ b/tests/uniname/NameAliases.txt
@@ -1,6 +1,6 @@
-# NameAliases-9.0.0.txt
-# Date: 2016-01-21, 22:00:00 GMT [KW, LI]
-# © 2016 Unicode®, Inc.
+# NameAliases-10.0.0.txt
+# Date: 2017-05-06, 18:10:00 GMT [KW, LI]
+# © 2017 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
@@ -262,6 +262,10 @@
 0EA3;LAO LETTER RO;correction
 0EA5;LAO LETTER LO;correction
 0FD0;TIBETAN MARK BKA- SHOG GI MGO RGYAN;correction
+11EC;HANGUL JONGSEONG YESIEUNG-KIYEOK;correction
+11ED;HANGUL JONGSEONG YESIEUNG-SSANGKIYEOK;correction
+11EE;HANGUL JONGSEONG SSANGYESIEUNG;correction
+11EF;HANGUL JONGSEONG YESIEUNG-KHIEUKH;correction
 180B;FVS1;abbreviation
 180C;FVS2;abbreviation
 180D;FVS3;abbreviation
@@ -289,7 +293,6 @@
 2B7A;LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE;correction
 2B7C;RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE;correction
 A015;YI SYLLABLE ITERATION MARK;correction
-FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRACKET;correction
 FE00;VS1;abbreviation
 FE01;VS2;abbreviation
 FE02;VS3;abbreviation
@@ -306,11 +309,13 @@ FE0C;VS13;abbreviation
 FE0D;VS14;abbreviation
 FE0E;VS15;abbreviation
 FE0F;VS16;abbreviation
+FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRACKET;correction
 FEFF;BYTE ORDER MARK;alternate
 FEFF;BOM;abbreviation
 FEFF;ZWNBSP;abbreviation
 122D4;CUNEIFORM SIGN NU11 TENU;correction
 122D5;CUNEIFORM SIGN NU11 OVER NU11 BUR OVER BUR;correction
+1B001;HENTAIGANA LETTER E-1;correction
 1D0C5;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA VASIS;correction
 E0100;VS17;abbreviation
 E0101;VS18;abbreviation
diff --git a/tests/uniname/UnicodeData.txt b/tests/uniname/UnicodeData.txt
index a756976461..d89c64f526 100644
--- a/tests/uniname/UnicodeData.txt
+++ b/tests/uniname/UnicodeData.txt
@@ -2072,6 +2072,17 @@
 085A;MANDAIC VOCALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
 085B;MANDAIC GEMINATION MARK;Mn;220;NSM;;;;;N;;;;;
 085E;MANDAIC PUNCTUATION;Po;0;R;;;;;N;;;;;
+0860;SYRIAC LETTER MALAYALAM NGA;Lo;0;AL;;;;;N;;;;;
+0861;SYRIAC LETTER MALAYALAM JA;Lo;0;AL;;;;;N;;;;;
+0862;SYRIAC LETTER MALAYALAM NYA;Lo;0;AL;;;;;N;;;;;
+0863;SYRIAC LETTER MALAYALAM TTA;Lo;0;AL;;;;;N;;;;;
+0864;SYRIAC LETTER MALAYALAM NNA;Lo;0;AL;;;;;N;;;;;
+0865;SYRIAC LETTER MALAYALAM NNNA;Lo;0;AL;;;;;N;;;;;
+0866;SYRIAC LETTER MALAYALAM BHA;Lo;0;AL;;;;;N;;;;;
+0867;SYRIAC LETTER MALAYALAM RA;Lo;0;AL;;;;;N;;;;;
+0868;SYRIAC LETTER MALAYALAM LLA;Lo;0;AL;;;;;N;;;;;
+0869;SYRIAC LETTER MALAYALAM LLLA;Lo;0;AL;;;;;N;;;;;
+086A;SYRIAC LETTER MALAYALAM SSA;Lo;0;AL;;;;;N;;;;;
 08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
 08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
 08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
@@ -2366,6 +2377,8 @@
 09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
 09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
 09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
+09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
 0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
 0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2530,6 +2543,12 @@
 0AF0;GUJARATI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
 0AF9;GUJARATI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0AFA;GUJARATI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
+0AFB;GUJARATI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;;
+0AFC;GUJARATI SIGN MADDAH;Mn;0;NSM;;;;;N;;;;;
+0AFD;GUJARATI SIGN THREE-DOT NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFE;GUJARATI SIGN CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFF;GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2876,6 +2895,7 @@
 0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
 0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+0D00;MALAYALAM SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2931,6 +2951,8 @@
 0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
 0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
 0D3A;MALAYALAM LETTER TTTA;Lo;0;L;;;;;N;;;;;
+0D3B;MALAYALAM SIGN VERTICAL BAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D3C;MALAYALAM SIGN CIRCULAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
 0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
 0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
 0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
@@ -6413,6 +6435,7 @@
 1CF4;VEDIC TONE CANDRA ABOVE;Mn;230;NSM;;;;;N;;;;;
 1CF5;VEDIC SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
 1CF6;VEDIC SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+1CF7;VEDIC SIGN ATIKRAMA;Mc;0;L;;;;;N;;;;;
 1CF8;VEDIC TONE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
 1CF9;VEDIC TONE DOUBLE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
 1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
@@ -6661,6 +6684,10 @@
 1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DF6;COMBINING KAVYKA ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+1DF7;COMBINING KAVYKA ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF8;COMBINING DOT ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF9;COMBINING WIDE INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;;;;;
 1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;;
 1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
 1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
@@ -7339,6 +7366,7 @@
 20BC;MANAT SIGN;Sc;0;ET;;;;;N;;;;;
 20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;;
 20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
+20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -8135,6 +8163,7 @@
 23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;;
 23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;;
 23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;;
+23FF;OBSERVER EYE SYMBOL;So;0;ON;;;;;N;;;;;
 2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
 2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
 2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
@@ -10083,6 +10112,7 @@
 2BCF;ROTATED WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
 2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
 2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
+2BD2;GROUP MARK;So;0;ON;;;;;N;;;;;
 2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
@@ -10615,6 +10645,11 @@
 2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
 2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;;
 2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;;
+2E45;INVERTED LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E46;INVERTED LOW KAVYKA WITH KAVYKA ABOVE;Po;0;ON;;;;;N;;;;;
+2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;;
+2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -11250,6 +11285,7 @@
 312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
 312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
 312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
+312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;;
 3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
 3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
 3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
@@ -12016,7 +12052,7 @@
 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
 4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
-9FD5;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+9FEA;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
 A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
 A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
@@ -17093,6 +17129,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
 10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
 10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
+1032D;OLD ITALIC LETTER YE;Lo;0;L;;;;;N;;;;;
+1032E;OLD ITALIC LETTER NORTHERN TSE;Lo;0;L;;;;;N;;;;;
+1032F;OLD ITALIC LETTER SOUTHERN TSE;Lo;0;L;;;;;N;;;;;
 10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
 10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
 10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
@@ -20068,6 +20107,158 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 118F1;WARANG CITI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
 118F2;WARANG CITI NUMBER NINETY;No;0;L;;;;90;N;;;;;
 118FF;WARANG CITI OM;Lo;0;L;;;;;N;;;;;
+11A00;ZANABAZAR SQUARE LETTER A;Lo;0;L;;;;;N;;;;;
+11A01;ZANABAZAR SQUARE VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A02;ZANABAZAR SQUARE VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A03;ZANABAZAR SQUARE VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;;
+11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;;
+11A0C;ZANABAZAR SQUARE LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A0D;ZANABAZAR SQUARE LETTER GA;Lo;0;L;;;;;N;;;;;
+11A0E;ZANABAZAR SQUARE LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A0F;ZANABAZAR SQUARE LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A10;ZANABAZAR SQUARE LETTER CA;Lo;0;L;;;;;N;;;;;
+11A11;ZANABAZAR SQUARE LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A12;ZANABAZAR SQUARE LETTER JA;Lo;0;L;;;;;N;;;;;
+11A13;ZANABAZAR SQUARE LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A14;ZANABAZAR SQUARE LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A15;ZANABAZAR SQUARE LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A16;ZANABAZAR SQUARE LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A17;ZANABAZAR SQUARE LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A18;ZANABAZAR SQUARE LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A19;ZANABAZAR SQUARE LETTER TA;Lo;0;L;;;;;N;;;;;
+11A1A;ZANABAZAR SQUARE LETTER THA;Lo;0;L;;;;;N;;;;;
+11A1B;ZANABAZAR SQUARE LETTER DA;Lo;0;L;;;;;N;;;;;
+11A1C;ZANABAZAR SQUARE LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A1D;ZANABAZAR SQUARE LETTER NA;Lo;0;L;;;;;N;;;;;
+11A1E;ZANABAZAR SQUARE LETTER PA;Lo;0;L;;;;;N;;;;;
+11A1F;ZANABAZAR SQUARE LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A20;ZANABAZAR SQUARE LETTER BA;Lo;0;L;;;;;N;;;;;
+11A21;ZANABAZAR SQUARE LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A22;ZANABAZAR SQUARE LETTER MA;Lo;0;L;;;;;N;;;;;
+11A23;ZANABAZAR SQUARE LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A24;ZANABAZAR SQUARE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A25;ZANABAZAR SQUARE LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A26;ZANABAZAR SQUARE LETTER DZHA;Lo;0;L;;;;;N;;;;;
+11A27;ZANABAZAR SQUARE LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A28;ZANABAZAR SQUARE LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A29;ZANABAZAR SQUARE LETTER -A;Lo;0;L;;;;;N;;;;;
+11A2A;ZANABAZAR SQUARE LETTER YA;Lo;0;L;;;;;N;;;;;
+11A2B;ZANABAZAR SQUARE LETTER RA;Lo;0;L;;;;;N;;;;;
+11A2C;ZANABAZAR SQUARE LETTER LA;Lo;0;L;;;;;N;;;;;
+11A2D;ZANABAZAR SQUARE LETTER VA;Lo;0;L;;;;;N;;;;;
+11A2E;ZANABAZAR SQUARE LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A2F;ZANABAZAR SQUARE LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A30;ZANABAZAR SQUARE LETTER SA;Lo;0;L;;;;;N;;;;;
+11A31;ZANABAZAR SQUARE LETTER HA;Lo;0;L;;;;;N;;;;;
+11A32;ZANABAZAR SQUARE LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A33;ZANABAZAR SQUARE FINAL CONSONANT MARK;Mn;0;NSM;;;;;N;;;;;
+11A34;ZANABAZAR SQUARE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11A35;ZANABAZAR SQUARE SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11A36;ZANABAZAR SQUARE SIGN CANDRABINDU WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A37;ZANABAZAR SQUARE SIGN CANDRA WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A38;ZANABAZAR SQUARE SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A39;ZANABAZAR SQUARE SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A3A;ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A3B;ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA;Mn;0;NSM;;;;;N;;;;;
+11A3C;ZANABAZAR SQUARE CLUSTER-FINAL LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11A3D;ZANABAZAR SQUARE CLUSTER-FINAL LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11A3E;ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA;Mn;0;NSM;;;;;N;;;;;
+11A3F;ZANABAZAR SQUARE INITIAL HEAD MARK;Po;0;L;;;;;N;;;;;
+11A40;ZANABAZAR SQUARE CLOSING HEAD MARK;Po;0;L;;;;;N;;;;;
+11A41;ZANABAZAR SQUARE MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A42;ZANABAZAR SQUARE MARK SHAD;Po;0;L;;;;;N;;;;;
+11A43;ZANABAZAR SQUARE MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A44;ZANABAZAR SQUARE MARK LONG TSHEG;Po;0;L;;;;;N;;;;;
+11A45;ZANABAZAR SQUARE INITIAL DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A46;ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A47;ZANABAZAR SQUARE SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A50;SOYOMBO LETTER A;Lo;0;L;;;;;N;;;;;
+11A51;SOYOMBO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A52;SOYOMBO VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A53;SOYOMBO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A54;SOYOMBO VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A55;SOYOMBO VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A56;SOYOMBO VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A57;SOYOMBO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11A58;SOYOMBO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A59;SOYOMBO VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11A5A;SOYOMBO VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11A5B;SOYOMBO VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A5C;SOYOMBO LETTER KA;Lo;0;L;;;;;N;;;;;
+11A5D;SOYOMBO LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A5E;SOYOMBO LETTER GA;Lo;0;L;;;;;N;;;;;
+11A5F;SOYOMBO LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A60;SOYOMBO LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A61;SOYOMBO LETTER CA;Lo;0;L;;;;;N;;;;;
+11A62;SOYOMBO LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A63;SOYOMBO LETTER JA;Lo;0;L;;;;;N;;;;;
+11A64;SOYOMBO LETTER JHA;Lo;0;L;;;;;N;;;;;
+11A65;SOYOMBO LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A66;SOYOMBO LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A67;SOYOMBO LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A68;SOYOMBO LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A69;SOYOMBO LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A6A;SOYOMBO LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A6B;SOYOMBO LETTER TA;Lo;0;L;;;;;N;;;;;
+11A6C;SOYOMBO LETTER THA;Lo;0;L;;;;;N;;;;;
+11A6D;SOYOMBO LETTER DA;Lo;0;L;;;;;N;;;;;
+11A6E;SOYOMBO LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A6F;SOYOMBO LETTER NA;Lo;0;L;;;;;N;;;;;
+11A70;SOYOMBO LETTER PA;Lo;0;L;;;;;N;;;;;
+11A71;SOYOMBO LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A72;SOYOMBO LETTER BA;Lo;0;L;;;;;N;;;;;
+11A73;SOYOMBO LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A74;SOYOMBO LETTER MA;Lo;0;L;;;;;N;;;;;
+11A75;SOYOMBO LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A76;SOYOMBO LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A77;SOYOMBO LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A78;SOYOMBO LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A79;SOYOMBO LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A7A;SOYOMBO LETTER -A;Lo;0;L;;;;;N;;;;;
+11A7B;SOYOMBO LETTER YA;Lo;0;L;;;;;N;;;;;
+11A7C;SOYOMBO LETTER RA;Lo;0;L;;;;;N;;;;;
+11A7D;SOYOMBO LETTER LA;Lo;0;L;;;;;N;;;;;
+11A7E;SOYOMBO LETTER VA;Lo;0;L;;;;;N;;;;;
+11A7F;SOYOMBO LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A80;SOYOMBO LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A81;SOYOMBO LETTER SA;Lo;0;L;;;;;N;;;;;
+11A82;SOYOMBO LETTER HA;Lo;0;L;;;;;N;;;;;
+11A83;SOYOMBO LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A86;SOYOMBO CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A87;SOYOMBO CLUSTER-INITIAL LETTER LA;Lo;0;L;;;;;N;;;;;
+11A88;SOYOMBO CLUSTER-INITIAL LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A89;SOYOMBO CLUSTER-INITIAL LETTER SA;Lo;0;L;;;;;N;;;;;
+11A8A;SOYOMBO FINAL CONSONANT SIGN G;Mn;0;NSM;;;;;N;;;;;
+11A8B;SOYOMBO FINAL CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+11A8C;SOYOMBO FINAL CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+11A8D;SOYOMBO FINAL CONSONANT SIGN D;Mn;0;NSM;;;;;N;;;;;
+11A8E;SOYOMBO FINAL CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+11A8F;SOYOMBO FINAL CONSONANT SIGN B;Mn;0;NSM;;;;;N;;;;;
+11A90;SOYOMBO FINAL CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+11A91;SOYOMBO FINAL CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+11A92;SOYOMBO FINAL CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+11A93;SOYOMBO FINAL CONSONANT SIGN SH;Mn;0;NSM;;;;;N;;;;;
+11A94;SOYOMBO FINAL CONSONANT SIGN S;Mn;0;NSM;;;;;N;;;;;
+11A95;SOYOMBO FINAL CONSONANT SIGN -A;Mn;0;NSM;;;;;N;;;;;
+11A96;SOYOMBO SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A97;SOYOMBO SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A98;SOYOMBO GEMINATION MARK;Mn;0;NSM;;;;;N;;;;;
+11A99;SOYOMBO SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;;
+11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;;
+11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;;
+11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;;
+11AA1;SOYOMBO TERMINAL MARK-1;Po;0;L;;;;;N;;;;;
+11AA2;SOYOMBO TERMINAL MARK-2;Po;0;L;;;;;N;;;;;
 11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;;
 11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;;
 11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;;
@@ -20290,6 +20481,81 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
 11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11D00;MASARAM GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D01;MASARAM GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D02;MASARAM GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D03;MASARAM GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D04;MASARAM GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D05;MASARAM GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D06;MASARAM GONDI LETTER E;Lo;0;L;;;;;N;;;;;
+11D08;MASARAM GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D09;MASARAM GONDI LETTER O;Lo;0;L;;;;;N;;;;;
+11D0B;MASARAM GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D0C;MASARAM GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D0D;MASARAM GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D0E;MASARAM GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D0F;MASARAM GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D10;MASARAM GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D11;MASARAM GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D12;MASARAM GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D13;MASARAM GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D14;MASARAM GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D15;MASARAM GONDI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11D16;MASARAM GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D17;MASARAM GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D18;MASARAM GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D19;MASARAM GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D1A;MASARAM GONDI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11D1B;MASARAM GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D1C;MASARAM GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D1D;MASARAM GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D1E;MASARAM GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D1F;MASARAM GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D20;MASARAM GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D21;MASARAM GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D22;MASARAM GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D23;MASARAM GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D24;MASARAM GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D25;MASARAM GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D26;MASARAM GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D27;MASARAM GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D28;MASARAM GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D29;MASARAM GONDI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11D2A;MASARAM GONDI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11D2B;MASARAM GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D2C;MASARAM GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D2D;MASARAM GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D2E;MASARAM GONDI LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11D2F;MASARAM GONDI LETTER JNYA;Lo;0;L;;;;;N;;;;;
+11D30;MASARAM GONDI LETTER TRA;Lo;0;L;;;;;N;;;;;
+11D31;MASARAM GONDI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11D32;MASARAM GONDI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11D33;MASARAM GONDI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11D34;MASARAM GONDI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11D35;MASARAM GONDI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11D36;MASARAM GONDI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11D3A;MASARAM GONDI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11D3C;MASARAM GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D3D;MASARAM GONDI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11D3F;MASARAM GONDI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11D40;MASARAM GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D41;MASARAM GONDI SIGN VISARGA;Mn;0;NSM;;;;;N;;;;;
+11D42;MASARAM GONDI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11D43;MASARAM GONDI SIGN CANDRA;Mn;0;NSM;;;;;N;;;;;
+11D44;MASARAM GONDI SIGN HALANTA;Mn;9;NSM;;;;;N;;;;;
+11D45;MASARAM GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D46;MASARAM GONDI REPHA;Lo;0;L;;;;;N;;;;;
+11D47;MASARAM GONDI RA-KARA;Mn;0;NSM;;;;;N;;;;;
+11D50;MASARAM GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11D51;MASARAM GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11D52;MASARAM GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11D53;MASARAM GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11D54;MASARAM GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11D55;MASARAM GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11D56;MASARAM GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -24087,6 +24353,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;;
 16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;;
 16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
+16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;;
 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
 187EC;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
@@ -24846,6 +25113,687 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;;
 1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;;
 1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
+1B002;HENTAIGANA LETTER A-1;Lo;0;L;;;;;N;;;;;
+1B003;HENTAIGANA LETTER A-2;Lo;0;L;;;;;N;;;;;
+1B004;HENTAIGANA LETTER A-3;Lo;0;L;;;;;N;;;;;
+1B005;HENTAIGANA LETTER A-WO;Lo;0;L;;;;;N;;;;;
+1B006;HENTAIGANA LETTER I-1;Lo;0;L;;;;;N;;;;;
+1B007;HENTAIGANA LETTER I-2;Lo;0;L;;;;;N;;;;;
+1B008;HENTAIGANA LETTER I-3;Lo;0;L;;;;;N;;;;;
+1B009;HENTAIGANA LETTER I-4;Lo;0;L;;;;;N;;;;;
+1B00A;HENTAIGANA LETTER U-1;Lo;0;L;;;;;N;;;;;
+1B00B;HENTAIGANA LETTER U-2;Lo;0;L;;;;;N;;;;;
+1B00C;HENTAIGANA LETTER U-3;Lo;0;L;;;;;N;;;;;
+1B00D;HENTAIGANA LETTER U-4;Lo;0;L;;;;;N;;;;;
+1B00E;HENTAIGANA LETTER U-5;Lo;0;L;;;;;N;;;;;
+1B00F;HENTAIGANA LETTER E-2;Lo;0;L;;;;;N;;;;;
+1B010;HENTAIGANA LETTER E-3;Lo;0;L;;;;;N;;;;;
+1B011;HENTAIGANA LETTER E-4;Lo;0;L;;;;;N;;;;;
+1B012;HENTAIGANA LETTER E-5;Lo;0;L;;;;;N;;;;;
+1B013;HENTAIGANA LETTER E-6;Lo;0;L;;;;;N;;;;;
+1B014;HENTAIGANA LETTER O-1;Lo;0;L;;;;;N;;;;;
+1B015;HENTAIGANA LETTER O-2;Lo;0;L;;;;;N;;;;;
+1B016;HENTAIGANA LETTER O-3;Lo;0;L;;;;;N;;;;;
+1B017;HENTAIGANA LETTER KA-1;Lo;0;L;;;;;N;;;;;
+1B018;HENTAIGANA LETTER KA-2;Lo;0;L;;;;;N;;;;;
+1B019;HENTAIGANA LETTER KA-3;Lo;0;L;;;;;N;;;;;
+1B01A;HENTAIGANA LETTER KA-4;Lo;0;L;;;;;N;;;;;
+1B01B;HENTAIGANA LETTER KA-5;Lo;0;L;;;;;N;;;;;
+1B01C;HENTAIGANA LETTER KA-6;Lo;0;L;;;;;N;;;;;
+1B01D;HENTAIGANA LETTER KA-7;Lo;0;L;;;;;N;;;;;
+1B01E;HENTAIGANA LETTER KA-8;Lo;0;L;;;;;N;;;;;
+1B01F;HENTAIGANA LETTER KA-9;Lo;0;L;;;;;N;;;;;
+1B020;HENTAIGANA LETTER KA-10;Lo;0;L;;;;;N;;;;;
+1B021;HENTAIGANA LETTER KA-11;Lo;0;L;;;;;N;;;;;
+1B022;HENTAIGANA LETTER KA-KE;Lo;0;L;;;;;N;;;;;
+1B023;HENTAIGANA LETTER KI-1;Lo;0;L;;;;;N;;;;;
+1B024;HENTAIGANA LETTER KI-2;Lo;0;L;;;;;N;;;;;
+1B025;HENTAIGANA LETTER KI-3;Lo;0;L;;;;;N;;;;;
+1B026;HENTAIGANA LETTER KI-4;Lo;0;L;;;;;N;;;;;
+1B027;HENTAIGANA LETTER KI-5;Lo;0;L;;;;;N;;;;;
+1B028;HENTAIGANA LETTER KI-6;Lo;0;L;;;;;N;;;;;
+1B029;HENTAIGANA LETTER KI-7;Lo;0;L;;;;;N;;;;;
+1B02A;HENTAIGANA LETTER KI-8;Lo;0;L;;;;;N;;;;;
+1B02B;HENTAIGANA LETTER KU-1;Lo;0;L;;;;;N;;;;;
+1B02C;HENTAIGANA LETTER KU-2;Lo;0;L;;;;;N;;;;;
+1B02D;HENTAIGANA LETTER KU-3;Lo;0;L;;;;;N;;;;;
+1B02E;HENTAIGANA LETTER KU-4;Lo;0;L;;;;;N;;;;;
+1B02F;HENTAIGANA LETTER KU-5;Lo;0;L;;;;;N;;;;;
+1B030;HENTAIGANA LETTER KU-6;Lo;0;L;;;;;N;;;;;
+1B031;HENTAIGANA LETTER KU-7;Lo;0;L;;;;;N;;;;;
+1B032;HENTAIGANA LETTER KE-1;Lo;0;L;;;;;N;;;;;
+1B033;HENTAIGANA LETTER KE-2;Lo;0;L;;;;;N;;;;;
+1B034;HENTAIGANA LETTER KE-3;Lo;0;L;;;;;N;;;;;
+1B035;HENTAIGANA LETTER KE-4;Lo;0;L;;;;;N;;;;;
+1B036;HENTAIGANA LETTER KE-5;Lo;0;L;;;;;N;;;;;
+1B037;HENTAIGANA LETTER KE-6;Lo;0;L;;;;;N;;;;;
+1B038;HENTAIGANA LETTER KO-1;Lo;0;L;;;;;N;;;;;
+1B039;HENTAIGANA LETTER KO-2;Lo;0;L;;;;;N;;;;;
+1B03A;HENTAIGANA LETTER KO-3;Lo;0;L;;;;;N;;;;;
+1B03B;HENTAIGANA LETTER KO-KI;Lo;0;L;;;;;N;;;;;
+1B03C;HENTAIGANA LETTER SA-1;Lo;0;L;;;;;N;;;;;
+1B03D;HENTAIGANA LETTER SA-2;Lo;0;L;;;;;N;;;;;
+1B03E;HENTAIGANA LETTER SA-3;Lo;0;L;;;;;N;;;;;
+1B03F;HENTAIGANA LETTER SA-4;Lo;0;L;;;;;N;;;;;
+1B040;HENTAIGANA LETTER SA-5;Lo;0;L;;;;;N;;;;;
+1B041;HENTAIGANA LETTER SA-6;Lo;0;L;;;;;N;;;;;
+1B042;HENTAIGANA LETTER SA-7;Lo;0;L;;;;;N;;;;;
+1B043;HENTAIGANA LETTER SA-8;Lo;0;L;;;;;N;;;;;
+1B044;HENTAIGANA LETTER SI-1;Lo;0;L;;;;;N;;;;;
+1B045;HENTAIGANA LETTER SI-2;Lo;0;L;;;;;N;;;;;
+1B046;HENTAIGANA LETTER SI-3;Lo;0;L;;;;;N;;;;;
+1B047;HENTAIGANA LETTER SI-4;Lo;0;L;;;;;N;;;;;
+1B048;HENTAIGANA LETTER SI-5;Lo;0;L;;;;;N;;;;;
+1B049;HENTAIGANA LETTER SI-6;Lo;0;L;;;;;N;;;;;
+1B04A;HENTAIGANA LETTER SU-1;Lo;0;L;;;;;N;;;;;
+1B04B;HENTAIGANA LETTER SU-2;Lo;0;L;;;;;N;;;;;
+1B04C;HENTAIGANA LETTER SU-3;Lo;0;L;;;;;N;;;;;
+1B04D;HENTAIGANA LETTER SU-4;Lo;0;L;;;;;N;;;;;
+1B04E;HENTAIGANA LETTER SU-5;Lo;0;L;;;;;N;;;;;
+1B04F;HENTAIGANA LETTER SU-6;Lo;0;L;;;;;N;;;;;
+1B050;HENTAIGANA LETTER SU-7;Lo;0;L;;;;;N;;;;;
+1B051;HENTAIGANA LETTER SU-8;Lo;0;L;;;;;N;;;;;
+1B052;HENTAIGANA LETTER SE-1;Lo;0;L;;;;;N;;;;;
+1B053;HENTAIGANA LETTER SE-2;Lo;0;L;;;;;N;;;;;
+1B054;HENTAIGANA LETTER SE-3;Lo;0;L;;;;;N;;;;;
+1B055;HENTAIGANA LETTER SE-4;Lo;0;L;;;;;N;;;;;
+1B056;HENTAIGANA LETTER SE-5;Lo;0;L;;;;;N;;;;;
+1B057;HENTAIGANA LETTER SO-1;Lo;0;L;;;;;N;;;;;
+1B058;HENTAIGANA LETTER SO-2;Lo;0;L;;;;;N;;;;;
+1B059;HENTAIGANA LETTER SO-3;Lo;0;L;;;;;N;;;;;
+1B05A;HENTAIGANA LETTER SO-4;Lo;0;L;;;;;N;;;;;
+1B05B;HENTAIGANA LETTER SO-5;Lo;0;L;;;;;N;;;;;
+1B05C;HENTAIGANA LETTER SO-6;Lo;0;L;;;;;N;;;;;
+1B05D;HENTAIGANA LETTER SO-7;Lo;0;L;;;;;N;;;;;
+1B05E;HENTAIGANA LETTER TA-1;Lo;0;L;;;;;N;;;;;
+1B05F;HENTAIGANA LETTER TA-2;Lo;0;L;;;;;N;;;;;
+1B060;HENTAIGANA LETTER TA-3;Lo;0;L;;;;;N;;;;;
+1B061;HENTAIGANA LETTER TA-4;Lo;0;L;;;;;N;;;;;
+1B062;HENTAIGANA LETTER TI-1;Lo;0;L;;;;;N;;;;;
+1B063;HENTAIGANA LETTER TI-2;Lo;0;L;;;;;N;;;;;
+1B064;HENTAIGANA LETTER TI-3;Lo;0;L;;;;;N;;;;;
+1B065;HENTAIGANA LETTER TI-4;Lo;0;L;;;;;N;;;;;
+1B066;HENTAIGANA LETTER TI-5;Lo;0;L;;;;;N;;;;;
+1B067;HENTAIGANA LETTER TI-6;Lo;0;L;;;;;N;;;;;
+1B068;HENTAIGANA LETTER TI-7;Lo;0;L;;;;;N;;;;;
+1B069;HENTAIGANA LETTER TU-1;Lo;0;L;;;;;N;;;;;
+1B06A;HENTAIGANA LETTER TU-2;Lo;0;L;;;;;N;;;;;
+1B06B;HENTAIGANA LETTER TU-3;Lo;0;L;;;;;N;;;;;
+1B06C;HENTAIGANA LETTER TU-4;Lo;0;L;;;;;N;;;;;
+1B06D;HENTAIGANA LETTER TU-TO;Lo;0;L;;;;;N;;;;;
+1B06E;HENTAIGANA LETTER TE-1;Lo;0;L;;;;;N;;;;;
+1B06F;HENTAIGANA LETTER TE-2;Lo;0;L;;;;;N;;;;;
+1B070;HENTAIGANA LETTER TE-3;Lo;0;L;;;;;N;;;;;
+1B071;HENTAIGANA LETTER TE-4;Lo;0;L;;;;;N;;;;;
+1B072;HENTAIGANA LETTER TE-5;Lo;0;L;;;;;N;;;;;
+1B073;HENTAIGANA LETTER TE-6;Lo;0;L;;;;;N;;;;;
+1B074;HENTAIGANA LETTER TE-7;Lo;0;L;;;;;N;;;;;
+1B075;HENTAIGANA LETTER TE-8;Lo;0;L;;;;;N;;;;;
+1B076;HENTAIGANA LETTER TE-9;Lo;0;L;;;;;N;;;;;
+1B077;HENTAIGANA LETTER TO-1;Lo;0;L;;;;;N;;;;;
+1B078;HENTAIGANA LETTER TO-2;Lo;0;L;;;;;N;;;;;
+1B079;HENTAIGANA LETTER TO-3;Lo;0;L;;;;;N;;;;;
+1B07A;HENTAIGANA LETTER TO-4;Lo;0;L;;;;;N;;;;;
+1B07B;HENTAIGANA LETTER TO-5;Lo;0;L;;;;;N;;;;;
+1B07C;HENTAIGANA LETTER TO-6;Lo;0;L;;;;;N;;;;;
+1B07D;HENTAIGANA LETTER TO-RA;Lo;0;L;;;;;N;;;;;
+1B07E;HENTAIGANA LETTER NA-1;Lo;0;L;;;;;N;;;;;
+1B07F;HENTAIGANA LETTER NA-2;Lo;0;L;;;;;N;;;;;
+1B080;HENTAIGANA LETTER NA-3;Lo;0;L;;;;;N;;;;;
+1B081;HENTAIGANA LETTER NA-4;Lo;0;L;;;;;N;;;;;
+1B082;HENTAIGANA LETTER NA-5;Lo;0;L;;;;;N;;;;;
+1B083;HENTAIGANA LETTER NA-6;Lo;0;L;;;;;N;;;;;
+1B084;HENTAIGANA LETTER NA-7;Lo;0;L;;;;;N;;;;;
+1B085;HENTAIGANA LETTER NA-8;Lo;0;L;;;;;N;;;;;
+1B086;HENTAIGANA LETTER NA-9;Lo;0;L;;;;;N;;;;;
+1B087;HENTAIGANA LETTER NI-1;Lo;0;L;;;;;N;;;;;
+1B088;HENTAIGANA LETTER NI-2;Lo;0;L;;;;;N;;;;;
+1B089;HENTAIGANA LETTER NI-3;Lo;0;L;;;;;N;;;;;
+1B08A;HENTAIGANA LETTER NI-4;Lo;0;L;;;;;N;;;;;
+1B08B;HENTAIGANA LETTER NI-5;Lo;0;L;;;;;N;;;;;
+1B08C;HENTAIGANA LETTER NI-6;Lo;0;L;;;;;N;;;;;
+1B08D;HENTAIGANA LETTER NI-7;Lo;0;L;;;;;N;;;;;
+1B08E;HENTAIGANA LETTER NI-TE;Lo;0;L;;;;;N;;;;;
+1B08F;HENTAIGANA LETTER NU-1;Lo;0;L;;;;;N;;;;;
+1B090;HENTAIGANA LETTER NU-2;Lo;0;L;;;;;N;;;;;
+1B091;HENTAIGANA LETTER NU-3;Lo;0;L;;;;;N;;;;;
+1B092;HENTAIGANA LETTER NE-1;Lo;0;L;;;;;N;;;;;
+1B093;HENTAIGANA LETTER NE-2;Lo;0;L;;;;;N;;;;;
+1B094;HENTAIGANA LETTER NE-3;Lo;0;L;;;;;N;;;;;
+1B095;HENTAIGANA LETTER NE-4;Lo;0;L;;;;;N;;;;;
+1B096;HENTAIGANA LETTER NE-5;Lo;0;L;;;;;N;;;;;
+1B097;HENTAIGANA LETTER NE-6;Lo;0;L;;;;;N;;;;;
+1B098;HENTAIGANA LETTER NE-KO;Lo;0;L;;;;;N;;;;;
+1B099;HENTAIGANA LETTER NO-1;Lo;0;L;;;;;N;;;;;
+1B09A;HENTAIGANA LETTER NO-2;Lo;0;L;;;;;N;;;;;
+1B09B;HENTAIGANA LETTER NO-3;Lo;0;L;;;;;N;;;;;
+1B09C;HENTAIGANA LETTER NO-4;Lo;0;L;;;;;N;;;;;
+1B09D;HENTAIGANA LETTER NO-5;Lo;0;L;;;;;N;;;;;
+1B09E;HENTAIGANA LETTER HA-1;Lo;0;L;;;;;N;;;;;
+1B09F;HENTAIGANA LETTER HA-2;Lo;0;L;;;;;N;;;;;
+1B0A0;HENTAIGANA LETTER HA-3;Lo;0;L;;;;;N;;;;;
+1B0A1;HENTAIGANA LETTER HA-4;Lo;0;L;;;;;N;;;;;
+1B0A2;HENTAIGANA LETTER HA-5;Lo;0;L;;;;;N;;;;;
+1B0A3;HENTAIGANA LETTER HA-6;Lo;0;L;;;;;N;;;;;
+1B0A4;HENTAIGANA LETTER HA-7;Lo;0;L;;;;;N;;;;;
+1B0A5;HENTAIGANA LETTER HA-8;Lo;0;L;;;;;N;;;;;
+1B0A6;HENTAIGANA LETTER HA-9;Lo;0;L;;;;;N;;;;;
+1B0A7;HENTAIGANA LETTER HA-10;Lo;0;L;;;;;N;;;;;
+1B0A8;HENTAIGANA LETTER HA-11;Lo;0;L;;;;;N;;;;;
+1B0A9;HENTAIGANA LETTER HI-1;Lo;0;L;;;;;N;;;;;
+1B0AA;HENTAIGANA LETTER HI-2;Lo;0;L;;;;;N;;;;;
+1B0AB;HENTAIGANA LETTER HI-3;Lo;0;L;;;;;N;;;;;
+1B0AC;HENTAIGANA LETTER HI-4;Lo;0;L;;;;;N;;;;;
+1B0AD;HENTAIGANA LETTER HI-5;Lo;0;L;;;;;N;;;;;
+1B0AE;HENTAIGANA LETTER HI-6;Lo;0;L;;;;;N;;;;;
+1B0AF;HENTAIGANA LETTER HI-7;Lo;0;L;;;;;N;;;;;
+1B0B0;HENTAIGANA LETTER HU-1;Lo;0;L;;;;;N;;;;;
+1B0B1;HENTAIGANA LETTER HU-2;Lo;0;L;;;;;N;;;;;
+1B0B2;HENTAIGANA LETTER HU-3;Lo;0;L;;;;;N;;;;;
+1B0B3;HENTAIGANA LETTER HE-1;Lo;0;L;;;;;N;;;;;
+1B0B4;HENTAIGANA LETTER HE-2;Lo;0;L;;;;;N;;;;;
+1B0B5;HENTAIGANA LETTER HE-3;Lo;0;L;;;;;N;;;;;
+1B0B6;HENTAIGANA LETTER HE-4;Lo;0;L;;;;;N;;;;;
+1B0B7;HENTAIGANA LETTER HE-5;Lo;0;L;;;;;N;;;;;
+1B0B8;HENTAIGANA LETTER HE-6;Lo;0;L;;;;;N;;;;;
+1B0B9;HENTAIGANA LETTER HE-7;Lo;0;L;;;;;N;;;;;
+1B0BA;HENTAIGANA LETTER HO-1;Lo;0;L;;;;;N;;;;;
+1B0BB;HENTAIGANA LETTER HO-2;Lo;0;L;;;;;N;;;;;
+1B0BC;HENTAIGANA LETTER HO-3;Lo;0;L;;;;;N;;;;;
+1B0BD;HENTAIGANA LETTER HO-4;Lo;0;L;;;;;N;;;;;
+1B0BE;HENTAIGANA LETTER HO-5;Lo;0;L;;;;;N;;;;;
+1B0BF;HENTAIGANA LETTER HO-6;Lo;0;L;;;;;N;;;;;
+1B0C0;HENTAIGANA LETTER HO-7;Lo;0;L;;;;;N;;;;;
+1B0C1;HENTAIGANA LETTER HO-8;Lo;0;L;;;;;N;;;;;
+1B0C2;HENTAIGANA LETTER MA-1;Lo;0;L;;;;;N;;;;;
+1B0C3;HENTAIGANA LETTER MA-2;Lo;0;L;;;;;N;;;;;
+1B0C4;HENTAIGANA LETTER MA-3;Lo;0;L;;;;;N;;;;;
+1B0C5;HENTAIGANA LETTER MA-4;Lo;0;L;;;;;N;;;;;
+1B0C6;HENTAIGANA LETTER MA-5;Lo;0;L;;;;;N;;;;;
+1B0C7;HENTAIGANA LETTER MA-6;Lo;0;L;;;;;N;;;;;
+1B0C8;HENTAIGANA LETTER MA-7;Lo;0;L;;;;;N;;;;;
+1B0C9;HENTAIGANA LETTER MI-1;Lo;0;L;;;;;N;;;;;
+1B0CA;HENTAIGANA LETTER MI-2;Lo;0;L;;;;;N;;;;;
+1B0CB;HENTAIGANA LETTER MI-3;Lo;0;L;;;;;N;;;;;
+1B0CC;HENTAIGANA LETTER MI-4;Lo;0;L;;;;;N;;;;;
+1B0CD;HENTAIGANA LETTER MI-5;Lo;0;L;;;;;N;;;;;
+1B0CE;HENTAIGANA LETTER MI-6;Lo;0;L;;;;;N;;;;;
+1B0CF;HENTAIGANA LETTER MI-7;Lo;0;L;;;;;N;;;;;
+1B0D0;HENTAIGANA LETTER MU-1;Lo;0;L;;;;;N;;;;;
+1B0D1;HENTAIGANA LETTER MU-2;Lo;0;L;;;;;N;;;;;
+1B0D2;HENTAIGANA LETTER MU-3;Lo;0;L;;;;;N;;;;;
+1B0D3;HENTAIGANA LETTER MU-4;Lo;0;L;;;;;N;;;;;
+1B0D4;HENTAIGANA LETTER ME-1;Lo;0;L;;;;;N;;;;;
+1B0D5;HENTAIGANA LETTER ME-2;Lo;0;L;;;;;N;;;;;
+1B0D6;HENTAIGANA LETTER ME-MA;Lo;0;L;;;;;N;;;;;
+1B0D7;HENTAIGANA LETTER MO-1;Lo;0;L;;;;;N;;;;;
+1B0D8;HENTAIGANA LETTER MO-2;Lo;0;L;;;;;N;;;;;
+1B0D9;HENTAIGANA LETTER MO-3;Lo;0;L;;;;;N;;;;;
+1B0DA;HENTAIGANA LETTER MO-4;Lo;0;L;;;;;N;;;;;
+1B0DB;HENTAIGANA LETTER MO-5;Lo;0;L;;;;;N;;;;;
+1B0DC;HENTAIGANA LETTER MO-6;Lo;0;L;;;;;N;;;;;
+1B0DD;HENTAIGANA LETTER YA-1;Lo;0;L;;;;;N;;;;;
+1B0DE;HENTAIGANA LETTER YA-2;Lo;0;L;;;;;N;;;;;
+1B0DF;HENTAIGANA LETTER YA-3;Lo;0;L;;;;;N;;;;;
+1B0E0;HENTAIGANA LETTER YA-4;Lo;0;L;;;;;N;;;;;
+1B0E1;HENTAIGANA LETTER YA-5;Lo;0;L;;;;;N;;;;;
+1B0E2;HENTAIGANA LETTER YA-YO;Lo;0;L;;;;;N;;;;;
+1B0E3;HENTAIGANA LETTER YU-1;Lo;0;L;;;;;N;;;;;
+1B0E4;HENTAIGANA LETTER YU-2;Lo;0;L;;;;;N;;;;;
+1B0E5;HENTAIGANA LETTER YU-3;Lo;0;L;;;;;N;;;;;
+1B0E6;HENTAIGANA LETTER YU-4;Lo;0;L;;;;;N;;;;;
+1B0E7;HENTAIGANA LETTER YO-1;Lo;0;L;;;;;N;;;;;
+1B0E8;HENTAIGANA LETTER YO-2;Lo;0;L;;;;;N;;;;;
+1B0E9;HENTAIGANA LETTER YO-3;Lo;0;L;;;;;N;;;;;
+1B0EA;HENTAIGANA LETTER YO-4;Lo;0;L;;;;;N;;;;;
+1B0EB;HENTAIGANA LETTER YO-5;Lo;0;L;;;;;N;;;;;
+1B0EC;HENTAIGANA LETTER YO-6;Lo;0;L;;;;;N;;;;;
+1B0ED;HENTAIGANA LETTER RA-1;Lo;0;L;;;;;N;;;;;
+1B0EE;HENTAIGANA LETTER RA-2;Lo;0;L;;;;;N;;;;;
+1B0EF;HENTAIGANA LETTER RA-3;Lo;0;L;;;;;N;;;;;
+1B0F0;HENTAIGANA LETTER RA-4;Lo;0;L;;;;;N;;;;;
+1B0F1;HENTAIGANA LETTER RI-1;Lo;0;L;;;;;N;;;;;
+1B0F2;HENTAIGANA LETTER RI-2;Lo;0;L;;;;;N;;;;;
+1B0F3;HENTAIGANA LETTER RI-3;Lo;0;L;;;;;N;;;;;
+1B0F4;HENTAIGANA LETTER RI-4;Lo;0;L;;;;;N;;;;;
+1B0F5;HENTAIGANA LETTER RI-5;Lo;0;L;;;;;N;;;;;
+1B0F6;HENTAIGANA LETTER RI-6;Lo;0;L;;;;;N;;;;;
+1B0F7;HENTAIGANA LETTER RI-7;Lo;0;L;;;;;N;;;;;
+1B0F8;HENTAIGANA LETTER RU-1;Lo;0;L;;;;;N;;;;;
+1B0F9;HENTAIGANA LETTER RU-2;Lo;0;L;;;;;N;;;;;
+1B0FA;HENTAIGANA LETTER RU-3;Lo;0;L;;;;;N;;;;;
+1B0FB;HENTAIGANA LETTER RU-4;Lo;0;L;;;;;N;;;;;
+1B0FC;HENTAIGANA LETTER RU-5;Lo;0;L;;;;;N;;;;;
+1B0FD;HENTAIGANA LETTER RU-6;Lo;0;L;;;;;N;;;;;
+1B0FE;HENTAIGANA LETTER RE-1;Lo;0;L;;;;;N;;;;;
+1B0FF;HENTAIGANA LETTER RE-2;Lo;0;L;;;;;N;;;;;
+1B100;HENTAIGANA LETTER RE-3;Lo;0;L;;;;;N;;;;;
+1B101;HENTAIGANA LETTER RE-4;Lo;0;L;;;;;N;;;;;
+1B102;HENTAIGANA LETTER RO-1;Lo;0;L;;;;;N;;;;;
+1B103;HENTAIGANA LETTER RO-2;Lo;0;L;;;;;N;;;;;
+1B104;HENTAIGANA LETTER RO-3;Lo;0;L;;;;;N;;;;;
+1B105;HENTAIGANA LETTER RO-4;Lo;0;L;;;;;N;;;;;
+1B106;HENTAIGANA LETTER RO-5;Lo;0;L;;;;;N;;;;;
+1B107;HENTAIGANA LETTER RO-6;Lo;0;L;;;;;N;;;;;
+1B108;HENTAIGANA LETTER WA-1;Lo;0;L;;;;;N;;;;;
+1B109;HENTAIGANA LETTER WA-2;Lo;0;L;;;;;N;;;;;
+1B10A;HENTAIGANA LETTER WA-3;Lo;0;L;;;;;N;;;;;
+1B10B;HENTAIGANA LETTER WA-4;Lo;0;L;;;;;N;;;;;
+1B10C;HENTAIGANA LETTER WA-5;Lo;0;L;;;;;N;;;;;
+1B10D;HENTAIGANA LETTER WI-1;Lo;0;L;;;;;N;;;;;
+1B10E;HENTAIGANA LETTER WI-2;Lo;0;L;;;;;N;;;;;
+1B10F;HENTAIGANA LETTER WI-3;Lo;0;L;;;;;N;;;;;
+1B110;HENTAIGANA LETTER WI-4;Lo;0;L;;;;;N;;;;;
+1B111;HENTAIGANA LETTER WI-5;Lo;0;L;;;;;N;;;;;
+1B112;HENTAIGANA LETTER WE-1;Lo;0;L;;;;;N;;;;;
+1B113;HENTAIGANA LETTER WE-2;Lo;0;L;;;;;N;;;;;
+1B114;HENTAIGANA LETTER WE-3;Lo;0;L;;;;;N;;;;;
+1B115;HENTAIGANA LETTER WE-4;Lo;0;L;;;;;N;;;;;
+1B116;HENTAIGANA LETTER WO-1;Lo;0;L;;;;;N;;;;;
+1B117;HENTAIGANA LETTER WO-2;Lo;0;L;;;;;N;;;;;
+1B118;HENTAIGANA LETTER WO-3;Lo;0;L;;;;;N;;;;;
+1B119;HENTAIGANA LETTER WO-4;Lo;0;L;;;;;N;;;;;
+1B11A;HENTAIGANA LETTER WO-5;Lo;0;L;;;;;N;;;;;
+1B11B;HENTAIGANA LETTER WO-6;Lo;0;L;;;;;N;;;;;
+1B11C;HENTAIGANA LETTER WO-7;Lo;0;L;;;;;N;;;;;
+1B11D;HENTAIGANA LETTER N-MU-MO-1;Lo;0;L;;;;;N;;;;;
+1B11E;HENTAIGANA LETTER N-MU-MO-2;Lo;0;L;;;;;N;;;;;
+1B170;NUSHU CHARACTER-1B170;Lo;0;L;;;;;N;;;;;
+1B171;NUSHU CHARACTER-1B171;Lo;0;L;;;;;N;;;;;
+1B172;NUSHU CHARACTER-1B172;Lo;0;L;;;;;N;;;;;
+1B173;NUSHU CHARACTER-1B173;Lo;0;L;;;;;N;;;;;
+1B174;NUSHU CHARACTER-1B174;Lo;0;L;;;;;N;;;;;
+1B175;NUSHU CHARACTER-1B175;Lo;0;L;;;;;N;;;;;
+1B176;NUSHU CHARACTER-1B176;Lo;0;L;;;;;N;;;;;
+1B177;NUSHU CHARACTER-1B177;Lo;0;L;;;;;N;;;;;
+1B178;NUSHU CHARACTER-1B178;Lo;0;L;;;;;N;;;;;
+1B179;NUSHU CHARACTER-1B179;Lo;0;L;;;;;N;;;;;
+1B17A;NUSHU CHARACTER-1B17A;Lo;0;L;;;;;N;;;;;
+1B17B;NUSHU CHARACTER-1B17B;Lo;0;L;;;;;N;;;;;
+1B17C;NUSHU CHARACTER-1B17C;Lo;0;L;;;;;N;;;;;
+1B17D;NUSHU CHARACTER-1B17D;Lo;0;L;;;;;N;;;;;
+1B17E;NUSHU CHARACTER-1B17E;Lo;0;L;;;;;N;;;;;
+1B17F;NUSHU CHARACTER-1B17F;Lo;0;L;;;;;N;;;;;
+1B180;NUSHU CHARACTER-1B180;Lo;0;L;;;;;N;;;;;
+1B181;NUSHU CHARACTER-1B181;Lo;0;L;;;;;N;;;;;
+1B182;NUSHU CHARACTER-1B182;Lo;0;L;;;;;N;;;;;
+1B183;NUSHU CHARACTER-1B183;Lo;0;L;;;;;N;;;;;
+1B184;NUSHU CHARACTER-1B184;Lo;0;L;;;;;N;;;;;
+1B185;NUSHU CHARACTER-1B185;Lo;0;L;;;;;N;;;;;
+1B186;NUSHU CHARACTER-1B186;Lo;0;L;;;;;N;;;;;
+1B187;NUSHU CHARACTER-1B187;Lo;0;L;;;;;N;;;;;
+1B188;NUSHU CHARACTER-1B188;Lo;0;L;;;;;N;;;;;
+1B189;NUSHU CHARACTER-1B189;Lo;0;L;;;;;N;;;;;
+1B18A;NUSHU CHARACTER-1B18A;Lo;0;L;;;;;N;;;;;
+1B18B;NUSHU CHARACTER-1B18B;Lo;0;L;;;;;N;;;;;
+1B18C;NUSHU CHARACTER-1B18C;Lo;0;L;;;;;N;;;;;
+1B18D;NUSHU CHARACTER-1B18D;Lo;0;L;;;;;N;;;;;
+1B18E;NUSHU CHARACTER-1B18E;Lo;0;L;;;;;N;;;;;
+1B18F;NUSHU CHARACTER-1B18F;Lo;0;L;;;;;N;;;;;
+1B190;NUSHU CHARACTER-1B190;Lo;0;L;;;;;N;;;;;
+1B191;NUSHU CHARACTER-1B191;Lo;0;L;;;;;N;;;;;
+1B192;NUSHU CHARACTER-1B192;Lo;0;L;;;;;N;;;;;
+1B193;NUSHU CHARACTER-1B193;Lo;0;L;;;;;N;;;;;
+1B194;NUSHU CHARACTER-1B194;Lo;0;L;;;;;N;;;;;
+1B195;NUSHU CHARACTER-1B195;Lo;0;L;;;;;N;;;;;
+1B196;NUSHU CHARACTER-1B196;Lo;0;L;;;;;N;;;;;
+1B197;NUSHU CHARACTER-1B197;Lo;0;L;;;;;N;;;;;
+1B198;NUSHU CHARACTER-1B198;Lo;0;L;;;;;N;;;;;
+1B199;NUSHU CHARACTER-1B199;Lo;0;L;;;;;N;;;;;
+1B19A;NUSHU CHARACTER-1B19A;Lo;0;L;;;;;N;;;;;
+1B19B;NUSHU CHARACTER-1B19B;Lo;0;L;;;;;N;;;;;
+1B19C;NUSHU CHARACTER-1B19C;Lo;0;L;;;;;N;;;;;
+1B19D;NUSHU CHARACTER-1B19D;Lo;0;L;;;;;N;;;;;
+1B19E;NUSHU CHARACTER-1B19E;Lo;0;L;;;;;N;;;;;
+1B19F;NUSHU CHARACTER-1B19F;Lo;0;L;;;;;N;;;;;
+1B1A0;NUSHU CHARACTER-1B1A0;Lo;0;L;;;;;N;;;;;
+1B1A1;NUSHU CHARACTER-1B1A1;Lo;0;L;;;;;N;;;;;
+1B1A2;NUSHU CHARACTER-1B1A2;Lo;0;L;;;;;N;;;;;
+1B1A3;NUSHU CHARACTER-1B1A3;Lo;0;L;;;;;N;;;;;
+1B1A4;NUSHU CHARACTER-1B1A4;Lo;0;L;;;;;N;;;;;
+1B1A5;NUSHU CHARACTER-1B1A5;Lo;0;L;;;;;N;;;;;
+1B1A6;NUSHU CHARACTER-1B1A6;Lo;0;L;;;;;N;;;;;
+1B1A7;NUSHU CHARACTER-1B1A7;Lo;0;L;;;;;N;;;;;
+1B1A8;NUSHU CHARACTER-1B1A8;Lo;0;L;;;;;N;;;;;
+1B1A9;NUSHU CHARACTER-1B1A9;Lo;0;L;;;;;N;;;;;
+1B1AA;NUSHU CHARACTER-1B1AA;Lo;0;L;;;;;N;;;;;
+1B1AB;NUSHU CHARACTER-1B1AB;Lo;0;L;;;;;N;;;;;
+1B1AC;NUSHU CHARACTER-1B1AC;Lo;0;L;;;;;N;;;;;
+1B1AD;NUSHU CHARACTER-1B1AD;Lo;0;L;;;;;N;;;;;
+1B1AE;NUSHU CHARACTER-1B1AE;Lo;0;L;;;;;N;;;;;
+1B1AF;NUSHU CHARACTER-1B1AF;Lo;0;L;;;;;N;;;;;
+1B1B0;NUSHU CHARACTER-1B1B0;Lo;0;L;;;;;N;;;;;
+1B1B1;NUSHU CHARACTER-1B1B1;Lo;0;L;;;;;N;;;;;
+1B1B2;NUSHU CHARACTER-1B1B2;Lo;0;L;;;;;N;;;;;
+1B1B3;NUSHU CHARACTER-1B1B3;Lo;0;L;;;;;N;;;;;
+1B1B4;NUSHU CHARACTER-1B1B4;Lo;0;L;;;;;N;;;;;
+1B1B5;NUSHU CHARACTER-1B1B5;Lo;0;L;;;;;N;;;;;
+1B1B6;NUSHU CHARACTER-1B1B6;Lo;0;L;;;;;N;;;;;
+1B1B7;NUSHU CHARACTER-1B1B7;Lo;0;L;;;;;N;;;;;
+1B1B8;NUSHU CHARACTER-1B1B8;Lo;0;L;;;;;N;;;;;
+1B1B9;NUSHU CHARACTER-1B1B9;Lo;0;L;;;;;N;;;;;
+1B1BA;NUSHU CHARACTER-1B1BA;Lo;0;L;;;;;N;;;;;
+1B1BB;NUSHU CHARACTER-1B1BB;Lo;0;L;;;;;N;;;;;
+1B1BC;NUSHU CHARACTER-1B1BC;Lo;0;L;;;;;N;;;;;
+1B1BD;NUSHU CHARACTER-1B1BD;Lo;0;L;;;;;N;;;;;
+1B1BE;NUSHU CHARACTER-1B1BE;Lo;0;L;;;;;N;;;;;
+1B1BF;NUSHU CHARACTER-1B1BF;Lo;0;L;;;;;N;;;;;
+1B1C0;NUSHU CHARACTER-1B1C0;Lo;0;L;;;;;N;;;;;
+1B1C1;NUSHU CHARACTER-1B1C1;Lo;0;L;;;;;N;;;;;
+1B1C2;NUSHU CHARACTER-1B1C2;Lo;0;L;;;;;N;;;;;
+1B1C3;NUSHU CHARACTER-1B1C3;Lo;0;L;;;;;N;;;;;
+1B1C4;NUSHU CHARACTER-1B1C4;Lo;0;L;;;;;N;;;;;
+1B1C5;NUSHU CHARACTER-1B1C5;Lo;0;L;;;;;N;;;;;
+1B1C6;NUSHU CHARACTER-1B1C6;Lo;0;L;;;;;N;;;;;
+1B1C7;NUSHU CHARACTER-1B1C7;Lo;0;L;;;;;N;;;;;
+1B1C8;NUSHU CHARACTER-1B1C8;Lo;0;L;;;;;N;;;;;
+1B1C9;NUSHU CHARACTER-1B1C9;Lo;0;L;;;;;N;;;;;
+1B1CA;NUSHU CHARACTER-1B1CA;Lo;0;L;;;;;N;;;;;
+1B1CB;NUSHU CHARACTER-1B1CB;Lo;0;L;;;;;N;;;;;
+1B1CC;NUSHU CHARACTER-1B1CC;Lo;0;L;;;;;N;;;;;
+1B1CD;NUSHU CHARACTER-1B1CD;Lo;0;L;;;;;N;;;;;
+1B1CE;NUSHU CHARACTER-1B1CE;Lo;0;L;;;;;N;;;;;
+1B1CF;NUSHU CHARACTER-1B1CF;Lo;0;L;;;;;N;;;;;
+1B1D0;NUSHU CHARACTER-1B1D0;Lo;0;L;;;;;N;;;;;
+1B1D1;NUSHU CHARACTER-1B1D1;Lo;0;L;;;;;N;;;;;
+1B1D2;NUSHU CHARACTER-1B1D2;Lo;0;L;;;;;N;;;;;
+1B1D3;NUSHU CHARACTER-1B1D3;Lo;0;L;;;;;N;;;;;
+1B1D4;NUSHU CHARACTER-1B1D4;Lo;0;L;;;;;N;;;;;
+1B1D5;NUSHU CHARACTER-1B1D5;Lo;0;L;;;;;N;;;;;
+1B1D6;NUSHU CHARACTER-1B1D6;Lo;0;L;;;;;N;;;;;
+1B1D7;NUSHU CHARACTER-1B1D7;Lo;0;L;;;;;N;;;;;
+1B1D8;NUSHU CHARACTER-1B1D8;Lo;0;L;;;;;N;;;;;
+1B1D9;NUSHU CHARACTER-1B1D9;Lo;0;L;;;;;N;;;;;
+1B1DA;NUSHU CHARACTER-1B1DA;Lo;0;L;;;;;N;;;;;
+1B1DB;NUSHU CHARACTER-1B1DB;Lo;0;L;;;;;N;;;;;
+1B1DC;NUSHU CHARACTER-1B1DC;Lo;0;L;;;;;N;;;;;
+1B1DD;NUSHU CHARACTER-1B1DD;Lo;0;L;;;;;N;;;;;
+1B1DE;NUSHU CHARACTER-1B1DE;Lo;0;L;;;;;N;;;;;
+1B1DF;NUSHU CHARACTER-1B1DF;Lo;0;L;;;;;N;;;;;
+1B1E0;NUSHU CHARACTER-1B1E0;Lo;0;L;;;;;N;;;;;
+1B1E1;NUSHU CHARACTER-1B1E1;Lo;0;L;;;;;N;;;;;
+1B1E2;NUSHU CHARACTER-1B1E2;Lo;0;L;;;;;N;;;;;
+1B1E3;NUSHU CHARACTER-1B1E3;Lo;0;L;;;;;N;;;;;
+1B1E4;NUSHU CHARACTER-1B1E4;Lo;0;L;;;;;N;;;;;
+1B1E5;NUSHU CHARACTER-1B1E5;Lo;0;L;;;;;N;;;;;
+1B1E6;NUSHU CHARACTER-1B1E6;Lo;0;L;;;;;N;;;;;
+1B1E7;NUSHU CHARACTER-1B1E7;Lo;0;L;;;;;N;;;;;
+1B1E8;NUSHU CHARACTER-1B1E8;Lo;0;L;;;;;N;;;;;
+1B1E9;NUSHU CHARACTER-1B1E9;Lo;0;L;;;;;N;;;;;
+1B1EA;NUSHU CHARACTER-1B1EA;Lo;0;L;;;;;N;;;;;
+1B1EB;NUSHU CHARACTER-1B1EB;Lo;0;L;;;;;N;;;;;
+1B1EC;NUSHU CHARACTER-1B1EC;Lo;0;L;;;;;N;;;;;
+1B1ED;NUSHU CHARACTER-1B1ED;Lo;0;L;;;;;N;;;;;
+1B1EE;NUSHU CHARACTER-1B1EE;Lo;0;L;;;;;N;;;;;
+1B1EF;NUSHU CHARACTER-1B1EF;Lo;0;L;;;;;N;;;;;
+1B1F0;NUSHU CHARACTER-1B1F0;Lo;0;L;;;;;N;;;;;
+1B1F1;NUSHU CHARACTER-1B1F1;Lo;0;L;;;;;N;;;;;
+1B1F2;NUSHU CHARACTER-1B1F2;Lo;0;L;;;;;N;;;;;
+1B1F3;NUSHU CHARACTER-1B1F3;Lo;0;L;;;;;N;;;;;
+1B1F4;NUSHU CHARACTER-1B1F4;Lo;0;L;;;;;N;;;;;
+1B1F5;NUSHU CHARACTER-1B1F5;Lo;0;L;;;;;N;;;;;
+1B1F6;NUSHU CHARACTER-1B1F6;Lo;0;L;;;;;N;;;;;
+1B1F7;NUSHU CHARACTER-1B1F7;Lo;0;L;;;;;N;;;;;
+1B1F8;NUSHU CHARACTER-1B1F8;Lo;0;L;;;;;N;;;;;
+1B1F9;NUSHU CHARACTER-1B1F9;Lo;0;L;;;;;N;;;;;
+1B1FA;NUSHU CHARACTER-1B1FA;Lo;0;L;;;;;N;;;;;
+1B1FB;NUSHU CHARACTER-1B1FB;Lo;0;L;;;;;N;;;;;
+1B1FC;NUSHU CHARACTER-1B1FC;Lo;0;L;;;;;N;;;;;
+1B1FD;NUSHU CHARACTER-1B1FD;Lo;0;L;;;;;N;;;;;
+1B1FE;NUSHU CHARACTER-1B1FE;Lo;0;L;;;;;N;;;;;
+1B1FF;NUSHU CHARACTER-1B1FF;Lo;0;L;;;;;N;;;;;
+1B200;NUSHU CHARACTER-1B200;Lo;0;L;;;;;N;;;;;
+1B201;NUSHU CHARACTER-1B201;Lo;0;L;;;;;N;;;;;
+1B202;NUSHU CHARACTER-1B202;Lo;0;L;;;;;N;;;;;
+1B203;NUSHU CHARACTER-1B203;Lo;0;L;;;;;N;;;;;
+1B204;NUSHU CHARACTER-1B204;Lo;0;L;;;;;N;;;;;
+1B205;NUSHU CHARACTER-1B205;Lo;0;L;;;;;N;;;;;
+1B206;NUSHU CHARACTER-1B206;Lo;0;L;;;;;N;;;;;
+1B207;NUSHU CHARACTER-1B207;Lo;0;L;;;;;N;;;;;
+1B208;NUSHU CHARACTER-1B208;Lo;0;L;;;;;N;;;;;
+1B209;NUSHU CHARACTER-1B209;Lo;0;L;;;;;N;;;;;
+1B20A;NUSHU CHARACTER-1B20A;Lo;0;L;;;;;N;;;;;
+1B20B;NUSHU CHARACTER-1B20B;Lo;0;L;;;;;N;;;;;
+1B20C;NUSHU CHARACTER-1B20C;Lo;0;L;;;;;N;;;;;
+1B20D;NUSHU CHARACTER-1B20D;Lo;0;L;;;;;N;;;;;
+1B20E;NUSHU CHARACTER-1B20E;Lo;0;L;;;;;N;;;;;
+1B20F;NUSHU CHARACTER-1B20F;Lo;0;L;;;;;N;;;;;
+1B210;NUSHU CHARACTER-1B210;Lo;0;L;;;;;N;;;;;
+1B211;NUSHU CHARACTER-1B211;Lo;0;L;;;;;N;;;;;
+1B212;NUSHU CHARACTER-1B212;Lo;0;L;;;;;N;;;;;
+1B213;NUSHU CHARACTER-1B213;Lo;0;L;;;;;N;;;;;
+1B214;NUSHU CHARACTER-1B214;Lo;0;L;;;;;N;;;;;
+1B215;NUSHU CHARACTER-1B215;Lo;0;L;;;;;N;;;;;
+1B216;NUSHU CHARACTER-1B216;Lo;0;L;;;;;N;;;;;
+1B217;NUSHU CHARACTER-1B217;Lo;0;L;;;;;N;;;;;
+1B218;NUSHU CHARACTER-1B218;Lo;0;L;;;;;N;;;;;
+1B219;NUSHU CHARACTER-1B219;Lo;0;L;;;;;N;;;;;
+1B21A;NUSHU CHARACTER-1B21A;Lo;0;L;;;;;N;;;;;
+1B21B;NUSHU CHARACTER-1B21B;Lo;0;L;;;;;N;;;;;
+1B21C;NUSHU CHARACTER-1B21C;Lo;0;L;;;;;N;;;;;
+1B21D;NUSHU CHARACTER-1B21D;Lo;0;L;;;;;N;;;;;
+1B21E;NUSHU CHARACTER-1B21E;Lo;0;L;;;;;N;;;;;
+1B21F;NUSHU CHARACTER-1B21F;Lo;0;L;;;;;N;;;;;
+1B220;NUSHU CHARACTER-1B220;Lo;0;L;;;;;N;;;;;
+1B221;NUSHU CHARACTER-1B221;Lo;0;L;;;;;N;;;;;
+1B222;NUSHU CHARACTER-1B222;Lo;0;L;;;;;N;;;;;
+1B223;NUSHU CHARACTER-1B223;Lo;0;L;;;;;N;;;;;
+1B224;NUSHU CHARACTER-1B224;Lo;0;L;;;;;N;;;;;
+1B225;NUSHU CHARACTER-1B225;Lo;0;L;;;;;N;;;;;
+1B226;NUSHU CHARACTER-1B226;Lo;0;L;;;;;N;;;;;
+1B227;NUSHU CHARACTER-1B227;Lo;0;L;;;;;N;;;;;
+1B228;NUSHU CHARACTER-1B228;Lo;0;L;;;;;N;;;;;
+1B229;NUSHU CHARACTER-1B229;Lo;0;L;;;;;N;;;;;
+1B22A;NUSHU CHARACTER-1B22A;Lo;0;L;;;;;N;;;;;
+1B22B;NUSHU CHARACTER-1B22B;Lo;0;L;;;;;N;;;;;
+1B22C;NUSHU CHARACTER-1B22C;Lo;0;L;;;;;N;;;;;
+1B22D;NUSHU CHARACTER-1B22D;Lo;0;L;;;;;N;;;;;
+1B22E;NUSHU CHARACTER-1B22E;Lo;0;L;;;;;N;;;;;
+1B22F;NUSHU CHARACTER-1B22F;Lo;0;L;;;;;N;;;;;
+1B230;NUSHU CHARACTER-1B230;Lo;0;L;;;;;N;;;;;
+1B231;NUSHU CHARACTER-1B231;Lo;0;L;;;;;N;;;;;
+1B232;NUSHU CHARACTER-1B232;Lo;0;L;;;;;N;;;;;
+1B233;NUSHU CHARACTER-1B233;Lo;0;L;;;;;N;;;;;
+1B234;NUSHU CHARACTER-1B234;Lo;0;L;;;;;N;;;;;
+1B235;NUSHU CHARACTER-1B235;Lo;0;L;;;;;N;;;;;
+1B236;NUSHU CHARACTER-1B236;Lo;0;L;;;;;N;;;;;
+1B237;NUSHU CHARACTER-1B237;Lo;0;L;;;;;N;;;;;
+1B238;NUSHU CHARACTER-1B238;Lo;0;L;;;;;N;;;;;
+1B239;NUSHU CHARACTER-1B239;Lo;0;L;;;;;N;;;;;
+1B23A;NUSHU CHARACTER-1B23A;Lo;0;L;;;;;N;;;;;
+1B23B;NUSHU CHARACTER-1B23B;Lo;0;L;;;;;N;;;;;
+1B23C;NUSHU CHARACTER-1B23C;Lo;0;L;;;;;N;;;;;
+1B23D;NUSHU CHARACTER-1B23D;Lo;0;L;;;;;N;;;;;
+1B23E;NUSHU CHARACTER-1B23E;Lo;0;L;;;;;N;;;;;
+1B23F;NUSHU CHARACTER-1B23F;Lo;0;L;;;;;N;;;;;
+1B240;NUSHU CHARACTER-1B240;Lo;0;L;;;;;N;;;;;
+1B241;NUSHU CHARACTER-1B241;Lo;0;L;;;;;N;;;;;
+1B242;NUSHU CHARACTER-1B242;Lo;0;L;;;;;N;;;;;
+1B243;NUSHU CHARACTER-1B243;Lo;0;L;;;;;N;;;;;
+1B244;NUSHU CHARACTER-1B244;Lo;0;L;;;;;N;;;;;
+1B245;NUSHU CHARACTER-1B245;Lo;0;L;;;;;N;;;;;
+1B246;NUSHU CHARACTER-1B246;Lo;0;L;;;;;N;;;;;
+1B247;NUSHU CHARACTER-1B247;Lo;0;L;;;;;N;;;;;
+1B248;NUSHU CHARACTER-1B248;Lo;0;L;;;;;N;;;;;
+1B249;NUSHU CHARACTER-1B249;Lo;0;L;;;;;N;;;;;
+1B24A;NUSHU CHARACTER-1B24A;Lo;0;L;;;;;N;;;;;
+1B24B;NUSHU CHARACTER-1B24B;Lo;0;L;;;;;N;;;;;
+1B24C;NUSHU CHARACTER-1B24C;Lo;0;L;;;;;N;;;;;
+1B24D;NUSHU CHARACTER-1B24D;Lo;0;L;;;;;N;;;;;
+1B24E;NUSHU CHARACTER-1B24E;Lo;0;L;;;;;N;;;;;
+1B24F;NUSHU CHARACTER-1B24F;Lo;0;L;;;;;N;;;;;
+1B250;NUSHU CHARACTER-1B250;Lo;0;L;;;;;N;;;;;
+1B251;NUSHU CHARACTER-1B251;Lo;0;L;;;;;N;;;;;
+1B252;NUSHU CHARACTER-1B252;Lo;0;L;;;;;N;;;;;
+1B253;NUSHU CHARACTER-1B253;Lo;0;L;;;;;N;;;;;
+1B254;NUSHU CHARACTER-1B254;Lo;0;L;;;;;N;;;;;
+1B255;NUSHU CHARACTER-1B255;Lo;0;L;;;;;N;;;;;
+1B256;NUSHU CHARACTER-1B256;Lo;0;L;;;;;N;;;;;
+1B257;NUSHU CHARACTER-1B257;Lo;0;L;;;;;N;;;;;
+1B258;NUSHU CHARACTER-1B258;Lo;0;L;;;;;N;;;;;
+1B259;NUSHU CHARACTER-1B259;Lo;0;L;;;;;N;;;;;
+1B25A;NUSHU CHARACTER-1B25A;Lo;0;L;;;;;N;;;;;
+1B25B;NUSHU CHARACTER-1B25B;Lo;0;L;;;;;N;;;;;
+1B25C;NUSHU CHARACTER-1B25C;Lo;0;L;;;;;N;;;;;
+1B25D;NUSHU CHARACTER-1B25D;Lo;0;L;;;;;N;;;;;
+1B25E;NUSHU CHARACTER-1B25E;Lo;0;L;;;;;N;;;;;
+1B25F;NUSHU CHARACTER-1B25F;Lo;0;L;;;;;N;;;;;
+1B260;NUSHU CHARACTER-1B260;Lo;0;L;;;;;N;;;;;
+1B261;NUSHU CHARACTER-1B261;Lo;0;L;;;;;N;;;;;
+1B262;NUSHU CHARACTER-1B262;Lo;0;L;;;;;N;;;;;
+1B263;NUSHU CHARACTER-1B263;Lo;0;L;;;;;N;;;;;
+1B264;NUSHU CHARACTER-1B264;Lo;0;L;;;;;N;;;;;
+1B265;NUSHU CHARACTER-1B265;Lo;0;L;;;;;N;;;;;
+1B266;NUSHU CHARACTER-1B266;Lo;0;L;;;;;N;;;;;
+1B267;NUSHU CHARACTER-1B267;Lo;0;L;;;;;N;;;;;
+1B268;NUSHU CHARACTER-1B268;Lo;0;L;;;;;N;;;;;
+1B269;NUSHU CHARACTER-1B269;Lo;0;L;;;;;N;;;;;
+1B26A;NUSHU CHARACTER-1B26A;Lo;0;L;;;;;N;;;;;
+1B26B;NUSHU CHARACTER-1B26B;Lo;0;L;;;;;N;;;;;
+1B26C;NUSHU CHARACTER-1B26C;Lo;0;L;;;;;N;;;;;
+1B26D;NUSHU CHARACTER-1B26D;Lo;0;L;;;;;N;;;;;
+1B26E;NUSHU CHARACTER-1B26E;Lo;0;L;;;;;N;;;;;
+1B26F;NUSHU CHARACTER-1B26F;Lo;0;L;;;;;N;;;;;
+1B270;NUSHU CHARACTER-1B270;Lo;0;L;;;;;N;;;;;
+1B271;NUSHU CHARACTER-1B271;Lo;0;L;;;;;N;;;;;
+1B272;NUSHU CHARACTER-1B272;Lo;0;L;;;;;N;;;;;
+1B273;NUSHU CHARACTER-1B273;Lo;0;L;;;;;N;;;;;
+1B274;NUSHU CHARACTER-1B274;Lo;0;L;;;;;N;;;;;
+1B275;NUSHU CHARACTER-1B275;Lo;0;L;;;;;N;;;;;
+1B276;NUSHU CHARACTER-1B276;Lo;0;L;;;;;N;;;;;
+1B277;NUSHU CHARACTER-1B277;Lo;0;L;;;;;N;;;;;
+1B278;NUSHU CHARACTER-1B278;Lo;0;L;;;;;N;;;;;
+1B279;NUSHU CHARACTER-1B279;Lo;0;L;;;;;N;;;;;
+1B27A;NUSHU CHARACTER-1B27A;Lo;0;L;;;;;N;;;;;
+1B27B;NUSHU CHARACTER-1B27B;Lo;0;L;;;;;N;;;;;
+1B27C;NUSHU CHARACTER-1B27C;Lo;0;L;;;;;N;;;;;
+1B27D;NUSHU CHARACTER-1B27D;Lo;0;L;;;;;N;;;;;
+1B27E;NUSHU CHARACTER-1B27E;Lo;0;L;;;;;N;;;;;
+1B27F;NUSHU CHARACTER-1B27F;Lo;0;L;;;;;N;;;;;
+1B280;NUSHU CHARACTER-1B280;Lo;0;L;;;;;N;;;;;
+1B281;NUSHU CHARACTER-1B281;Lo;0;L;;;;;N;;;;;
+1B282;NUSHU CHARACTER-1B282;Lo;0;L;;;;;N;;;;;
+1B283;NUSHU CHARACTER-1B283;Lo;0;L;;;;;N;;;;;
+1B284;NUSHU CHARACTER-1B284;Lo;0;L;;;;;N;;;;;
+1B285;NUSHU CHARACTER-1B285;Lo;0;L;;;;;N;;;;;
+1B286;NUSHU CHARACTER-1B286;Lo;0;L;;;;;N;;;;;
+1B287;NUSHU CHARACTER-1B287;Lo;0;L;;;;;N;;;;;
+1B288;NUSHU CHARACTER-1B288;Lo;0;L;;;;;N;;;;;
+1B289;NUSHU CHARACTER-1B289;Lo;0;L;;;;;N;;;;;
+1B28A;NUSHU CHARACTER-1B28A;Lo;0;L;;;;;N;;;;;
+1B28B;NUSHU CHARACTER-1B28B;Lo;0;L;;;;;N;;;;;
+1B28C;NUSHU CHARACTER-1B28C;Lo;0;L;;;;;N;;;;;
+1B28D;NUSHU CHARACTER-1B28D;Lo;0;L;;;;;N;;;;;
+1B28E;NUSHU CHARACTER-1B28E;Lo;0;L;;;;;N;;;;;
+1B28F;NUSHU CHARACTER-1B28F;Lo;0;L;;;;;N;;;;;
+1B290;NUSHU CHARACTER-1B290;Lo;0;L;;;;;N;;;;;
+1B291;NUSHU CHARACTER-1B291;Lo;0;L;;;;;N;;;;;
+1B292;NUSHU CHARACTER-1B292;Lo;0;L;;;;;N;;;;;
+1B293;NUSHU CHARACTER-1B293;Lo;0;L;;;;;N;;;;;
+1B294;NUSHU CHARACTER-1B294;Lo;0;L;;;;;N;;;;;
+1B295;NUSHU CHARACTER-1B295;Lo;0;L;;;;;N;;;;;
+1B296;NUSHU CHARACTER-1B296;Lo;0;L;;;;;N;;;;;
+1B297;NUSHU CHARACTER-1B297;Lo;0;L;;;;;N;;;;;
+1B298;NUSHU CHARACTER-1B298;Lo;0;L;;;;;N;;;;;
+1B299;NUSHU CHARACTER-1B299;Lo;0;L;;;;;N;;;;;
+1B29A;NUSHU CHARACTER-1B29A;Lo;0;L;;;;;N;;;;;
+1B29B;NUSHU CHARACTER-1B29B;Lo;0;L;;;;;N;;;;;
+1B29C;NUSHU CHARACTER-1B29C;Lo;0;L;;;;;N;;;;;
+1B29D;NUSHU CHARACTER-1B29D;Lo;0;L;;;;;N;;;;;
+1B29E;NUSHU CHARACTER-1B29E;Lo;0;L;;;;;N;;;;;
+1B29F;NUSHU CHARACTER-1B29F;Lo;0;L;;;;;N;;;;;
+1B2A0;NUSHU CHARACTER-1B2A0;Lo;0;L;;;;;N;;;;;
+1B2A1;NUSHU CHARACTER-1B2A1;Lo;0;L;;;;;N;;;;;
+1B2A2;NUSHU CHARACTER-1B2A2;Lo;0;L;;;;;N;;;;;
+1B2A3;NUSHU CHARACTER-1B2A3;Lo;0;L;;;;;N;;;;;
+1B2A4;NUSHU CHARACTER-1B2A4;Lo;0;L;;;;;N;;;;;
+1B2A5;NUSHU CHARACTER-1B2A5;Lo;0;L;;;;;N;;;;;
+1B2A6;NUSHU CHARACTER-1B2A6;Lo;0;L;;;;;N;;;;;
+1B2A7;NUSHU CHARACTER-1B2A7;Lo;0;L;;;;;N;;;;;
+1B2A8;NUSHU CHARACTER-1B2A8;Lo;0;L;;;;;N;;;;;
+1B2A9;NUSHU CHARACTER-1B2A9;Lo;0;L;;;;;N;;;;;
+1B2AA;NUSHU CHARACTER-1B2AA;Lo;0;L;;;;;N;;;;;
+1B2AB;NUSHU CHARACTER-1B2AB;Lo;0;L;;;;;N;;;;;
+1B2AC;NUSHU CHARACTER-1B2AC;Lo;0;L;;;;;N;;;;;
+1B2AD;NUSHU CHARACTER-1B2AD;Lo;0;L;;;;;N;;;;;
+1B2AE;NUSHU CHARACTER-1B2AE;Lo;0;L;;;;;N;;;;;
+1B2AF;NUSHU CHARACTER-1B2AF;Lo;0;L;;;;;N;;;;;
+1B2B0;NUSHU CHARACTER-1B2B0;Lo;0;L;;;;;N;;;;;
+1B2B1;NUSHU CHARACTER-1B2B1;Lo;0;L;;;;;N;;;;;
+1B2B2;NUSHU CHARACTER-1B2B2;Lo;0;L;;;;;N;;;;;
+1B2B3;NUSHU CHARACTER-1B2B3;Lo;0;L;;;;;N;;;;;
+1B2B4;NUSHU CHARACTER-1B2B4;Lo;0;L;;;;;N;;;;;
+1B2B5;NUSHU CHARACTER-1B2B5;Lo;0;L;;;;;N;;;;;
+1B2B6;NUSHU CHARACTER-1B2B6;Lo;0;L;;;;;N;;;;;
+1B2B7;NUSHU CHARACTER-1B2B7;Lo;0;L;;;;;N;;;;;
+1B2B8;NUSHU CHARACTER-1B2B8;Lo;0;L;;;;;N;;;;;
+1B2B9;NUSHU CHARACTER-1B2B9;Lo;0;L;;;;;N;;;;;
+1B2BA;NUSHU CHARACTER-1B2BA;Lo;0;L;;;;;N;;;;;
+1B2BB;NUSHU CHARACTER-1B2BB;Lo;0;L;;;;;N;;;;;
+1B2BC;NUSHU CHARACTER-1B2BC;Lo;0;L;;;;;N;;;;;
+1B2BD;NUSHU CHARACTER-1B2BD;Lo;0;L;;;;;N;;;;;
+1B2BE;NUSHU CHARACTER-1B2BE;Lo;0;L;;;;;N;;;;;
+1B2BF;NUSHU CHARACTER-1B2BF;Lo;0;L;;;;;N;;;;;
+1B2C0;NUSHU CHARACTER-1B2C0;Lo;0;L;;;;;N;;;;;
+1B2C1;NUSHU CHARACTER-1B2C1;Lo;0;L;;;;;N;;;;;
+1B2C2;NUSHU CHARACTER-1B2C2;Lo;0;L;;;;;N;;;;;
+1B2C3;NUSHU CHARACTER-1B2C3;Lo;0;L;;;;;N;;;;;
+1B2C4;NUSHU CHARACTER-1B2C4;Lo;0;L;;;;;N;;;;;
+1B2C5;NUSHU CHARACTER-1B2C5;Lo;0;L;;;;;N;;;;;
+1B2C6;NUSHU CHARACTER-1B2C6;Lo;0;L;;;;;N;;;;;
+1B2C7;NUSHU CHARACTER-1B2C7;Lo;0;L;;;;;N;;;;;
+1B2C8;NUSHU CHARACTER-1B2C8;Lo;0;L;;;;;N;;;;;
+1B2C9;NUSHU CHARACTER-1B2C9;Lo;0;L;;;;;N;;;;;
+1B2CA;NUSHU CHARACTER-1B2CA;Lo;0;L;;;;;N;;;;;
+1B2CB;NUSHU CHARACTER-1B2CB;Lo;0;L;;;;;N;;;;;
+1B2CC;NUSHU CHARACTER-1B2CC;Lo;0;L;;;;;N;;;;;
+1B2CD;NUSHU CHARACTER-1B2CD;Lo;0;L;;;;;N;;;;;
+1B2CE;NUSHU CHARACTER-1B2CE;Lo;0;L;;;;;N;;;;;
+1B2CF;NUSHU CHARACTER-1B2CF;Lo;0;L;;;;;N;;;;;
+1B2D0;NUSHU CHARACTER-1B2D0;Lo;0;L;;;;;N;;;;;
+1B2D1;NUSHU CHARACTER-1B2D1;Lo;0;L;;;;;N;;;;;
+1B2D2;NUSHU CHARACTER-1B2D2;Lo;0;L;;;;;N;;;;;
+1B2D3;NUSHU CHARACTER-1B2D3;Lo;0;L;;;;;N;;;;;
+1B2D4;NUSHU CHARACTER-1B2D4;Lo;0;L;;;;;N;;;;;
+1B2D5;NUSHU CHARACTER-1B2D5;Lo;0;L;;;;;N;;;;;
+1B2D6;NUSHU CHARACTER-1B2D6;Lo;0;L;;;;;N;;;;;
+1B2D7;NUSHU CHARACTER-1B2D7;Lo;0;L;;;;;N;;;;;
+1B2D8;NUSHU CHARACTER-1B2D8;Lo;0;L;;;;;N;;;;;
+1B2D9;NUSHU CHARACTER-1B2D9;Lo;0;L;;;;;N;;;;;
+1B2DA;NUSHU CHARACTER-1B2DA;Lo;0;L;;;;;N;;;;;
+1B2DB;NUSHU CHARACTER-1B2DB;Lo;0;L;;;;;N;;;;;
+1B2DC;NUSHU CHARACTER-1B2DC;Lo;0;L;;;;;N;;;;;
+1B2DD;NUSHU CHARACTER-1B2DD;Lo;0;L;;;;;N;;;;;
+1B2DE;NUSHU CHARACTER-1B2DE;Lo;0;L;;;;;N;;;;;
+1B2DF;NUSHU CHARACTER-1B2DF;Lo;0;L;;;;;N;;;;;
+1B2E0;NUSHU CHARACTER-1B2E0;Lo;0;L;;;;;N;;;;;
+1B2E1;NUSHU CHARACTER-1B2E1;Lo;0;L;;;;;N;;;;;
+1B2E2;NUSHU CHARACTER-1B2E2;Lo;0;L;;;;;N;;;;;
+1B2E3;NUSHU CHARACTER-1B2E3;Lo;0;L;;;;;N;;;;;
+1B2E4;NUSHU CHARACTER-1B2E4;Lo;0;L;;;;;N;;;;;
+1B2E5;NUSHU CHARACTER-1B2E5;Lo;0;L;;;;;N;;;;;
+1B2E6;NUSHU CHARACTER-1B2E6;Lo;0;L;;;;;N;;;;;
+1B2E7;NUSHU CHARACTER-1B2E7;Lo;0;L;;;;;N;;;;;
+1B2E8;NUSHU CHARACTER-1B2E8;Lo;0;L;;;;;N;;;;;
+1B2E9;NUSHU CHARACTER-1B2E9;Lo;0;L;;;;;N;;;;;
+1B2EA;NUSHU CHARACTER-1B2EA;Lo;0;L;;;;;N;;;;;
+1B2EB;NUSHU CHARACTER-1B2EB;Lo;0;L;;;;;N;;;;;
+1B2EC;NUSHU CHARACTER-1B2EC;Lo;0;L;;;;;N;;;;;
+1B2ED;NUSHU CHARACTER-1B2ED;Lo;0;L;;;;;N;;;;;
+1B2EE;NUSHU CHARACTER-1B2EE;Lo;0;L;;;;;N;;;;;
+1B2EF;NUSHU CHARACTER-1B2EF;Lo;0;L;;;;;N;;;;;
+1B2F0;NUSHU CHARACTER-1B2F0;Lo;0;L;;;;;N;;;;;
+1B2F1;NUSHU CHARACTER-1B2F1;Lo;0;L;;;;;N;;;;;
+1B2F2;NUSHU CHARACTER-1B2F2;Lo;0;L;;;;;N;;;;;
+1B2F3;NUSHU CHARACTER-1B2F3;Lo;0;L;;;;;N;;;;;
+1B2F4;NUSHU CHARACTER-1B2F4;Lo;0;L;;;;;N;;;;;
+1B2F5;NUSHU CHARACTER-1B2F5;Lo;0;L;;;;;N;;;;;
+1B2F6;NUSHU CHARACTER-1B2F6;Lo;0;L;;;;;N;;;;;
+1B2F7;NUSHU CHARACTER-1B2F7;Lo;0;L;;;;;N;;;;;
+1B2F8;NUSHU CHARACTER-1B2F8;Lo;0;L;;;;;N;;;;;
+1B2F9;NUSHU CHARACTER-1B2F9;Lo;0;L;;;;;N;;;;;
+1B2FA;NUSHU CHARACTER-1B2FA;Lo;0;L;;;;;N;;;;;
+1B2FB;NUSHU CHARACTER-1B2FB;Lo;0;L;;;;;N;;;;;
 1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;;
 1BC01;DUPLOYAN LETTER X;Lo;0;L;;;;;N;;;;;
 1BC02;DUPLOYAN LETTER P;Lo;0;L;;;;;N;;;;;
@@ -28269,6 +29217,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L;<compat> 3014 6557 3015;;;;N;;;;;
 1F250;CIRCLED IDEOGRAPH ADVANTAGE;So;0;L;<circle> 5F97;;;;N;;;;;
 1F251;CIRCLED IDEOGRAPH ACCEPT;So;0;L;<circle> 53EF;;;;N;;;;;
+1F260;ROUNDED SYMBOL FOR FU;So;0;ON;;;;;N;;;;;
+1F261;ROUNDED SYMBOL FOR LU;So;0;ON;;;;;N;;;;;
+1F262;ROUNDED SYMBOL FOR SHOU;So;0;ON;;;;;N;;;;;
+1F263;ROUNDED SYMBOL FOR XI;So;0;ON;;;;;N;;;;;
+1F264;ROUNDED SYMBOL FOR SHUANGXI;So;0;ON;;;;;N;;;;;
+1F265;ROUNDED SYMBOL FOR CAI;So;0;ON;;;;;N;;;;;
 1F300;CYCLONE;So;0;ON;;;;;N;;;;;
 1F301;FOGGY;So;0;ON;;;;;N;;;;;
 1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;;
@@ -29248,6 +30202,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;;
 1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;;
 1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;;
+1F6D3;STUPA;So;0;ON;;;;;N;;;;;
+1F6D4;PAGODA;So;0;ON;;;;;N;;;;;
 1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;;
 1F6E1;SHIELD;So;0;ON;;;;;N;;;;;
 1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;;
@@ -29268,6 +30224,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6F4;SCOOTER;So;0;ON;;;;;N;;;;;
 1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;;
 1F6F6;CANOE;So;0;ON;;;;;N;;;;;
+1F6F7;SLED;So;0;ON;;;;;N;;;;;
+1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;;
 1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
 1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
 1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
@@ -29617,6 +30575,18 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F8AB;RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
 1F8AC;WHITE ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
 1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;;
+1F903;LEFT HALF CIRCLE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F904;LEFT HALF CIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F905;LEFT HALF CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F906;LEFT HALF CIRCLE WITH DOT;So;0;ON;;;;;N;;;;;
+1F907;LEFT HALF CIRCLE;So;0;ON;;;;;N;;;;;
+1F908;DOWNWARD FACING HOOK;So;0;ON;;;;;N;;;;;
+1F909;DOWNWARD FACING NOTCHED HOOK;So;0;ON;;;;;N;;;;;
+1F90A;DOWNWARD FACING HOOK WITH DOT;So;0;ON;;;;;N;;;;;
+1F90B;DOWNWARD FACING NOTCHED HOOK WITH DOT;So;0;ON;;;;;N;;;;;
 1F910;ZIPPER-MOUTH FACE;So;0;ON;;;;;N;;;;;
 1F911;MONEY-MOUTH FACE;So;0;ON;;;;;N;;;;;
 1F912;FACE WITH THERMOMETER;So;0;ON;;;;;N;;;;;
@@ -29632,6 +30602,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;;
 1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;;
 1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;;
+1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;;
 1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;;
 1F921;CLOWN FACE;So;0;ON;;;;;N;;;;;
 1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;;
@@ -29640,7 +30611,17 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F925;LYING FACE;So;0;ON;;;;;N;;;;;
 1F926;FACE PALM;So;0;ON;;;;;N;;;;;
 1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;;
+1F928;FACE WITH ONE EYEBROW RAISED;So;0;ON;;;;;N;;;;;
+1F929;GRINNING FACE WITH STAR EYES;So;0;ON;;;;;N;;;;;
+1F92A;GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE;So;0;ON;;;;;N;;;;;
+1F92B;FACE WITH FINGER COVERING CLOSED LIPS;So;0;ON;;;;;N;;;;;
+1F92C;SERIOUS FACE WITH SYMBOLS COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92D;SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92E;FACE WITH OPEN MOUTH VOMITING;So;0;ON;;;;;N;;;;;
+1F92F;SHOCKED FACE WITH EXPLODING HEAD;So;0;ON;;;;;N;;;;;
 1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;;
+1F931;BREAST-FEEDING;So;0;ON;;;;;N;;;;;
+1F932;PALMS UP TOGETHER;So;0;ON;;;;;N;;;;;
 1F933;SELFIE;So;0;ON;;;;;N;;;;;
 1F934;PRINCE;So;0;ON;;;;;N;;;;;
 1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;;
@@ -29665,6 +30646,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;;
 1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
 1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
+1F94C;CURLING STONE;So;0;ON;;;;;N;;;;;
 1F950;CROISSANT;So;0;ON;;;;;N;;;;;
 1F951;AVOCADO;So;0;ON;;;;;N;;;;;
 1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
@@ -29680,6 +30662,19 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F95C;PEANUTS;So;0;ON;;;;;N;;;;;
 1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;;
 1F95E;PANCAKES;So;0;ON;;;;;N;;;;;
+1F95F;DUMPLING;So;0;ON;;;;;N;;;;;
+1F960;FORTUNE COOKIE;So;0;ON;;;;;N;;;;;
+1F961;TAKEOUT BOX;So;0;ON;;;;;N;;;;;
+1F962;CHOPSTICKS;So;0;ON;;;;;N;;;;;
+1F963;BOWL WITH SPOON;So;0;ON;;;;;N;;;;;
+1F964;CUP WITH STRAW;So;0;ON;;;;;N;;;;;
+1F965;COCONUT;So;0;ON;;;;;N;;;;;
+1F966;BROCCOLI;So;0;ON;;;;;N;;;;;
+1F967;PIE;So;0;ON;;;;;N;;;;;
+1F968;PRETZEL;So;0;ON;;;;;N;;;;;
+1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;;
+1F96A;SANDWICH;So;0;ON;;;;;N;;;;;
+1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;;
 1F980;CRAB;So;0;ON;;;;;N;;;;;
 1F981;LION FACE;So;0;ON;;;;;N;;;;;
 1F982;SCORPION;So;0;ON;;;;;N;;;;;
@@ -29698,7 +30693,36 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;;
 1F990;SHRIMP;So;0;ON;;;;;N;;;;;
 1F991;SQUID;So;0;ON;;;;;N;;;;;
+1F992;GIRAFFE FACE;So;0;ON;;;;;N;;;;;
+1F993;ZEBRA FACE;So;0;ON;;;;;N;;;;;
+1F994;HEDGEHOG;So;0;ON;;;;;N;;;;;
+1F995;SAUROPOD;So;0;ON;;;;;N;;;;;
+1F996;T-REX;So;0;ON;;;;;N;;;;;
+1F997;CRICKET;So;0;ON;;;;;N;;;;;
 1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;;
+1F9D1;ADULT;So;0;ON;;;;;N;;;;;
+1F9D2;CHILD;So;0;ON;;;;;N;;;;;
+1F9D3;OLDER ADULT;So;0;ON;;;;;N;;;;;
+1F9D4;BEARDED PERSON;So;0;ON;;;;;N;;;;;
+1F9D5;PERSON WITH HEADSCARF;So;0;ON;;;;;N;;;;;
+1F9D6;PERSON IN STEAMY ROOM;So;0;ON;;;;;N;;;;;
+1F9D7;PERSON CLIMBING;So;0;ON;;;;;N;;;;;
+1F9D8;PERSON IN LOTUS POSITION;So;0;ON;;;;;N;;;;;
+1F9D9;MAGE;So;0;ON;;;;;N;;;;;
+1F9DA;FAIRY;So;0;ON;;;;;N;;;;;
+1F9DB;VAMPIRE;So;0;ON;;;;;N;;;;;
+1F9DC;MERPERSON;So;0;ON;;;;;N;;;;;
+1F9DD;ELF;So;0;ON;;;;;N;;;;;
+1F9DE;GENIE;So;0;ON;;;;;N;;;;;
+1F9DF;ZOMBIE;So;0;ON;;;;;N;;;;;
+1F9E0;BRAIN;So;0;ON;;;;;N;;;;;
+1F9E1;ORANGE HEART;So;0;ON;;;;;N;;;;;
+1F9E2;BILLED CAP;So;0;ON;;;;;N;;;;;
+1F9E3;SCARF;So;0;ON;;;;;N;;;;;
+1F9E4;GLOVES;So;0;ON;;;;;N;;;;;
+1F9E5;COAT;So;0;ON;;;;;N;;;;;
+1F9E6;SOCKS;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
 2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
@@ -29707,6 +30731,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
 2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
 2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
+2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
+2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
 2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
 2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
 2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
diff --git a/tests/uninorm/NormalizationTest.txt b/tests/uninorm/NormalizationTest.txt
index e133fa8a78..71f2371c5e 100644
--- a/tests/uninorm/NormalizationTest.txt
+++ b/tests/uninorm/NormalizationTest.txt
@@ -1,6 +1,6 @@
-# NormalizationTest-9.0.0.txt
-# Date: 2016-04-04, 11:41:55 GMT
-# © 2016 Unicode®, Inc.
+# NormalizationTest-10.0.0.txt
+# Date: 2017-03-08, 08:41:55 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -17653,6 +17653,10 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 0CBC 3099 093C 0334 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062; # (a◌಼◌゙◌़◌̴b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; ) LATIN SMALL LETTER A, KANNADA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0CCD 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062; # (a◌ְ◌्◌゙◌್b; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KANNADA SIGN VIRAMA, LATIN SMALL LETTER B
 0061 0CCD 05B0 094D 3099 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062; # (a◌್◌ְ◌्◌゙b; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; ) LATIN SMALL LETTER A, KANNADA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 0D3B 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062; # (a◌ְ◌्◌゙◌഻b; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN VERTICAL BAR VIRAMA, LATIN SMALL LETTER B
+0061 0D3B 05B0 094D 3099 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062; # (a◌഻◌ְ◌्◌゙b; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN VERTICAL BAR VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 0D3C 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062; # (a◌ְ◌्◌゙◌഼b; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN CIRCULAR VIRAMA, LATIN SMALL LETTER B
+0061 0D3C 05B0 094D 3099 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062; # (a◌഼◌ְ◌्◌゙b; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN CIRCULAR VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0D4D 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062; # (a◌ְ◌्◌゙◌്b; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN VIRAMA, LATIN SMALL LETTER B
 0061 0D4D 05B0 094D 3099 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062; # (a◌്◌ְ◌्◌゙b; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0DCA 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062; # (a◌ְ◌्◌゙◌්b; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, SINHALA SIGN AL-LAKUNA, LATIN SMALL LETTER B
@@ -17999,6 +18003,14 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1DF4 0315 0300 05AE 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062; # (a◌ᷴ◌̕◌̀◌֮b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LATIN SMALL LETTER U WITH DIAERESIS, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1DF5 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062; # (a◌̕◌̀◌֮◌᷵b; à◌֮◌᷵◌̕b; a◌֮◌̀◌᷵◌̕b; à◌֮◌᷵◌̕b; a◌֮◌̀◌᷵◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING UP TACK ABOVE, LATIN SMALL LETTER B
 0061 1DF5 0315 0300 05AE 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062; # (a◌᷵◌̕◌̀◌֮b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING UP TACK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 035C 0315 0300 1DF6 0062;00E0 0315 1DF6 035C 0062;0061 0300 0315 1DF6 035C 0062;00E0 0315 1DF6 035C 0062;0061 0300 0315 1DF6 035C 0062; # (a◌͜◌̕◌̀◌᷶b; à◌̕◌᷶◌͜b; a◌̀◌̕◌᷶◌͜b; à◌̕◌᷶◌͜b; a◌̀◌̕◌᷶◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, COMBINING KAVYKA ABOVE RIGHT, LATIN SMALL LETTER B
+0061 1DF6 035C 0315 0300 0062;00E0 1DF6 0315 035C 0062;0061 0300 1DF6 0315 035C 0062;00E0 1DF6 0315 035C 0062;0061 0300 1DF6 0315 035C 0062; # (a◌᷶◌͜◌̕◌̀b; à◌᷶◌̕◌͜b; a◌̀◌᷶◌̕◌͜b; à◌᷶◌̕◌͜b; a◌̀◌᷶◌̕◌͜b; ) LATIN SMALL LETTER A, COMBINING KAVYKA ABOVE RIGHT, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B
+0061 0300 05AE 1D16D 1DF7 0062;00E0 1D16D 05AE 1DF7 0062;0061 1D16D 05AE 1DF7 0300 0062;00E0 1D16D 05AE 1DF7 0062;0061 1D16D 05AE 1DF7 0300 0062; # (a◌̀◌𝅭֮◌᷷b; à𝅭◌֮◌᷷b; a𝅭◌֮◌᷷◌̀b; à𝅭◌֮◌᷷b; a𝅭◌֮◌᷷◌̀b; ) LATIN SMALL LETTER A, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, COMBINING KAVYKA ABOVE LEFT, LATIN SMALL LETTER B
+0061 1DF7 0300 05AE 1D16D 0062;00E0 1D16D 1DF7 05AE 0062;0061 1D16D 1DF7 05AE 0300 0062;00E0 1D16D 1DF7 05AE 0062;0061 1D16D 1DF7 05AE 0300 0062; # (a◌᷷◌̀◌𝅭֮b; à𝅭◌᷷◌֮b; a𝅭◌᷷◌֮◌̀b; à𝅭◌᷷◌֮b; a𝅭◌᷷◌֮◌̀b; ) LATIN SMALL LETTER A, COMBINING KAVYKA ABOVE LEFT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, LATIN SMALL LETTER B
+0061 0300 05AE 1D16D 1DF8 0062;00E0 1D16D 05AE 1DF8 0062;0061 1D16D 05AE 1DF8 0300 0062;00E0 1D16D 05AE 1DF8 0062;0061 1D16D 05AE 1DF8 0300 0062; # (a◌̀◌𝅭֮◌᷸b; à𝅭◌֮◌᷸b; a𝅭◌֮◌᷸◌̀b; à𝅭◌֮◌᷸b; a𝅭◌֮◌᷸◌̀b; ) LATIN SMALL LETTER A, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, COMBINING DOT ABOVE LEFT, LATIN SMALL LETTER B
+0061 1DF8 0300 05AE 1D16D 0062;00E0 1D16D 1DF8 05AE 0062;0061 1D16D 1DF8 05AE 0300 0062;00E0 1D16D 1DF8 05AE 0062;0061 1D16D 1DF8 05AE 0300 0062; # (a◌᷸◌̀◌𝅭֮b; à𝅭◌᷸◌֮b; a𝅭◌᷸◌֮◌̀b; à𝅭◌᷸◌֮b; a𝅭◌᷸◌֮◌̀b; ) LATIN SMALL LETTER A, COMBINING DOT ABOVE LEFT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, LATIN SMALL LETTER B
+0061 059A 0316 302A 1DF9 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062; # (a◌֚◌̖◌〪◌᷹b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, COMBINING WIDE INVERTED BRIDGE BELOW, LATIN SMALL LETTER B
+0061 1DF9 059A 0316 302A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062; # (a◌᷹◌֚◌̖◌〪b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; ) LATIN SMALL LETTER A, COMBINING WIDE INVERTED BRIDGE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1DFB 0062;00E0 05AE 1DFB 0315 0062;0061 05AE 0300 1DFB 0315 0062;00E0 05AE 1DFB 0315 0062;0061 05AE 0300 1DFB 0315 0062; # (a◌̕◌̀◌֮◌᷻b; à◌֮◌᷻◌̕b; a◌֮◌̀◌᷻◌̕b; à◌֮◌᷻◌̕b; a◌֮◌̀◌᷻◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DELETION MARK, LATIN SMALL LETTER B
 0061 1DFB 0315 0300 05AE 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062; # (a◌᷻◌̕◌̀◌֮b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DELETION MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 035D 035C 0315 1DFC 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062; # (a◌͝◌͜◌̕◌᷼b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING DOUBLE INVERTED BREVE BELOW, LATIN SMALL LETTER B
@@ -18397,8 +18409,20 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 116B7 3099 093C 0334 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062; # (a◌𑚷◌゙◌़◌̴b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; ) LATIN SMALL LETTER A, TAKRI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1172B 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062; # (a◌ְ◌्◌゙◌𑜫b; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, AHOM SIGN KILLER, LATIN SMALL LETTER B
 0061 1172B 05B0 094D 3099 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062; # (a◌𑜫◌ְ◌्◌゙b; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; ) LATIN SMALL LETTER A, AHOM SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A34 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062; # (a◌ְ◌्◌゙◌𑨴b; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SIGN VIRAMA, LATIN SMALL LETTER B
+0061 11A34 05B0 094D 3099 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062; # (a◌𑨴◌ְ◌्◌゙b; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A47 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062; # (a◌ְ◌्◌゙◌𑩇b; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SUBJOINER, LATIN SMALL LETTER B
+0061 11A47 05B0 094D 3099 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062; # (a◌𑩇◌ְ◌्◌゙b; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SUBJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A99 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062; # (a◌ְ◌्◌゙◌𑪙b; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, SOYOMBO SUBJOINER, LATIN SMALL LETTER B
+0061 11A99 05B0 094D 3099 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062; # (a◌𑪙◌ְ◌्◌゙b; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; ) LATIN SMALL LETTER A, SOYOMBO SUBJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11C3F 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062; # (a◌ְ◌्◌゙◌𑰿b; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BHAIKSUKI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 11C3F 05B0 094D 3099 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062; # (a◌𑰿◌ְ◌्◌゙b; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; ) LATIN SMALL LETTER A, BHAIKSUKI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 11D42 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062; # (a◌゙◌़◌̴◌𑵂b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, MASARAM GONDI SIGN NUKTA, LATIN SMALL LETTER B
+0061 11D42 3099 093C 0334 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062; # (a◌𑵂◌゙◌़◌̴b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D44 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062; # (a◌ְ◌्◌゙◌𑵄b; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI SIGN HALANTA, LATIN SMALL LETTER B
+0061 11D44 05B0 094D 3099 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062; # (a◌𑵄◌ְ◌्◌゙b; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN HALANTA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D45 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062; # (a◌ְ◌्◌゙◌𑵅b; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI VIRAMA, LATIN SMALL LETTER B
+0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 093C 0334 16AF0 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062; # (a◌़◌̴◌𖫰b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B
 0061 16AF0 093C 0334 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062; # (a◌𖫰◌़◌̴b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 093C 0334 16AF1 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062; # (a◌़◌̴◌𖫱b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B
diff --git a/tests/uniwbrk/WordBreakTest.txt b/tests/uniwbrk/WordBreakTest.txt
index 920d614d16..63761026ce 100644
--- a/tests/uniwbrk/WordBreakTest.txt
+++ b/tests/uniwbrk/WordBreakTest.txt
@@ -1,13 +1,13 @@
-# WordBreakTest-9.0.0.txt
-# Date: 2016-06-02, 18:28:31 GMT
-# © 2016 Unicode®, Inc.
+# WordBreakTest-10.0.0.txt
+# Date: 2017-04-14, 05:40:44 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
 #   For documentation, see http://www.unicode.org/reports/tr44/
 #
-# Default Word Break Test
+# Default Word_Break Test
 #
 # Format:
 # <string> (# <comment>)?
@@ -17,7 +17,8 @@
 #  <comment> the format can change, but currently it shows:
 #	- the sample character name
 #	- (x) the Word_Break property value for the sample character
-#	- [x] the rule that determines whether there is a break or not
+#	- [x] the rule that determines whether there is a break or not,
+#	   as listed in the Rules section of WordBreakTest.html
 #
 # These samples may be extended or changed in the future.
 #
@@ -55,8 +56,8 @@
 ÷ 0001 × 0308 ÷ 261D ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0001 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Other) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0001 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0001 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Other) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0001 × 0308 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 × 0308 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0001 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 × 00AD ÷	#  ÷ [0.2] <START OF HEADING> (Other) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -117,8 +118,8 @@
 ÷ 000D ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 000D ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000D ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000D ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 00AD ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [3.1] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -179,8 +180,8 @@
 ÷ 000A ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 000A ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000A ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000A ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 00AD ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [3.1] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -241,8 +242,8 @@
 ÷ 000B ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 000B ÷ 1F3FB ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000B ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000B ÷ 2764 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000B ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000B ÷ 2640 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000B ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000B ÷ 1F466 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] BOY (EBG) ÷ [0.3]
 ÷ 000B ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000B ÷ 00AD ÷	#  ÷ [0.2] <LINE TABULATION> (Newline) ÷ [3.1] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -303,8 +304,8 @@
 ÷ 3031 × 0308 ÷ 261D ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 3031 ÷ 1F3FB ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 3031 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 3031 ÷ 2764 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 3031 × 0308 ÷ 2764 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 3031 ÷ 2640 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 3031 × 0308 ÷ 2640 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 3031 ÷ 1F466 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 3031 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 3031 × 00AD ÷	#  ÷ [0.2] VERTICAL KANA REPEAT MARK (Katakana) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -365,8 +366,8 @@
 ÷ 0041 × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0041 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0041 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0041 ÷ 2764 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0041 × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0041 ÷ 2640 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0041 × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0041 ÷ 1F466 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0041 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0041 × 00AD ÷	#  ÷ [0.2] LATIN CAPITAL LETTER A (ALetter) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -427,8 +428,8 @@
 ÷ 003A × 0308 ÷ 261D ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 003A ÷ 1F3FB ÷	#  ÷ [0.2] COLON (MidLetter) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 003A × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 003A ÷ 2764 ÷	#  ÷ [0.2] COLON (MidLetter) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 003A × 0308 ÷ 2764 ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 003A ÷ 2640 ÷	#  ÷ [0.2] COLON (MidLetter) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 003A × 0308 ÷ 2640 ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 003A ÷ 1F466 ÷	#  ÷ [0.2] COLON (MidLetter) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 003A × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 003A × 00AD ÷	#  ÷ [0.2] COLON (MidLetter) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -489,8 +490,8 @@
 ÷ 002C × 0308 ÷ 261D ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 002C ÷ 1F3FB ÷	#  ÷ [0.2] COMMA (MidNum) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 002C × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 002C ÷ 2764 ÷	#  ÷ [0.2] COMMA (MidNum) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 002C × 0308 ÷ 2764 ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 002C ÷ 2640 ÷	#  ÷ [0.2] COMMA (MidNum) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 002C × 0308 ÷ 2640 ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 002C ÷ 1F466 ÷	#  ÷ [0.2] COMMA (MidNum) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 002C × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 002C × 00AD ÷	#  ÷ [0.2] COMMA (MidNum) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -551,8 +552,8 @@
 ÷ 002E × 0308 ÷ 261D ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 002E ÷ 1F3FB ÷	#  ÷ [0.2] FULL STOP (MidNumLet) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 002E × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 002E ÷ 2764 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 002E × 0308 ÷ 2764 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 002E ÷ 2640 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 002E × 0308 ÷ 2640 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 002E ÷ 1F466 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 002E × 0308 ÷ 1F466 ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 002E × 00AD ÷	#  ÷ [0.2] FULL STOP (MidNumLet) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -613,8 +614,8 @@
 ÷ 0030 × 0308 ÷ 261D ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0030 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0030 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0030 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0030 × 0308 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0030 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0030 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0030 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0030 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0030 × 00AD ÷	#  ÷ [0.2] DIGIT ZERO (Numeric) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -675,8 +676,8 @@
 ÷ 005F × 0308 ÷ 261D ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 005F ÷ 1F3FB ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 005F × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 005F ÷ 2764 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 005F × 0308 ÷ 2764 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 005F ÷ 2640 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 005F × 0308 ÷ 2640 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 005F ÷ 1F466 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 005F × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 005F × 00AD ÷	#  ÷ [0.2] LOW LINE (ExtendNumLet) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -737,8 +738,8 @@
 ÷ 1F1E6 × 0308 ÷ 261D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F1E6 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F1E6 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F1E6 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 × 00AD ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -799,8 +800,8 @@
 ÷ 05D0 × 0308 ÷ 261D ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 05D0 ÷ 1F3FB ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 05D0 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 05D0 ÷ 2764 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 05D0 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 05D0 ÷ 2640 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 05D0 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 05D0 ÷ 1F466 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 05D0 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 05D0 × 00AD ÷	#  ÷ [0.2] HEBREW LETTER ALEF (Hebrew_Letter) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -861,8 +862,8 @@
 ÷ 0022 × 0308 ÷ 261D ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0022 ÷ 1F3FB ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0022 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0022 ÷ 2764 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0022 × 0308 ÷ 2764 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0022 ÷ 2640 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0022 × 0308 ÷ 2640 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0022 ÷ 1F466 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0022 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0022 × 00AD ÷	#  ÷ [0.2] QUOTATION MARK (Double_Quote) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -923,8 +924,8 @@
 ÷ 0027 × 0308 ÷ 261D ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0027 ÷ 1F3FB ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0027 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0027 ÷ 2764 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0027 × 0308 ÷ 2764 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0027 ÷ 2640 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0027 × 0308 ÷ 2640 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0027 ÷ 1F466 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0027 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0027 × 00AD ÷	#  ÷ [0.2] APOSTROPHE (Single_Quote) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -985,8 +986,8 @@
 ÷ 261D × 0308 ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 261D × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 261D × 0308 × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] COMBINING DIAERESIS (Extend_FE) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 261D ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 261D × 0308 ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 261D ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 261D × 0308 ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 261D ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D × 00AD ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1047,8 +1048,8 @@
 ÷ 1F3FB × 0308 ÷ 261D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F3FB ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F3FB × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F3FB ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB × 0308 ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F3FB ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB × 0308 ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB × 00AD ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1075,68 +1076,68 @@
 ÷ 1F3FB × 0308 ÷ 0031 ÷ 002C ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
 ÷ 1F3FB ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
 ÷ 1F3FB × 0308 ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
-÷ 2764 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [3.2] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [3.2] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 ÷ 000B ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [3.2] <LINE TABULATION> (Newline) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000B ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <LINE TABULATION> (Newline) ÷ [0.3]
-÷ 2764 ÷ 3031 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] VERTICAL KANA REPEAT MARK (Katakana) ÷ [0.3]
-÷ 2764 × 0308 ÷ 3031 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] VERTICAL KANA REPEAT MARK (Katakana) ÷ [0.3]
-÷ 2764 ÷ 0041 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN CAPITAL LETTER A (ALetter) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0041 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN CAPITAL LETTER A (ALetter) ÷ [0.3]
-÷ 2764 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 × 0308 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 × 0308 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 ÷ 002E ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] FULL STOP (MidNumLet) ÷ [0.3]
-÷ 2764 × 0308 ÷ 002E ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FULL STOP (MidNumLet) ÷ [0.3]
-÷ 2764 ÷ 0030 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] DIGIT ZERO (Numeric) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0030 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ZERO (Numeric) ÷ [0.3]
-÷ 2764 ÷ 005F ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LOW LINE (ExtendNumLet) ÷ [0.3]
-÷ 2764 × 0308 ÷ 005F ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LOW LINE (ExtendNumLet) ÷ [0.3]
-÷ 2764 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 ÷ 05D0 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [0.3]
-÷ 2764 × 0308 ÷ 05D0 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [0.3]
-÷ 2764 ÷ 0022 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] QUOTATION MARK (Double_Quote) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0022 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] QUOTATION MARK (Double_Quote) ÷ [0.3]
-÷ 2764 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 × 0308 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 × 00AD ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
-÷ 2764 × 0308 × 00AD ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
-÷ 2764 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING GRAVE ACCENT (Extend_FE) ÷ [0.3]
-÷ 2764 × 0308 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] COMBINING GRAVE ACCENT (Extend_FE) ÷ [0.3]
-÷ 2764 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] ZERO WIDTH JOINER (ZWJ_FE) ÷ [0.3]
-÷ 2764 × 0308 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] ZERO WIDTH JOINER (ZWJ_FE) ÷ [0.3]
-÷ 2764 ÷ 0061 × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0061 × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 ÷ 0061 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0061 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 ÷ 0061 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0061 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 ÷ 0061 ÷ 0027 × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0061 ÷ 0027 × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 ÷ 0061 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0061 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 ÷ 0031 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0031 ÷ 003A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
-÷ 2764 ÷ 0031 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0031 ÷ 0027 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
-÷ 2764 ÷ 0031 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0031 ÷ 002C ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
-÷ 2764 ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
+÷ 2640 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [3.2] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [3.2] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 ÷ 000B ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [3.2] <LINE TABULATION> (Newline) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000B ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [3.2] <LINE TABULATION> (Newline) ÷ [0.3]
+÷ 2640 ÷ 3031 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] VERTICAL KANA REPEAT MARK (Katakana) ÷ [0.3]
+÷ 2640 × 0308 ÷ 3031 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] VERTICAL KANA REPEAT MARK (Katakana) ÷ [0.3]
+÷ 2640 ÷ 0041 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN CAPITAL LETTER A (ALetter) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0041 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN CAPITAL LETTER A (ALetter) ÷ [0.3]
+÷ 2640 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 × 0308 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 × 0308 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 ÷ 002E ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] FULL STOP (MidNumLet) ÷ [0.3]
+÷ 2640 × 0308 ÷ 002E ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FULL STOP (MidNumLet) ÷ [0.3]
+÷ 2640 ÷ 0030 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] DIGIT ZERO (Numeric) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0030 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ZERO (Numeric) ÷ [0.3]
+÷ 2640 ÷ 005F ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LOW LINE (ExtendNumLet) ÷ [0.3]
+÷ 2640 × 0308 ÷ 005F ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LOW LINE (ExtendNumLet) ÷ [0.3]
+÷ 2640 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 ÷ 05D0 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [0.3]
+÷ 2640 × 0308 ÷ 05D0 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEBREW LETTER ALEF (Hebrew_Letter) ÷ [0.3]
+÷ 2640 ÷ 0022 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] QUOTATION MARK (Double_Quote) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0022 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] QUOTATION MARK (Double_Quote) ÷ [0.3]
+÷ 2640 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 × 0308 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 × 0308 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 × 00AD ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
+÷ 2640 × 0308 × 00AD ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
+÷ 2640 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING GRAVE ACCENT (Extend_FE) ÷ [0.3]
+÷ 2640 × 0308 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] COMBINING GRAVE ACCENT (Extend_FE) ÷ [0.3]
+÷ 2640 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] ZERO WIDTH JOINER (ZWJ_FE) ÷ [0.3]
+÷ 2640 × 0308 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] ZERO WIDTH JOINER (ZWJ_FE) ÷ [0.3]
+÷ 2640 ÷ 0061 × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0061 × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 ÷ 0061 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0061 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 ÷ 0061 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0061 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 ÷ 0061 ÷ 0027 × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0061 ÷ 0027 × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 ÷ 0061 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0061 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 ÷ 0031 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0031 ÷ 003A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [0.3]
+÷ 2640 ÷ 0031 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0031 ÷ 0027 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [0.3]
+÷ 2640 ÷ 0031 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0031 ÷ 002C ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [0.3]
+÷ 2640 ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0031 ÷ 002E × 2060 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [0.3]
 ÷ 1F466 ÷ 0001 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 0001 ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] <START OF HEADING> (Other) ÷ [0.3]
 ÷ 1F466 ÷ 000D ÷	#  ÷ [0.2] BOY (EBG) ÷ [3.2] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -1171,8 +1172,8 @@
 ÷ 1F466 × 0308 ÷ 261D ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F466 × 0308 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F466 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 × 0308 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 × 00AD ÷	#  ÷ [0.2] BOY (EBG) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1233,8 +1234,8 @@
 ÷ 00AD × 0308 ÷ 261D ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 00AD ÷ 1F3FB ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 00AD × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 00AD ÷ 2764 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 00AD × 0308 ÷ 2764 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 00AD ÷ 2640 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 00AD × 0308 ÷ 2640 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 00AD ÷ 1F466 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 00AD × 0308 ÷ 1F466 ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 00AD × 00AD ÷	#  ÷ [0.2] SOFT HYPHEN (Format_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1295,8 +1296,8 @@
 ÷ 0300 × 0308 ÷ 261D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0300 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0300 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0300 × 0308 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 × 0308 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0300 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 × 00AD ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1357,8 +1358,8 @@
 ÷ 200D × 0308 ÷ 261D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 200D ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 0308 ÷ 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 0308 ÷ 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] BOY (EBG) ÷ [0.3]
 ÷ 200D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 200D × 00AD ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1419,8 +1420,8 @@
 ÷ 0061 × 2060 × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0061 × 2060 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0061 × 2060 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0061 × 2060 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0061 × 2060 × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 × 2060 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 × 2060 × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0061 × 2060 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 × 2060 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 × 2060 × 00AD ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] WORD JOINER (Format_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1481,8 +1482,8 @@
 ÷ 0061 ÷ 003A × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0061 ÷ 003A ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0061 ÷ 003A × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0061 ÷ 003A ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0061 ÷ 003A × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 003A ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 003A × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0061 ÷ 003A ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 003A × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 003A × 00AD ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COLON (MidLetter) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1543,8 +1544,8 @@
 ÷ 0061 ÷ 0027 × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0061 ÷ 0027 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0061 ÷ 0027 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0061 ÷ 0027 × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 0027 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 0027 × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0061 ÷ 0027 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 00AD ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1605,8 +1606,8 @@
 ÷ 0061 ÷ 0027 × 2060 × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 2060 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 2060 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0061 ÷ 0027 × 2060 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0061 ÷ 0027 × 2060 × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 0027 × 2060 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 0027 × 2060 × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 2060 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 2060 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 0027 × 2060 × 00AD ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] WORD JOINER (Format_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1667,8 +1668,8 @@
 ÷ 0061 ÷ 002C × 0308 ÷ 261D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0061 ÷ 002C ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0061 ÷ 002C × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0061 ÷ 002C ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0061 ÷ 002C × 0308 ÷ 2764 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 002C ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0061 ÷ 002C × 0308 ÷ 2640 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0061 ÷ 002C ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 002C × 0308 ÷ 1F466 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 ÷ 002C × 00AD ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) ÷ [999.0] COMMA (MidNum) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1729,8 +1730,8 @@
 ÷ 0031 ÷ 003A × 0308 ÷ 261D ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0031 ÷ 003A ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0031 ÷ 003A × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0031 ÷ 003A ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0031 ÷ 003A × 0308 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 003A ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 003A × 0308 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0031 ÷ 003A ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 003A × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 003A × 00AD ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COLON (MidLetter) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1791,8 +1792,8 @@
 ÷ 0031 ÷ 0027 × 0308 ÷ 261D ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0031 ÷ 0027 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0031 ÷ 0027 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0031 ÷ 0027 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0031 ÷ 0027 × 0308 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 0027 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 0027 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0031 ÷ 0027 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 0027 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 0027 × 00AD ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] APOSTROPHE (Single_Quote) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1853,8 +1854,8 @@
 ÷ 0031 ÷ 002C × 0308 ÷ 261D ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0031 ÷ 002C ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0031 ÷ 002C × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0031 ÷ 002C ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0031 ÷ 002C × 0308 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 002C ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 002C × 0308 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0031 ÷ 002C ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 002C × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 002C × 00AD ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] COMMA (MidNum) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1915,8 +1916,8 @@
 ÷ 0031 ÷ 002E × 2060 × 0308 ÷ 261D ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 0031 ÷ 002E × 2060 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0031 ÷ 002E × 2060 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0031 ÷ 002E × 2060 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0031 ÷ 002E × 2060 × 0308 ÷ 2764 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 002E × 2060 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0031 ÷ 002E × 2060 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0031 ÷ 002E × 2060 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 002E × 2060 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0031 ÷ 002E × 2060 × 00AD ÷	#  ÷ [0.2] DIGIT ONE (Numeric) ÷ [999.0] FULL STOP (MidNumLet) × [4.0] WORD JOINER (Format_FE) × [4.0] SOFT HYPHEN (Format_FE) ÷ [0.3]
@@ -1966,7 +1967,7 @@
 ÷ 261D × 1F3FB ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 1F466 × 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] BOY (EBG) × [14.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_FE) × [3.3] BOY (EBG) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0061 × 0308 × 200D × 0308 × 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (ALetter) × [4.0] COMBINING DIAERESIS (Extend_FE) × [4.0] ZERO WIDTH JOINER (ZWJ_FE) × [4.0] COMBINING DIAERESIS (Extend_FE) × [5.0] LATIN SMALL LETTER B (ALetter) ÷ [0.3]
diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index 23866c9543..95f839f402 100755
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -9,15 +9,14 @@ ${CHECKER} ./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out
 tmpfiles="$tmpfiles uc_width.ok"
 cat > uc_width.ok <<\EOF
 0000		0
-0020..007E	1
-00A0		1
+0020..00A0	1
 00A1..00AC	A
 00AD		0
 00AE..02FF	A
 0300..036F	0
 0370..0482	A
 0483..0489	0
-048A..0590	A
+048A..058F	A
 0591..05BD	0
 05BE		A
 05BF		0
@@ -27,13 +26,13 @@ cat > uc_width.ok <<\EOF
 05C4..05C5	0
 05C6		A
 05C7		0
-05C8..05FF	A
+05D0..05F4	A
 0600..0605	0
 0606..060F	A
 0610..061A	0
 061B		A
 061C		0
-061D..064A	A
+061E..064A	A
 064B..065F	0
 0660..066F	A
 0670		0
@@ -45,13 +44,13 @@ cat > uc_width.ok <<\EOF
 06E7..06E8	0
 06E9		A
 06EA..06ED	0
-06EE..070E	A
+06EE..070D	A
 070F		0
 0710		A
 0711		0
 0712..072F	A
 0730..074A	0
-074B..07A5	A
+074D..07A5	A
 07A6..07B0	0
 07B1..07EA	A
 07EB..07F3	0
@@ -63,9 +62,9 @@ cat > uc_width.ok <<\EOF
 0825..0827	0
 0828		A
 0829..082D	0
-082E..0858	A
+0830..0858	A
 0859..085B	0
-085C..08D3	A
+085E..08BD	A
 08D4..0902	0
 0903..0939	A
 093A		0
@@ -81,111 +80,93 @@ cat > uc_width.ok <<\EOF
 0962..0963	0
 0964..0980	A
 0981		0
-0982..09BB	A
+0982..09B9	A
 09BC		0
 09BD..09C0	A
 09C1..09C4	0
-09C5..09CC	A
+09C7..09CC	A
 09CD		0
 09CE..09E1	A
 09E2..09E3	0
-09E4..0A00	A
+09E6..09FD	A
 0A01..0A02	0
-0A03..0A3B	A
+0A03..0A39	A
 0A3C		0
-0A3D..0A40	A
-0A41..0A42	0
-0A43..0A46	A
-0A47..0A48	0
-0A49..0A4A	A
-0A4B..0A4D	0
-0A4E..0A50	A
-0A51		0
-0A52..0A6F	A
+0A3E..0A40	A
+0A41..0A51	0
+0A59..0A6F	A
 0A70..0A71	0
 0A72..0A74	A
-0A75		0
-0A76..0A80	A
-0A81..0A82	0
-0A83..0ABB	A
+0A75..0A82	0
+0A83..0AB9	A
 0ABC		0
 0ABD..0AC0	A
-0AC1..0AC5	0
-0AC6		A
-0AC7..0AC8	0
+0AC1..0AC8	0
 0AC9..0ACC	A
 0ACD		0
-0ACE..0AE1	A
+0AD0..0AE1	A
 0AE2..0AE3	0
-0AE4..0B00	A
-0B01		0
-0B02..0B3B	A
+0AE6..0AF9	A
+0AFA..0B01	0
+0B02..0B39	A
 0B3C		0
 0B3D..0B3E	A
 0B3F		0
 0B40		A
 0B41..0B44	0
-0B45..0B4C	A
-0B4D		0
-0B4E..0B55	A
-0B56		0
+0B47..0B4C	A
+0B4D..0B56	0
 0B57..0B61	A
 0B62..0B63	0
-0B64..0B81	A
+0B66..0B77	A
 0B82		0
 0B83..0BBF	A
 0BC0		0
 0BC1..0BCC	A
 0BCD		0
-0BCE..0BFF	A
+0BD0..0BFA	A
 0C00		0
 0C01..0C3D	A
 0C3E..0C40	0
-0C41..0C45	A
-0C46..0C48	0
-0C49		A
-0C4A..0C4D	0
-0C4E..0C54	A
-0C55..0C56	0
-0C57..0C61	A
+0C41..0C44	A
+0C46..0C56	0
+0C58..0C61	A
 0C62..0C63	0
-0C64..0C80	A
+0C66..0C80	A
 0C81		0
-0C82..0CBB	A
+0C82..0CB9	A
 0CBC		0
 0CBD..0CCB	A
 0CCC..0CCD	0
-0CCE..0CE1	A
+0CD5..0CE1	A
 0CE2..0CE3	0
-0CE4..0D00	A
-0D01		0
-0D02..0D40	A
+0CE6..0CF2	A
+0D00..0D01	0
+0D02..0D3A	A
+0D3B..0D3C	0
+0D3D..0D40	A
 0D41..0D44	0
-0D45..0D4C	A
+0D46..0D4C	A
 0D4D		0
 0D4E..0D61	A
 0D62..0D63	0
-0D64..0DC9	A
+0D66..0DC6	A
 0DCA		0
-0DCB..0DD1	A
-0DD2..0DD4	0
-0DD5		A
-0DD6		0
-0DD7..0E30	A
+0DCF..0DD1	A
+0DD2..0DD6	0
+0DD8..0E30	A
 0E31		0
 0E32..0E33	A
 0E34..0E3A	0
-0E3B..0E46	A
+0E3F..0E46	A
 0E47..0E4E	0
 0E4F..0EB0	A
 0EB1		0
 0EB2..0EB3	A
-0EB4..0EB9	0
-0EBA		A
-0EBB..0EBC	0
-0EBD..0EC7	A
+0EB4..0EBC	0
+0EBD..0EC6	A
 0EC8..0ECD	0
-0ECE..0F17	A
+0ED0..0F17	A
 0F18..0F19	0
 0F1A..0F34	A
 0F35		0
@@ -193,17 +174,15 @@ cat > uc_width.ok <<\EOF
 0F37		0
 0F38		A
 0F39		0
-0F3A..0F70	A
+0F3A..0F6C	A
 0F71..0F7E	0
 0F7F		A
 0F80..0F84	0
 0F85		A
 0F86..0F87	0
 0F88..0F8C	A
-0F8D..0F97	0
-0F98		A
-0F99..0FBC	0
-0FBD..0FC5	A
+0F8D..0FBC	0
+0FBE..0FC5	A
 0FC6		0
 0FC7..102C	A
 102D..1030	0
@@ -229,17 +208,17 @@ cat > uc_width.ok <<\EOF
 109D		0
 109E..10FF	A
 1100..115F	2
-1160..135C	A
+1160..135A	A
 135D..135F	0
 1360..1711	A
 1712..1714	0
-1715..1731	A
+1720..1731	A
 1732..1734	0
 1735..1751	A
 1752..1753	0
-1754..1771	A
+1760..1770	A
 1772..1773	0
-1774..17B3	A
+1780..17B3	A
 17B4..17B5	0
 17B6		A
 17B7..17BD	0
@@ -249,13 +228,13 @@ cat > uc_width.ok <<\EOF
 17C9..17D3	0
 17D4..17DC	A
 17DD		0
-17DE..180A	A
+17E0..180A	A
 180B..180E	0
-180F..1884	A
+1810..1884	A
 1885..1886	0
 1887..18A8	A
 18A9		0
-18AA..191F	A
+18AA..191E	A
 1920..1922	0
 1923..1926	A
 1927..1928	0
@@ -263,28 +242,22 @@ cat > uc_width.ok <<\EOF
 1932		0
 1933..1938	A
 1939..193B	0
-193C..1A16	A
+1940..1A16	A
 1A17..1A18	0
 1A19..1A1A	A
 1A1B		0
-1A1C..1A55	A
+1A1E..1A55	A
 1A56		0
 1A57		A
-1A58..1A5E	0
-1A5F		A
-1A60		0
+1A58..1A60	0
 1A61		A
 1A62		0
 1A63..1A64	A
 1A65..1A6C	0
 1A6D..1A72	A
-1A73..1A7C	0
-1A7D..1A7E	A
-1A7F		0
-1A80..1AAF	A
-1AB0..1ABE	0
-1ABF..1AFF	A
-1B00..1B03	0
+1A73..1A7F	0
+1A80..1AAD	A
+1AB0..1B03	0
 1B04..1B33	A
 1B34		0
 1B35		A
@@ -295,7 +268,7 @@ cat > uc_width.ok <<\EOF
 1B42		0
 1B43..1B6A	A
 1B6B..1B73	0
-1B74..1B7F	A
+1B74..1B7C	A
 1B80..1B81	0
 1B82..1BA1	A
 1BA2..1BA5	0
@@ -315,7 +288,7 @@ cat > uc_width.ok <<\EOF
 1C2C..1C33	0
 1C34..1C35	A
 1C36..1C37	0
-1C38..1CCF	A
+1C3B..1CC7	A
 1CD0..1CD2	0
 1CD3		A
 1CD4..1CE0	0
@@ -327,40 +300,104 @@ cat > uc_width.ok <<\EOF
 1CF4		0
 1CF5..1CF7	A
 1CF8..1CF9	0
-1CFA..1DBF	A
-1DC0..1DF5	0
-1DF6..1DFA	A
-1DFB..1DFF	0
+1D00..1DBF	A
+1DC0..1DFF	0
 1E00..200A	A
 200B..200F	0
 2010..2029	A
 202A..202E	0
 202F..205F	A
-2060..2064	0
-2065		A
-2066..206F	0
+2060..206F	0
 2070..20A8	A
 20A9		1
-20AA..20CF	A
+20AA..20BF	A
 20D0..20F0	0
-20F1..2328	A
+2100..2319	A
+231A..231B	2
+231C..2328	A
 2329..232A	2
-232B..2CEE	A
+232B..23E8	A
+23E9..23EC	2
+23ED..23EF	A
+23F0		2
+23F1..23F2	A
+23F3		2
+23F4..25FC	A
+25FD..25FE	2
+25FF..2613	A
+2614..2615	2
+2616..2647	A
+2648..2653	2
+2654..267E	A
+267F		2
+2680..2692	A
+2693		2
+2694..26A0	A
+26A1		2
+26A2..26A9	A
+26AA..26AB	2
+26AC..26BC	A
+26BD..26BE	2
+26BF..26C3	A
+26C4..26C5	2
+26C6..26CD	A
+26CE		2
+26CF..26D3	A
+26D4		2
+26D5..26E9	A
+26EA		2
+26EB..26F1	A
+26F2..26F3	2
+26F4		A
+26F5		2
+26F6..26F9	A
+26FA		2
+26FB..26FC	A
+26FD		2
+26FE..2704	A
+2705		2
+2706..2709	A
+270A..270B	2
+270C..2727	A
+2728		2
+2729..274B	A
+274C		2
+274D		A
+274E		2
+274F..2752	A
+2753..2755	2
+2756		A
+2757		2
+2758..2794	A
+2795..2797	2
+2798..27AF	A
+27B0		2
+27B1..27BE	A
+27BF		2
+27C0..2B1A	A
+2B1B..2B1C	2
+2B1D..2B4F	A
+2B50		2
+2B51..2B54	A
+2B55		2
+2B56..2CEE	A
 2CEF..2CF1	0
-2CF2..2D7E	A
+2CF2..2D70	A
 2D7F		0
-2D80..2DDF	A
+2D80..2DDE	A
 2DE0..2DFF	0
-2E00..2E7F	A
+2E00..2E49	A
 2E80..3029	2
 302A..302D	0
 302E..303E	2
 303F		A
-3040..3098	2
+3041..3096	2
 3099..309A	0
-309B..4DBF	2
+309B..3247	2
+3248..324F	A
+3250..4DBF	2
 4DC0..4DFF	A
-4E00..A4CF	2
+4E00..A4C6	2
 A4D0..A66E	A
 A66F..A672	0
 A673		A
@@ -379,13 +416,14 @@ A80C..A824	A
 A825..A826	0
 A827..A8C3	A
 A8C4..A8C5	0
-A8C6..A8DF	A
+A8CE..A8D9	A
 A8E0..A8F1	0
 A8F2..A925	A
 A926..A92D	0
 A92E..A946	A
 A947..A951	0
-A952..A97F	A
+A952..A95F	A
+A960..A97C	2
 A980..A982	0
 A983..A9B2	A
 A9B3		0
@@ -401,7 +439,7 @@ AA2F..AA30	A
 AA31..AA32	0
 AA33..AA34	A
 AA35..AA36	0
-AA37..AA42	A
+AA40..AA42	A
 AA43		0
 AA44..AA4B	A
 AA4C		0
@@ -421,53 +459,48 @@ AAC2..AAEB	A
 AAEC..AAED	0
 AAEE..AAF5	A
 AAF6		0
-AAF7..ABE4	A
+AB01..ABE4	A
 ABE5		0
 ABE6..ABE7	A
 ABE8		0
 ABE9..ABEC	A
 ABED		0
-ABEE..ABFF	A
+ABF0..ABF9	A
 AC00..D7A3	2
-D7A4..F8FF	A
+D7B0..F8FF	A
 F900..FAFF	2
 FB00..FB1D	A
 FB1E		0
-FB1F..FDFF	A
+FB1F..FDFD	A
 FE00..FE0F	0
-FE10..FE1F	2
+FE10..FE19	2
 FE20..FE2F	0
-FE30..FE6F	2
-FE70..FEFE	A
+FE30..FE6B	2
+FE70..FEFC	A
 FEFF		0
-FF00..FF60	2
-FF61..FFDF	1
+FF01..FF60	2
+FF61..FFDC	1
 FFE0..FFE6	2
-FFE7..FFF8	1
+FFE8..FFEE	1
 FFF9..FFFB	0
-FFFC..101FC	1
+FFFC..FFFF	A
+10000..101FC	1
 101FD		0
-101FE..102DF	1
+10280..102D0	1
 102E0		0
 102E1..10375	1
 10376..1037A	0
-1037B..10A00	1
-10A01..10A03	0
-10A04		1
-10A05..10A06	0
-10A07..10A0B	1
-10A0C..10A0F	0
-10A10..10A37	1
-10A38..10A3A	0
-10A3B..10A3E	1
-10A3F		0
+10380..10A00	1
+10A01..10A0F	0
+10A10..10A33	1
+10A38..10A3F	0
 10A40..10AE4	1
 10AE5..10AE6	0
-10AE7..11000	1
+10AEB..11000	1
 11001		0
 11002..11037	1
 11038..11046	0
-11047..1107E	1
+11047..1106F	1
 1107F..11081	0
 11082..110B2	1
 110B3..110B6	0
@@ -475,15 +508,15 @@ FFFC..101FC	1
 110B9..110BA	0
 110BB..110BC	1
 110BD		0
-110BE..110FF	1
+110BE..110F9	1
 11100..11102	0
 11103..11126	1
 11127..1112B	0
 1112C		1
 1112D..11134	0
-11135..11172	1
+11136..11172	1
 11173		0
-11174..1117F	1
+11174..11176	1
 11180..11181	0
 11182..111B5	1
 111B6..111BE	0
@@ -497,21 +530,19 @@ FFFC..101FC	1
 11236..11237	0
 11238..1123D	1
 1123E		0
-1123F..112DE	1
+11280..112DE	1
 112DF		0
 112E0..112E2	1
 112E3..112EA	0
-112EB..112FF	1
+112F0..112F9	1
 11300..11301	0
-11302..1133B	1
+11302..11339	1
 1133C		0
 1133D..1133F	1
 11340		0
-11341..11365	1
-11366..1136C	0
-1136D..1136F	1
-11370..11374	0
-11375..11437	1
+11341..11363	1
+11366..11374	0
+11400..11437	1
 11438..1143F	0
 11440..11441	1
 11442..11444	0
@@ -527,13 +558,13 @@ FFFC..101FC	1
 114C2..114C3	0
 114C4..115B1	1
 115B2..115B5	0
-115B6..115BB	1
+115B8..115BB	1
 115BC..115BD	0
 115BE		1
 115BF..115C0	0
 115C1..115DB	1
 115DC..115DD	0
-115DE..11632	1
+11600..11632	1
 11633..1163A	0
 1163B..1163C	1
 1163D		0
@@ -547,35 +578,57 @@ FFFC..101FC	1
 116B0..116B5	0
 116B6		1
 116B7		0
-116B8..1171C	1
+116C0..11719	1
 1171D..1171F	0
 11720..11721	1
 11722..11725	0
 11726		1
 11727..1172B	0
-1172C..11C2F	1
-11C30..11C36	0
-11C37		1
-11C38..11C3D	0
-11C3E..11C91	1
+11730..11A00	1
+11A01..11A06	0
+11A07..11A08	1
+11A09..11A0A	0
+11A0B..11A32	1
+11A33..11A38	0
+11A39..11A3A	1
+11A3B..11A3E	0
+11A3F..11A46	1
+11A47		0
+11A50		1
+11A51..11A56	0
+11A57..11A58	1
+11A59..11A5B	0
+11A5C..11A89	1
+11A8A..11A96	0
+11A97		1
+11A98..11A99	0
+11A9A..11C2F	1
+11C30..11C3D	0
+11C3E..11C8F	1
 11C92..11CA7	0
-11CA8..11CA9	1
+11CA9		1
 11CAA..11CB0	0
 11CB1		1
 11CB2..11CB3	0
 11CB4		1
 11CB5..11CB6	0
-11CB7..16AEF	1
+11D00..11D30	1
+11D31..11D45	0
+11D46		1
+11D47		0
+11D50..16AED	1
 16AF0..16AF4	0
 16AF5..16B2F	1
 16B30..16B36	0
-16B37..16F8E	1
+16B37..16F7E	1
 16F8F..16F92	0
-16F93..1BC9C	1
+16F93..16F9F	1
+16FE0..1B2FB	2
+1BC00..1BC9C	1
 1BC9D..1BC9E	0
 1BC9F		1
 1BCA0..1BCA3	0
-1BCA4..1D166	1
+1D000..1D166	1
 1D167..1D169	0
 1D16A..1D172	1
 1D173..1D182	0
@@ -593,33 +646,75 @@ FFFC..101FC	1
 1DA75		0
 1DA76..1DA83	1
 1DA84		0
-1DA85..1DA9A	1
-1DA9B..1DA9F	0
-1DAA0		1
-1DAA1..1DAAF	0
-1DAB0..1DFFF	1
-1E000..1E006	0
-1E007		1
-1E008..1E018	0
-1E019..1E01A	1
-1E01B..1E021	0
-1E022		1
-1E023..1E024	0
-1E025		1
-1E026..1E02A	0
-1E02B..1E8CF	1
+1DA85..1DA8B	1
+1DA9B..1E02A	0
+1E800..1E8CF	1
 1E8D0..1E8D6	0
-1E8D7..1E943	1
+1E900..1E943	1
 1E944..1E94A	0
-1E94B..1FFFF	1
-20000..3FFFF	2
-40000..E0000	1
-E0001		0
-E0002..E001F	1
-E0020..E007F	0
-E0080..E00FF	1
-E0100..E01EF	0
-E01F0..10FFFF	1
+1E950..1F003	1
+1F004		2
+1F005..1F0CE	1
+1F0CF		2
+1F0D1..1F18D	1
+1F18E		2
+1F18F..1F190	1
+1F191..1F19A	2
+1F19B..1F1FF	1
+1F200..1F320	2
+1F321..1F32C	1
+1F32D..1F335	2
+1F336		1
+1F337..1F37C	2
+1F37D		1
+1F37E..1F393	2
+1F394..1F39F	1
+1F3A0..1F3CA	2
+1F3CB..1F3CE	1
+1F3CF..1F3D3	2
+1F3D4..1F3DF	1
+1F3E0..1F3F0	2
+1F3F1..1F3F3	1
+1F3F4		2
+1F3F5..1F3F7	1
+1F3F8..1F43E	2
+1F43F		1
+1F440		2
+1F441		1
+1F442..1F4FC	2
+1F4FD..1F4FE	1
+1F4FF..1F53D	2
+1F53E..1F54A	1
+1F54B..1F54E	2
+1F54F		1
+1F550..1F567	2
+1F568..1F579	1
+1F57A		2
+1F57B..1F594	1
+1F595..1F596	2
+1F597..1F5A3	1
+1F5A4		2
+1F5A5..1F5FA	1
+1F5FB..1F64F	2
+1F650..1F67F	1
+1F680..1F6C5	2
+1F6C6..1F6CB	1
+1F6CC		2
+1F6CD..1F6CF	1
+1F6D0..1F6D2	2
+1F6D3..1F6EA	1
+1F6EB..1F6EC	2
+1F6F0..1F6F3	1
+1F6F4..1F6F8	2
+1F700..1F90B	1
+1F910..1F9E6	2
+1FFFE..1FFFF	1
+20000..2FFFD	2
+2FFFE..2FFFF	1
+30000..3FFFD	2
+3FFFE..DFFFF	1
+E0001..E01EF	0
+EFFFE..10FFFF	1
 EOF
 
 : ${DIFF=diff}
author	Bruno Haible <bruno@clisp.org>	2021-12-26 17:48:24 +0100
committer	Bruno Haible <bruno@clisp.org>	2021-12-26 17:48:24 +0100
commit	499a4fa2a470c5ad52fabc4cb9f70e8230b79a44 (patch)
tree	a1774b973e94b4ddffbdf50f5603993be202855a
parent	39685a37f6e2ee6b4329da607a30073f466d2262 (diff)
download	gnulib-499a4fa2a470c5ad52fabc4cb9f70e8230b79a44.tar.gz