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 /lib
parent: 39685a37f6e2ee6b4329da607a30073f466d2262 (diff)
download: gnulib-499a4fa2a470c5ad52fabc4cb9f70e8230b79a44.tar.gz
172 files changed, 4535 insertions, 3523 deletions
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.  */
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 /lib
parent	39685a37f6e2ee6b4329da607a30073f466d2262 (diff)
download	gnulib-499a4fa2a470c5ad52fabc4cb9f70e8230b79a44.tar.gz