New upstream version 1.3upstream/1.3 upstream

author: Jörg Frings-Fürst <debian@jff.email> 2024-10-20 15:21:43 +0200
committer: Jörg Frings-Fürst <debian@jff.email> 2024-10-20 15:21:43 +0200
commit: 4682deeb62247d34de87f8e777f99e2d337fd377 (patch)
tree: 5bd5b5605b5f3a4b3c8ea7468c34c23094afdef4 /tests/unictype
parent: 00893e79fc62966067af1a106567db96bd170338 (diff)
115 files changed, 2624 insertions, 395 deletions
diff --git a/tests/unictype/test-bidi_byname.c b/tests/unictype/test-bidi_byname.c
index 96d9f173..f71f49bb 100644
--- a/tests/unictype/test-bidi_byname.c
+++ b/tests/unictype/test-bidi_byname.c
@@ -125,5 +125,5 @@ main ()
   ASSERT (uc_bidi_class_byname ("X") < 0);
   ASSERT (uc_bidi_class_byname ("") < 0);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-bidi_longname.c b/tests/unictype/test-bidi_longname.c
index fcd7255f..a60d4893 100644
--- a/tests/unictype/test-bidi_longname.c
+++ b/tests/unictype/test-bidi_longname.c
@@ -46,5 +46,5 @@ main ()
   ASSERT (strcmp (uc_bidi_class_long_name (UC_BIDI_WS), "White Space") == 0);
   ASSERT (uc_bidi_class_long_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-bidi_name.c b/tests/unictype/test-bidi_name.c
index 4c4024d2..49b374ef 100644
--- a/tests/unictype/test-bidi_name.c
+++ b/tests/unictype/test-bidi_name.c
@@ -28,5 +28,5 @@ main ()
   ASSERT (strcmp (uc_bidi_class_name (UC_BIDI_NSM), "NSM") == 0);
   ASSERT (uc_bidi_class_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-bidi_of.c b/tests/unictype/test-bidi_of.c
index bc158324..8024e68d 100644
--- a/tests/unictype/test-bidi_of.c
+++ b/tests/unictype/test-bidi_of.c
@@ -29,5 +29,5 @@ main ()
   ASSERT (uc_bidi_class (0x05D7) == UC_BIDI_R);
   ASSERT (uc_bidi_class ('7') == UC_BIDI_EN);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-bidi_test.c b/tests/unictype/test-bidi_test.c
index fd3f2930..7142a6d9 100644
--- a/tests/unictype/test-bidi_test.c
+++ b/tests/unictype/test-bidi_test.c
@@ -44,5 +44,5 @@ main ()
       ASSERT (uc_is_bidi_class (c, uc_bidi_class (c)));
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-block_list.c b/tests/unictype/test-block_list.c
index 267d5456..b63d8568 100644
--- a/tests/unictype/test-block_list.c
+++ b/tests/unictype/test-block_list.c
@@ -46,5 +46,5 @@ main ()
     ASSERT (hebrew_block != NULL);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-block_of.c b/tests/unictype/test-block_of.c
index 60345188..86e5d2f2 100644
--- a/tests/unictype/test-block_of.c
+++ b/tests/unictype/test-block_of.c
@@ -63,5 +63,5 @@ main ()
       }
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-block_test.c b/tests/unictype/test-block_test.c
index be7e4417..a0b36ca7 100644
--- a/tests/unictype/test-block_test.c
+++ b/tests/unictype/test-block_test.c
@@ -38,5 +38,5 @@ main ()
   ASSERT (uc_is_block (0x2A6D6, &b));
   ASSERT (!uc_is_block (0x2A6D7, &b));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_C.c b/tests/unictype/test-categ_C.c
index e6a0903b..09da27e4 100644
--- a/tests/unictype/test-categ_C.c
+++ b/tests/unictype/test-categ_C.c
@@ -43,7 +43,7 @@
     { 0x085C, 0x085D },
     { 0x085F, 0x085F },
     { 0x086B, 0x086F },
-    { 0x088F, 0x0897 },
+    { 0x088F, 0x0896 },
     { 0x08E2, 0x08E2 },
     { 0x0984, 0x0984 },
     { 0x098D, 0x098E },
@@ -237,12 +237,11 @@
     { 0x1A9A, 0x1A9F },
     { 0x1AAE, 0x1AAF },
     { 0x1ACF, 0x1AFF },
-    { 0x1B4D, 0x1B4F },
-    { 0x1B7F, 0x1B7F },
+    { 0x1B4D, 0x1B4D },
     { 0x1BF4, 0x1BFB },
     { 0x1C38, 0x1C3A },
     { 0x1C4A, 0x1C4C },
-    { 0x1C89, 0x1C8F },
+    { 0x1C8B, 0x1C8F },
     { 0x1CBB, 0x1CBC },
     { 0x1CC8, 0x1CCF },
     { 0x1CFB, 0x1CFF },
@@ -271,7 +270,7 @@
     { 0x20C1, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x2427, 0x243F },
+    { 0x242A, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B96 },
@@ -299,16 +298,16 @@
     { 0x3100, 0x3104 },
     { 0x3130, 0x3130 },
     { 0x318F, 0x318F },
-    { 0x31E4, 0x31EE },
+    { 0x31E6, 0x31EE },
     { 0x321F, 0x321F },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
     { 0xA6F8, 0xA6FF },
-    { 0xA7CB, 0xA7CF },
+    { 0xA7CE, 0xA7CF },
     { 0xA7D2, 0xA7D2 },
     { 0xA7D4, 0xA7D4 },
-    { 0xA7DA, 0xA7F1 },
+    { 0xA7DD, 0xA7F1 },
     { 0xA82D, 0xA82F },
     { 0xA83A, 0xA83F },
     { 0xA878, 0xA87F },
@@ -397,7 +396,8 @@
     { 0x105A2, 0x105A2 },
     { 0x105B2, 0x105B2 },
     { 0x105BA, 0x105BA },
-    { 0x105BD, 0x105FF },
+    { 0x105BD, 0x105BF },
+    { 0x105F4, 0x105FF },
     { 0x10737, 0x1073F },
     { 0x10756, 0x1075F },
     { 0x10768, 0x1077F },
@@ -440,11 +440,15 @@
     { 0x10CB3, 0x10CBF },
     { 0x10CF3, 0x10CF9 },
     { 0x10D28, 0x10D2F },
-    { 0x10D3A, 0x10E5F },
+    { 0x10D3A, 0x10D3F },
+    { 0x10D66, 0x10D68 },
+    { 0x10D86, 0x10D8D },
+    { 0x10D90, 0x10E5F },
     { 0x10E7F, 0x10E7F },
     { 0x10EAA, 0x10EAA },
     { 0x10EAE, 0x10EAF },
-    { 0x10EB2, 0x10EFC },
+    { 0x10EB2, 0x10EC1 },
+    { 0x10EC5, 0x10EFB },
     { 0x10F28, 0x10F2F },
     { 0x10F5A, 0x10F6F },
     { 0x10F8A, 0x10FAF },
@@ -484,7 +488,18 @@
     { 0x11358, 0x1135C },
     { 0x11364, 0x11365 },
     { 0x1136D, 0x1136F },
-    { 0x11375, 0x113FF },
+    { 0x11375, 0x1137F },
+    { 0x1138A, 0x1138A },
+    { 0x1138C, 0x1138D },
+    { 0x1138F, 0x1138F },
+    { 0x113B6, 0x113B6 },
+    { 0x113C1, 0x113C1 },
+    { 0x113C3, 0x113C4 },
+    { 0x113C6, 0x113C6 },
+    { 0x113CB, 0x113CB },
+    { 0x113D6, 0x113D6 },
+    { 0x113D9, 0x113E0 },
+    { 0x113E3, 0x113FF },
     { 0x1145C, 0x1145C },
     { 0x11462, 0x1147F },
     { 0x114C8, 0x114CF },
@@ -495,7 +510,8 @@
     { 0x1165A, 0x1165F },
     { 0x1166D, 0x1167F },
     { 0x116BA, 0x116BF },
-    { 0x116CA, 0x116FF },
+    { 0x116CA, 0x116CF },
+    { 0x116E4, 0x116FF },
     { 0x1171B, 0x1171C },
     { 0x1172C, 0x1172F },
     { 0x11747, 0x117FF },
@@ -515,7 +531,9 @@
     { 0x11A48, 0x11A4F },
     { 0x11AA3, 0x11AAF },
     { 0x11AF9, 0x11AFF },
-    { 0x11B0A, 0x11BFF },
+    { 0x11B0A, 0x11BBF },
+    { 0x11BE2, 0x11BEF },
+    { 0x11BFA, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
     { 0x11C46, 0x11C4F },
@@ -539,7 +557,7 @@
     { 0x11EF9, 0x11EFF },
     { 0x11F11, 0x11F11 },
     { 0x11F3B, 0x11F3D },
-    { 0x11F5A, 0x11FAF },
+    { 0x11F5B, 0x11FAF },
     { 0x11FB1, 0x11FBF },
     { 0x11FF2, 0x11FFE },
     { 0x1239A, 0x123FF },
@@ -548,8 +566,10 @@
     { 0x12544, 0x12F8F },
     { 0x12FF3, 0x12FFF },
     { 0x13430, 0x1343F },
-    { 0x13456, 0x143FF },
-    { 0x14647, 0x167FF },
+    { 0x13456, 0x1345F },
+    { 0x143FB, 0x143FF },
+    { 0x14647, 0x160FF },
+    { 0x1613A, 0x167FF },
     { 0x16A39, 0x16A3F },
     { 0x16A5F, 0x16A5F },
     { 0x16A6A, 0x16A6D },
@@ -561,7 +581,8 @@
     { 0x16B5A, 0x16B5A },
     { 0x16B62, 0x16B62 },
     { 0x16B78, 0x16B7C },
-    { 0x16B90, 0x16E3F },
+    { 0x16B90, 0x16D3F },
+    { 0x16D7A, 0x16E3F },
     { 0x16E9B, 0x16EFF },
     { 0x16F4B, 0x16F4E },
     { 0x16F88, 0x16F8E },
@@ -569,7 +590,7 @@
     { 0x16FE5, 0x16FEF },
     { 0x16FF2, 0x16FFF },
     { 0x187F8, 0x187FF },
-    { 0x18CD6, 0x18CFF },
+    { 0x18CD6, 0x18CFE },
     { 0x18D09, 0x1AFEF },
     { 0x1AFF4, 0x1AFF4 },
     { 0x1AFFC, 0x1AFFC },
@@ -584,7 +605,9 @@
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
     { 0x1BC9A, 0x1BC9B },
-    { 0x1BCA0, 0x1CEFF },
+    { 0x1BCA0, 0x1CBFF },
+    { 0x1CCFA, 0x1CCFF },
+    { 0x1CEB4, 0x1CEFF },
     { 0x1CF2E, 0x1CF2F },
     { 0x1CF47, 0x1CF4F },
     { 0x1CFC4, 0x1CFFF },
@@ -636,7 +659,9 @@
     { 0x1E2AF, 0x1E2BF },
     { 0x1E2FA, 0x1E2FE },
     { 0x1E300, 0x1E4CF },
-    { 0x1E4FA, 0x1E7DF },
+    { 0x1E4FA, 0x1E5CF },
+    { 0x1E5FB, 0x1E5FE },
+    { 0x1E600, 0x1E7DF },
     { 0x1E7E7, 0x1E7E7 },
     { 0x1E7EC, 0x1E7EC },
     { 0x1E7EF, 0x1E7EF },
@@ -706,18 +731,17 @@
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
     { 0x1F8AE, 0x1F8AF },
-    { 0x1F8B2, 0x1F8FF },
+    { 0x1F8BC, 0x1F8BF },
+    { 0x1F8C2, 0x1F8FF },
     { 0x1FA54, 0x1FA5F },
     { 0x1FA6E, 0x1FA6F },
     { 0x1FA7D, 0x1FA7F },
-    { 0x1FA89, 0x1FA8F },
-    { 0x1FABE, 0x1FABE },
-    { 0x1FAC6, 0x1FACD },
-    { 0x1FADC, 0x1FADF },
-    { 0x1FAE9, 0x1FAEF },
+    { 0x1FA8A, 0x1FA8E },
+    { 0x1FAC7, 0x1FACD },
+    { 0x1FADD, 0x1FADE },
+    { 0x1FAEA, 0x1FAEF },
     { 0x1FAF9, 0x1FAFF },
     { 0x1FB93, 0x1FB93 },
-    { 0x1FBCB, 0x1FBEF },
     { 0x1FBFA, 0x1FFFF },
     { 0x2A6E0, 0x2A6FF },
     { 0x2B73A, 0x2B73F },
diff --git a/tests/unictype/test-categ_Cn.c b/tests/unictype/test-categ_Cn.c
index c12c0816..a0129b46 100644
--- a/tests/unictype/test-categ_Cn.c
+++ b/tests/unictype/test-categ_Cn.c
@@ -39,7 +39,7 @@
     { 0x085F, 0x085F },
     { 0x086B, 0x086F },
     { 0x088F, 0x088F },
-    { 0x0892, 0x0897 },
+    { 0x0892, 0x0896 },
     { 0x0984, 0x0984 },
     { 0x098D, 0x098E },
     { 0x0991, 0x0992 },
@@ -231,12 +231,11 @@
     { 0x1A9A, 0x1A9F },
     { 0x1AAE, 0x1AAF },
     { 0x1ACF, 0x1AFF },
-    { 0x1B4D, 0x1B4F },
-    { 0x1B7F, 0x1B7F },
+    { 0x1B4D, 0x1B4D },
     { 0x1BF4, 0x1BFB },
     { 0x1C38, 0x1C3A },
     { 0x1C4A, 0x1C4C },
-    { 0x1C89, 0x1C8F },
+    { 0x1C8B, 0x1C8F },
     { 0x1CBB, 0x1CBC },
     { 0x1CC8, 0x1CCF },
     { 0x1CFB, 0x1CFF },
@@ -263,7 +262,7 @@
     { 0x20C1, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x2427, 0x243F },
+    { 0x242A, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B96 },
@@ -291,16 +290,16 @@
     { 0x3100, 0x3104 },
     { 0x3130, 0x3130 },
     { 0x318F, 0x318F },
-    { 0x31E4, 0x31EE },
+    { 0x31E6, 0x31EE },
     { 0x321F, 0x321F },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
     { 0xA6F8, 0xA6FF },
-    { 0xA7CB, 0xA7CF },
+    { 0xA7CE, 0xA7CF },
     { 0xA7D2, 0xA7D2 },
     { 0xA7D4, 0xA7D4 },
-    { 0xA7DA, 0xA7F1 },
+    { 0xA7DD, 0xA7F1 },
     { 0xA82D, 0xA82F },
     { 0xA83A, 0xA83F },
     { 0xA878, 0xA87F },
@@ -390,7 +389,8 @@
     { 0x105A2, 0x105A2 },
     { 0x105B2, 0x105B2 },
     { 0x105BA, 0x105BA },
-    { 0x105BD, 0x105FF },
+    { 0x105BD, 0x105BF },
+    { 0x105F4, 0x105FF },
     { 0x10737, 0x1073F },
     { 0x10756, 0x1075F },
     { 0x10768, 0x1077F },
@@ -433,11 +433,15 @@
     { 0x10CB3, 0x10CBF },
     { 0x10CF3, 0x10CF9 },
     { 0x10D28, 0x10D2F },
-    { 0x10D3A, 0x10E5F },
+    { 0x10D3A, 0x10D3F },
+    { 0x10D66, 0x10D68 },
+    { 0x10D86, 0x10D8D },
+    { 0x10D90, 0x10E5F },
     { 0x10E7F, 0x10E7F },
     { 0x10EAA, 0x10EAA },
     { 0x10EAE, 0x10EAF },
-    { 0x10EB2, 0x10EFC },
+    { 0x10EB2, 0x10EC1 },
+    { 0x10EC5, 0x10EFB },
     { 0x10F28, 0x10F2F },
     { 0x10F5A, 0x10F6F },
     { 0x10F8A, 0x10FAF },
@@ -477,7 +481,18 @@
     { 0x11358, 0x1135C },
     { 0x11364, 0x11365 },
     { 0x1136D, 0x1136F },
-    { 0x11375, 0x113FF },
+    { 0x11375, 0x1137F },
+    { 0x1138A, 0x1138A },
+    { 0x1138C, 0x1138D },
+    { 0x1138F, 0x1138F },
+    { 0x113B6, 0x113B6 },
+    { 0x113C1, 0x113C1 },
+    { 0x113C3, 0x113C4 },
+    { 0x113C6, 0x113C6 },
+    { 0x113CB, 0x113CB },
+    { 0x113D6, 0x113D6 },
+    { 0x113D9, 0x113E0 },
+    { 0x113E3, 0x113FF },
     { 0x1145C, 0x1145C },
     { 0x11462, 0x1147F },
     { 0x114C8, 0x114CF },
@@ -488,7 +503,8 @@
     { 0x1165A, 0x1165F },
     { 0x1166D, 0x1167F },
     { 0x116BA, 0x116BF },
-    { 0x116CA, 0x116FF },
+    { 0x116CA, 0x116CF },
+    { 0x116E4, 0x116FF },
     { 0x1171B, 0x1171C },
     { 0x1172C, 0x1172F },
     { 0x11747, 0x117FF },
@@ -508,7 +524,9 @@
     { 0x11A48, 0x11A4F },
     { 0x11AA3, 0x11AAF },
     { 0x11AF9, 0x11AFF },
-    { 0x11B0A, 0x11BFF },
+    { 0x11B0A, 0x11BBF },
+    { 0x11BE2, 0x11BEF },
+    { 0x11BFA, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
     { 0x11C46, 0x11C4F },
@@ -532,7 +550,7 @@
     { 0x11EF9, 0x11EFF },
     { 0x11F11, 0x11F11 },
     { 0x11F3B, 0x11F3D },
-    { 0x11F5A, 0x11FAF },
+    { 0x11F5B, 0x11FAF },
     { 0x11FB1, 0x11FBF },
     { 0x11FF2, 0x11FFE },
     { 0x1239A, 0x123FF },
@@ -540,8 +558,10 @@
     { 0x12475, 0x1247F },
     { 0x12544, 0x12F8F },
     { 0x12FF3, 0x12FFF },
-    { 0x13456, 0x143FF },
-    { 0x14647, 0x167FF },
+    { 0x13456, 0x1345F },
+    { 0x143FB, 0x143FF },
+    { 0x14647, 0x160FF },
+    { 0x1613A, 0x167FF },
     { 0x16A39, 0x16A3F },
     { 0x16A5F, 0x16A5F },
     { 0x16A6A, 0x16A6D },
@@ -553,7 +573,8 @@
     { 0x16B5A, 0x16B5A },
     { 0x16B62, 0x16B62 },
     { 0x16B78, 0x16B7C },
-    { 0x16B90, 0x16E3F },
+    { 0x16B90, 0x16D3F },
+    { 0x16D7A, 0x16E3F },
     { 0x16E9B, 0x16EFF },
     { 0x16F4B, 0x16F4E },
     { 0x16F88, 0x16F8E },
@@ -561,7 +582,7 @@
     { 0x16FE5, 0x16FEF },
     { 0x16FF2, 0x16FFF },
     { 0x187F8, 0x187FF },
-    { 0x18CD6, 0x18CFF },
+    { 0x18CD6, 0x18CFE },
     { 0x18D09, 0x1AFEF },
     { 0x1AFF4, 0x1AFF4 },
     { 0x1AFFC, 0x1AFFC },
@@ -576,7 +597,9 @@
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
     { 0x1BC9A, 0x1BC9B },
-    { 0x1BCA4, 0x1CEFF },
+    { 0x1BCA4, 0x1CBFF },
+    { 0x1CCFA, 0x1CCFF },
+    { 0x1CEB4, 0x1CEFF },
     { 0x1CF2E, 0x1CF2F },
     { 0x1CF47, 0x1CF4F },
     { 0x1CFC4, 0x1CFFF },
@@ -627,7 +650,9 @@
     { 0x1E2AF, 0x1E2BF },
     { 0x1E2FA, 0x1E2FE },
     { 0x1E300, 0x1E4CF },
-    { 0x1E4FA, 0x1E7DF },
+    { 0x1E4FA, 0x1E5CF },
+    { 0x1E5FB, 0x1E5FE },
+    { 0x1E600, 0x1E7DF },
     { 0x1E7E7, 0x1E7E7 },
     { 0x1E7EC, 0x1E7EC },
     { 0x1E7EF, 0x1E7EF },
@@ -697,18 +722,17 @@
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
     { 0x1F8AE, 0x1F8AF },
-    { 0x1F8B2, 0x1F8FF },
+    { 0x1F8BC, 0x1F8BF },
+    { 0x1F8C2, 0x1F8FF },
     { 0x1FA54, 0x1FA5F },
     { 0x1FA6E, 0x1FA6F },
     { 0x1FA7D, 0x1FA7F },
-    { 0x1FA89, 0x1FA8F },
-    { 0x1FABE, 0x1FABE },
-    { 0x1FAC6, 0x1FACD },
-    { 0x1FADC, 0x1FADF },
-    { 0x1FAE9, 0x1FAEF },
+    { 0x1FA8A, 0x1FA8E },
+    { 0x1FAC7, 0x1FACD },
+    { 0x1FADD, 0x1FADE },
+    { 0x1FAEA, 0x1FAEF },
     { 0x1FAF9, 0x1FAFF },
     { 0x1FB93, 0x1FB93 },
-    { 0x1FBCB, 0x1FBEF },
     { 0x1FBFA, 0x1FFFF },
     { 0x2A6E0, 0x2A6FF },
     { 0x2B73A, 0x2B73F },
diff --git a/tests/unictype/test-categ_L.c b/tests/unictype/test-categ_L.c
index 2e9b7be4..1d4b2a03 100644
--- a/tests/unictype/test-categ_L.c
+++ b/tests/unictype/test-categ_L.c
@@ -242,7 +242,7 @@
     { 0x1C00, 0x1C23 },
     { 0x1C4D, 0x1C4F },
     { 0x1C5A, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -326,10 +326,10 @@
     { 0xA6A0, 0xA6E5 },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -426,6 +426,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -462,8 +463,11 @@
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D23 },
+    { 0x10D4A, 0x10D65 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -502,6 +506,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x1145F, 0x11461 },
@@ -536,6 +547,7 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -558,7 +570,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A70, 0x16ABE },
@@ -567,6 +581,7 @@
     { 0x16B40, 0x16B43 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
@@ -575,7 +590,7 @@
     { 0x16FE3, 0x16FE3 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -628,6 +643,8 @@
     { 0x1E290, 0x1E2AD },
     { 0x1E2C0, 0x1E2EB },
     { 0x1E4D0, 0x1E4EB },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5F0 },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-categ_LC.c b/tests/unictype/test-categ_LC.c
index 16e61763..6fbbaa31 100644
--- a/tests/unictype/test-categ_LC.c
+++ b/tests/unictype/test-categ_LC.c
@@ -46,7 +46,7 @@
     { 0x10FD, 0x10FF },
     { 0x13A0, 0x13F5 },
     { 0x13F8, 0x13FD },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1D00, 0x1D2B },
@@ -98,10 +98,10 @@
     { 0xA722, 0xA76F },
     { 0xA771, 0xA787 },
     { 0xA78B, 0xA78E },
-    { 0xA790, 0xA7CA },
+    { 0xA790, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F5, 0xA7F6 },
     { 0xA7FA, 0xA7FA },
     { 0xAB30, 0xAB5A },
@@ -124,6 +124,8 @@
     { 0x105BB, 0x105BC },
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D50, 0x10D65 },
+    { 0x10D70, 0x10D85 },
     { 0x118A0, 0x118DF },
     { 0x16E40, 0x16E7F },
     { 0x1D400, 0x1D454 },
diff --git a/tests/unictype/test-categ_Ll.c b/tests/unictype/test-categ_Ll.c
index c3d12127..e3619660 100644
--- a/tests/unictype/test-categ_Ll.c
+++ b/tests/unictype/test-categ_Ll.c
@@ -291,6 +291,7 @@
     { 0x10FD, 0x10FF },
     { 0x13F8, 0x13FD },
     { 0x1C80, 0x1C88 },
+    { 0x1C8A, 0x1C8A },
     { 0x1D00, 0x1D2B },
     { 0x1D6B, 0x1D77 },
     { 0x1D79, 0x1D9A },
@@ -621,11 +622,13 @@
     { 0xA7C3, 0xA7C3 },
     { 0xA7C8, 0xA7C8 },
     { 0xA7CA, 0xA7CA },
+    { 0xA7CD, 0xA7CD },
     { 0xA7D1, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
     { 0xA7D5, 0xA7D5 },
     { 0xA7D7, 0xA7D7 },
     { 0xA7D9, 0xA7D9 },
+    { 0xA7DB, 0xA7DB },
     { 0xA7F6, 0xA7F6 },
     { 0xA7FA, 0xA7FA },
     { 0xAB30, 0xAB5A },
@@ -641,6 +644,7 @@
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D70, 0x10D85 },
     { 0x118C0, 0x118DF },
     { 0x16E60, 0x16E7F },
     { 0x1D41A, 0x1D433 },
diff --git a/tests/unictype/test-categ_Lm.c b/tests/unictype/test-categ_Lm.c
index 06464574..4bbd53e4 100644
--- a/tests/unictype/test-categ_Lm.c
+++ b/tests/unictype/test-categ_Lm.c
@@ -77,7 +77,11 @@
     { 0x10780, 0x10785 },
     { 0x10787, 0x107B0 },
     { 0x107B2, 0x107BA },
+    { 0x10D4E, 0x10D4E },
+    { 0x10D6F, 0x10D6F },
     { 0x16B40, 0x16B43 },
+    { 0x16D40, 0x16D42 },
+    { 0x16D6B, 0x16D6C },
     { 0x16F93, 0x16F9F },
     { 0x16FE0, 0x16FE1 },
     { 0x16FE3, 0x16FE3 },
diff --git a/tests/unictype/test-categ_Lo.c b/tests/unictype/test-categ_Lo.c
index e778c7c6..15db48c9 100644
--- a/tests/unictype/test-categ_Lo.c
+++ b/tests/unictype/test-categ_Lo.c
@@ -326,6 +326,7 @@
     { 0x10450, 0x1049D },
     { 0x10500, 0x10527 },
     { 0x10530, 0x10563 },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -357,8 +358,11 @@
     { 0x10B80, 0x10B91 },
     { 0x10C00, 0x10C48 },
     { 0x10D00, 0x10D23 },
+    { 0x10D4A, 0x10D4D },
+    { 0x10D4F, 0x10D4F },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -397,6 +401,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x1145F, 0x11461 },
@@ -430,6 +441,7 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -452,7 +464,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A70, 0x16ABE },
@@ -460,11 +474,12 @@
     { 0x16B00, 0x16B2F },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D43, 0x16D6A },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1B000, 0x1B122 },
     { 0x1B132, 0x1B132 },
     { 0x1B150, 0x1B152 },
@@ -481,6 +496,8 @@
     { 0x1E290, 0x1E2AD },
     { 0x1E2C0, 0x1E2EB },
     { 0x1E4D0, 0x1E4EA },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5F0 },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-categ_Lu.c b/tests/unictype/test-categ_Lu.c
index 89bb6575..bed32a37 100644
--- a/tests/unictype/test-categ_Lu.c
+++ b/tests/unictype/test-categ_Lu.c
@@ -293,6 +293,7 @@
     { 0x10C7, 0x10C7 },
     { 0x10CD, 0x10CD },
     { 0x13A0, 0x13F5 },
+    { 0x1C89, 0x1C89 },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1E00, 0x1E00 },
@@ -617,9 +618,12 @@
     { 0xA7C2, 0xA7C2 },
     { 0xA7C4, 0xA7C7 },
     { 0xA7C9, 0xA7C9 },
+    { 0xA7CB, 0xA7CC },
     { 0xA7D0, 0xA7D0 },
     { 0xA7D6, 0xA7D6 },
     { 0xA7D8, 0xA7D8 },
+    { 0xA7DA, 0xA7DA },
+    { 0xA7DC, 0xA7DC },
     { 0xA7F5, 0xA7F5 },
     { 0xFF21, 0xFF3A },
     { 0x10400, 0x10427 },
@@ -629,6 +633,7 @@
     { 0x1058C, 0x10592 },
     { 0x10594, 0x10595 },
     { 0x10C80, 0x10CB2 },
+    { 0x10D50, 0x10D65 },
     { 0x118A0, 0x118BF },
     { 0x16E40, 0x16E5F },
     { 0x1D400, 0x1D419 },
diff --git a/tests/unictype/test-categ_M.c b/tests/unictype/test-categ_M.c
index 4b2c4f85..662185e2 100644
--- a/tests/unictype/test-categ_M.c
+++ b/tests/unictype/test-categ_M.c
@@ -41,7 +41,7 @@
     { 0x0825, 0x0827 },
     { 0x0829, 0x082D },
     { 0x0859, 0x085B },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x08E1 },
     { 0x08E3, 0x0903 },
     { 0x093A, 0x093C },
@@ -217,8 +217,9 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6D },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11000, 0x11002 },
@@ -249,6 +250,13 @@
     { 0x11362, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113B8, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11435, 0x11446 },
     { 0x1145E, 0x1145E },
     { 0x114B0, 0x114C3 },
@@ -290,8 +298,10 @@
     { 0x11F03, 0x11F03 },
     { 0x11F34, 0x11F3A },
     { 0x11F3E, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13440, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F4F, 0x16F4F },
@@ -324,6 +334,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0xE0100, 0xE01EF }
diff --git a/tests/unictype/test-categ_Mc.c b/tests/unictype/test-categ_Mc.c
index bfa9ce15..da4416bd 100644
--- a/tests/unictype/test-categ_Mc.c
+++ b/tests/unictype/test-categ_Mc.c
@@ -151,6 +151,12 @@
     { 0x1134B, 0x1134D },
     { 0x11357, 0x11357 },
     { 0x11362, 0x11363 },
+    { 0x113B8, 0x113BA },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113CD },
+    { 0x113CF, 0x113CF },
     { 0x11435, 0x11437 },
     { 0x11440, 0x11441 },
     { 0x11445, 0x11445 },
@@ -167,6 +173,7 @@
     { 0x116AC, 0x116AC },
     { 0x116AE, 0x116AF },
     { 0x116B6, 0x116B6 },
+    { 0x1171E, 0x1171E },
     { 0x11720, 0x11721 },
     { 0x11726, 0x11726 },
     { 0x1182C, 0x1182E },
@@ -195,6 +202,7 @@
     { 0x11F34, 0x11F35 },
     { 0x11F3E, 0x11F3F },
     { 0x11F41, 0x11F41 },
+    { 0x1612A, 0x1612C },
     { 0x16F51, 0x16F87 },
     { 0x16FF0, 0x16FF1 },
     { 0x1D165, 0x1D166 },
diff --git a/tests/unictype/test-categ_Mn.c b/tests/unictype/test-categ_Mn.c
index ee067b33..288f2785 100644
--- a/tests/unictype/test-categ_Mn.c
+++ b/tests/unictype/test-categ_Mn.c
@@ -41,7 +41,7 @@
     { 0x0825, 0x0827 },
     { 0x0829, 0x082D },
     { 0x0859, 0x085B },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x08E1 },
     { 0x08E3, 0x0902 },
     { 0x093A, 0x093A },
@@ -239,8 +239,9 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6D },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11001, 0x11001 },
@@ -271,6 +272,11 @@
     { 0x11340, 0x11340 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113BB, 0x113C0 },
+    { 0x113CE, 0x113CE },
+    { 0x113D0, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11438, 0x1143F },
     { 0x11442, 0x11444 },
     { 0x11446, 0x11446 },
@@ -290,7 +296,8 @@
     { 0x116AD, 0x116AD },
     { 0x116B0, 0x116B5 },
     { 0x116B7, 0x116B7 },
-    { 0x1171D, 0x1171F },
+    { 0x1171D, 0x1171D },
+    { 0x1171F, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
     { 0x1182F, 0x11837 },
@@ -329,8 +336,11 @@
     { 0x11F36, 0x11F3A },
     { 0x11F40, 0x11F40 },
     { 0x11F42, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13440, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x16129 },
+    { 0x1612D, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F4F, 0x16F4F },
@@ -360,6 +370,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0xE0100, 0xE01EF }
diff --git a/tests/unictype/test-categ_N.c b/tests/unictype/test-categ_N.c
index f7ee20ae..bb9dc17e 100644
--- a/tests/unictype/test-categ_N.c
+++ b/tests/unictype/test-categ_N.c
@@ -110,6 +110,7 @@
     { 0x10BA9, 0x10BAF },
     { 0x10CFA, 0x10CFF },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D49 },
     { 0x10E60, 0x10E7E },
     { 0x10F1D, 0x10F26 },
     { 0x10F51, 0x10F54 },
@@ -124,20 +125,25 @@
     { 0x114D0, 0x114D9 },
     { 0x11650, 0x11659 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11730, 0x1173B },
     { 0x118E0, 0x118F2 },
     { 0x11950, 0x11959 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C50, 0x11C6C },
     { 0x11D50, 0x11D59 },
     { 0x11DA0, 0x11DA9 },
     { 0x11F50, 0x11F59 },
     { 0x11FC0, 0x11FD4 },
     { 0x12400, 0x1246E },
+    { 0x16130, 0x16139 },
     { 0x16A60, 0x16A69 },
     { 0x16AC0, 0x16AC9 },
     { 0x16B50, 0x16B59 },
     { 0x16B5B, 0x16B61 },
+    { 0x16D70, 0x16D79 },
     { 0x16E80, 0x16E96 },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1D2C0, 0x1D2D3 },
     { 0x1D2E0, 0x1D2F3 },
     { 0x1D360, 0x1D378 },
@@ -145,6 +151,7 @@
     { 0x1E140, 0x1E149 },
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5F1, 0x1E5FA },
     { 0x1E8C7, 0x1E8CF },
     { 0x1E950, 0x1E959 },
     { 0x1EC71, 0x1ECAB },
diff --git a/tests/unictype/test-categ_Nd.c b/tests/unictype/test-categ_Nd.c
index 032ab3eb..b142147b 100644
--- a/tests/unictype/test-categ_Nd.c
+++ b/tests/unictype/test-categ_Nd.c
@@ -56,6 +56,7 @@
     { 0xFF10, 0xFF19 },
     { 0x104A0, 0x104A9 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D49 },
     { 0x11066, 0x1106F },
     { 0x110F0, 0x110F9 },
     { 0x11136, 0x1113F },
@@ -65,20 +66,26 @@
     { 0x114D0, 0x114D9 },
     { 0x11650, 0x11659 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11730, 0x11739 },
     { 0x118E0, 0x118E9 },
     { 0x11950, 0x11959 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C50, 0x11C59 },
     { 0x11D50, 0x11D59 },
     { 0x11DA0, 0x11DA9 },
     { 0x11F50, 0x11F59 },
+    { 0x16130, 0x16139 },
     { 0x16A60, 0x16A69 },
     { 0x16AC0, 0x16AC9 },
     { 0x16B50, 0x16B59 },
+    { 0x16D70, 0x16D79 },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1D7CE, 0x1D7FF },
     { 0x1E140, 0x1E149 },
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5F1, 0x1E5FA },
     { 0x1E950, 0x1E959 },
     { 0x1FBF0, 0x1FBF9 }
 
diff --git a/tests/unictype/test-categ_P.c b/tests/unictype/test-categ_P.c
index c2a2a92f..6bb56e53 100644
--- a/tests/unictype/test-categ_P.c
+++ b/tests/unictype/test-categ_P.c
@@ -82,8 +82,9 @@
     { 0x1A1E, 0x1A1F },
     { 0x1AA0, 0x1AA6 },
     { 0x1AA8, 0x1AAD },
+    { 0x1B4E, 0x1B4F },
     { 0x1B5A, 0x1B60 },
-    { 0x1B7D, 0x1B7E },
+    { 0x1B7D, 0x1B7F },
     { 0x1BFC, 0x1BFF },
     { 0x1C3B, 0x1C3F },
     { 0x1C7E, 0x1C7F },
@@ -162,6 +163,7 @@
     { 0x10AF0, 0x10AF6 },
     { 0x10B39, 0x10B3F },
     { 0x10B99, 0x10B9C },
+    { 0x10D6E, 0x10D6E },
     { 0x10EAD, 0x10EAD },
     { 0x10F55, 0x10F59 },
     { 0x10F86, 0x10F89 },
@@ -176,6 +178,8 @@
     { 0x111DD, 0x111DF },
     { 0x11238, 0x1123D },
     { 0x112A9, 0x112A9 },
+    { 0x113D4, 0x113D5 },
+    { 0x113D7, 0x113D8 },
     { 0x1144B, 0x1144F },
     { 0x1145A, 0x1145B },
     { 0x1145D, 0x1145D },
@@ -192,6 +196,7 @@
     { 0x11A9A, 0x11A9C },
     { 0x11A9E, 0x11AA2 },
     { 0x11B00, 0x11B09 },
+    { 0x11BE1, 0x11BE1 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x11EF7, 0x11EF8 },
@@ -203,10 +208,12 @@
     { 0x16AF5, 0x16AF5 },
     { 0x16B37, 0x16B3B },
     { 0x16B44, 0x16B44 },
+    { 0x16D6D, 0x16D6F },
     { 0x16E97, 0x16E9A },
     { 0x16FE2, 0x16FE2 },
     { 0x1BC9F, 0x1BC9F },
     { 0x1DA87, 0x1DA8B },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E95E, 0x1E95F }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_P)
diff --git a/tests/unictype/test-categ_Pd.c b/tests/unictype/test-categ_Pd.c
index 28f2b27d..d0e5d9ae 100644
--- a/tests/unictype/test-categ_Pd.c
+++ b/tests/unictype/test-categ_Pd.c
@@ -35,6 +35,7 @@
     { 0xFE58, 0xFE58 },
     { 0xFE63, 0xFE63 },
     { 0xFF0D, 0xFF0D },
+    { 0x10D6E, 0x10D6E },
     { 0x10EAD, 0x10EAD }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pd)
diff --git a/tests/unictype/test-categ_Po.c b/tests/unictype/test-categ_Po.c
index 27389e40..dbcd28c7 100644
--- a/tests/unictype/test-categ_Po.c
+++ b/tests/unictype/test-categ_Po.c
@@ -76,8 +76,9 @@
     { 0x1A1E, 0x1A1F },
     { 0x1AA0, 0x1AA6 },
     { 0x1AA8, 0x1AAD },
+    { 0x1B4E, 0x1B4F },
     { 0x1B5A, 0x1B60 },
-    { 0x1B7D, 0x1B7E },
+    { 0x1B7D, 0x1B7F },
     { 0x1BFC, 0x1BFF },
     { 0x1C3B, 0x1C3F },
     { 0x1C7E, 0x1C7F },
@@ -172,6 +173,8 @@
     { 0x111DD, 0x111DF },
     { 0x11238, 0x1123D },
     { 0x112A9, 0x112A9 },
+    { 0x113D4, 0x113D5 },
+    { 0x113D7, 0x113D8 },
     { 0x1144B, 0x1144F },
     { 0x1145A, 0x1145B },
     { 0x1145D, 0x1145D },
@@ -188,6 +191,7 @@
     { 0x11A9A, 0x11A9C },
     { 0x11A9E, 0x11AA2 },
     { 0x11B00, 0x11B09 },
+    { 0x11BE1, 0x11BE1 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x11EF7, 0x11EF8 },
@@ -199,10 +203,12 @@
     { 0x16AF5, 0x16AF5 },
     { 0x16B37, 0x16B3B },
     { 0x16B44, 0x16B44 },
+    { 0x16D6D, 0x16D6F },
     { 0x16E97, 0x16E9A },
     { 0x16FE2, 0x16FE2 },
     { 0x1BC9F, 0x1BC9F },
     { 0x1DA87, 0x1DA8B },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E95E, 0x1E95F }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Po)
diff --git a/tests/unictype/test-categ_S.c b/tests/unictype/test-categ_S.c
index 48863da0..340a8ff0 100644
--- a/tests/unictype/test-categ_S.c
+++ b/tests/unictype/test-categ_S.c
@@ -107,7 +107,7 @@
     { 0x218A, 0x218B },
     { 0x2190, 0x2307 },
     { 0x230C, 0x2328 },
-    { 0x232B, 0x2426 },
+    { 0x232B, 0x2429 },
     { 0x2440, 0x244A },
     { 0x249C, 0x24E9 },
     { 0x2500, 0x2767 },
@@ -133,7 +133,7 @@
     { 0x309B, 0x309C },
     { 0x3190, 0x3191 },
     { 0x3196, 0x319F },
-    { 0x31C0, 0x31E3 },
+    { 0x31C0, 0x31E5 },
     { 0x31EF, 0x31EF },
     { 0x3200, 0x321E },
     { 0x322A, 0x3247 },
@@ -177,11 +177,14 @@
     { 0x101D0, 0x101FC },
     { 0x10877, 0x10878 },
     { 0x10AC8, 0x10AC8 },
+    { 0x10D8E, 0x10D8F },
     { 0x1173F, 0x1173F },
     { 0x11FD5, 0x11FF1 },
     { 0x16B3C, 0x16B3F },
     { 0x16B45, 0x16B45 },
     { 0x1BC9C, 0x1BC9C },
+    { 0x1CC00, 0x1CCEF },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF50, 0x1CFC3 },
     { 0x1D000, 0x1D0F5 },
     { 0x1D100, 0x1D126 },
@@ -238,18 +241,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA }
+    { 0x1FB94, 0x1FBEF }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_S)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-categ_Sm.c b/tests/unictype/test-categ_Sm.c
index ae3d01c3..352da9e4 100644
--- a/tests/unictype/test-categ_Sm.c
+++ b/tests/unictype/test-categ_Sm.c
@@ -70,6 +70,7 @@
     { 0xFF5E, 0xFF5E },
     { 0xFFE2, 0xFFE2 },
     { 0xFFE9, 0xFFEC },
+    { 0x10D8E, 0x10D8F },
     { 0x1D6C1, 0x1D6C1 },
     { 0x1D6DB, 0x1D6DB },
     { 0x1D6FB, 0x1D6FB },
diff --git a/tests/unictype/test-categ_So.c b/tests/unictype/test-categ_So.c
index 98f774f7..874e9cb4 100644
--- a/tests/unictype/test-categ_So.c
+++ b/tests/unictype/test-categ_So.c
@@ -83,7 +83,7 @@
     { 0x232B, 0x237B },
     { 0x237D, 0x239A },
     { 0x23B4, 0x23DB },
-    { 0x23E2, 0x2426 },
+    { 0x23E2, 0x2429 },
     { 0x2440, 0x244A },
     { 0x249C, 0x24E9 },
     { 0x2500, 0x25B6 },
@@ -111,7 +111,7 @@
     { 0x303E, 0x303F },
     { 0x3190, 0x3191 },
     { 0x3196, 0x319F },
-    { 0x31C0, 0x31E3 },
+    { 0x31C0, 0x31E5 },
     { 0x31EF, 0x31EF },
     { 0x3200, 0x321E },
     { 0x322A, 0x3247 },
@@ -146,6 +146,8 @@
     { 0x16B3C, 0x16B3F },
     { 0x16B45, 0x16B45 },
     { 0x1BC9C, 0x1BC9C },
+    { 0x1CC00, 0x1CCEF },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF50, 0x1CFC3 },
     { 0x1D000, 0x1D0F5 },
     { 0x1D100, 0x1D126 },
@@ -190,18 +192,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA }
+    { 0x1FB94, 0x1FBEF }
 
 #define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_So)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-categ_and.c b/tests/unictype/test-categ_and.c
index e2ded585..745b64cb 100644
--- a/tests/unictype/test-categ_and.c
+++ b/tests/unictype/test-categ_and.c
@@ -35,5 +35,5 @@ main ()
   ASSERT (uc_is_general_category ('7', ct));
   ASSERT (!uc_is_general_category (0x00B2, ct));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_and_not.c b/tests/unictype/test-categ_and_not.c
index 07420d53..d2b61434 100644
--- a/tests/unictype/test-categ_and_not.c
+++ b/tests/unictype/test-categ_and_not.c
@@ -56,5 +56,5 @@ main ()
     ASSERT (uc_is_general_category (0x00B2, ct));
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_byname.c b/tests/unictype/test-categ_byname.c
index 8cf94f4a..68cee1b6 100644
--- a/tests/unictype/test-categ_byname.c
+++ b/tests/unictype/test-categ_byname.c
@@ -234,5 +234,5 @@ main ()
       ASSERT (!uc_is_general_category (c, ct));
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_longname.c b/tests/unictype/test-categ_longname.c
index 9c725486..101e7ac5 100644
--- a/tests/unictype/test-categ_longname.c
+++ b/tests/unictype/test-categ_longname.c
@@ -29,5 +29,5 @@ main ()
   ASSERT (strcmp (uc_general_category_long_name (UC_CATEGORY_Nl), "Letter Number") == 0);
   ASSERT (uc_general_category_long_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_name.c b/tests/unictype/test-categ_name.c
index f8f4889e..c77e6866 100644
--- a/tests/unictype/test-categ_name.c
+++ b/tests/unictype/test-categ_name.c
@@ -29,5 +29,5 @@ main ()
   ASSERT (strcmp (uc_general_category_name (UC_CATEGORY_Nl), "Nl") == 0);
   ASSERT (uc_general_category_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_none.c b/tests/unictype/test-categ_none.c
index ae10a439..94032da4 100644
--- a/tests/unictype/test-categ_none.c
+++ b/tests/unictype/test-categ_none.c
@@ -38,5 +38,5 @@ main ()
 
 #endif
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_of.c b/tests/unictype/test-categ_of.c
index 276994eb..f13975c4 100644
--- a/tests/unictype/test-categ_of.c
+++ b/tests/unictype/test-categ_of.c
@@ -51,5 +51,5 @@ main ()
       ASSERT (uc_is_general_category (c, lowercase_letters));
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_or.c b/tests/unictype/test-categ_or.c
index 3ed5d2b0..fbd94a2d 100644
--- a/tests/unictype/test-categ_or.c
+++ b/tests/unictype/test-categ_or.c
@@ -32,5 +32,5 @@ main ()
   ASSERT (uc_is_general_category ('7', ct));
   ASSERT (!uc_is_general_category ('$', ct));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-categ_test_withtable.c b/tests/unictype/test-categ_test_withtable.c
index fbd265a5..f6a3f6fa 100644
--- a/tests/unictype/test-categ_test_withtable.c
+++ b/tests/unictype/test-categ_test_withtable.c
@@ -34,5 +34,5 @@ main ()
   ASSERT (!uc_is_general_category_withtable ('7', ctmask));
   ASSERT (uc_is_general_category_withtable (0x00B2, ctmask));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-combiningclass.c b/tests/unictype/test-combiningclass.c
index 0e71d022..5efca0fa 100644
--- a/tests/unictype/test-combiningclass.c
+++ b/tests/unictype/test-combiningclass.c
@@ -31,5 +31,5 @@ main ()
   ASSERT (uc_combining_class (0x0327) == UC_CCC_ATB);
   ASSERT (uc_combining_class (0x093C) == UC_CCC_NK);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-combiningclass_byname.c b/tests/unictype/test-combiningclass_byname.c
index 895b2ad1..450bc5fb 100644
--- a/tests/unictype/test-combiningclass_byname.c
+++ b/tests/unictype/test-combiningclass_byname.c
@@ -114,5 +114,5 @@ main ()
   ASSERT (uc_combining_class_byname ("Iota_Subscript") == UC_CCC_IS);
   ASSERT (uc_combining_class_byname ("IotaSubscript") == UC_CCC_IS);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-combiningclass_longname.c b/tests/unictype/test-combiningclass_longname.c
index 351467b8..f3909e87 100644
--- a/tests/unictype/test-combiningclass_longname.c
+++ b/tests/unictype/test-combiningclass_longname.c
@@ -49,5 +49,5 @@ main ()
   ASSERT (uc_combining_class_long_name (163) == NULL);
   ASSERT (uc_combining_class_long_name (255) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-combiningclass_name.c b/tests/unictype/test-combiningclass_name.c
index 7ccefbf2..6b116720 100644
--- a/tests/unictype/test-combiningclass_name.c
+++ b/tests/unictype/test-combiningclass_name.c
@@ -49,5 +49,5 @@ main ()
   ASSERT (uc_combining_class_name (163) == NULL);
   ASSERT (uc_combining_class_name (255) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-ctype_alnum.c b/tests/unictype/test-ctype_alnum.c
index f6f9b6b2..9025649e 100644
--- a/tests/unictype/test-ctype_alnum.c
+++ b/tests/unictype/test-ctype_alnum.c
@@ -263,7 +263,7 @@
     { 0x1C00, 0x1C23 },
     { 0x1C40, 0x1C49 },
     { 0x1C4D, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -347,10 +347,10 @@
     { 0xA6A0, 0xA6EF },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -452,6 +452,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -489,8 +490,11 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D23 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -533,6 +537,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x11450, 0x11459 },
@@ -549,6 +560,7 @@
     { 0x11680, 0x116AA },
     { 0x116B8, 0x116B8 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x11730, 0x11739 },
     { 0x11740, 0x11746 },
@@ -573,6 +585,8 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -600,7 +614,10 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
+    { 0x16130, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -612,6 +629,8 @@
     { 0x16B50, 0x16B59 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
+    { 0x16D70, 0x16D79 },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
@@ -620,7 +639,7 @@
     { 0x16FE3, 0x16FE3 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -634,6 +653,7 @@
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
+    { 0x1CCD6, 0x1CCF9 },
     { 0x1D400, 0x1D454 },
     { 0x1D456, 0x1D49C },
     { 0x1D49E, 0x1D49F },
@@ -677,6 +697,8 @@
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4D0, 0x1E4EB },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5FA },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-ctype_alpha.c b/tests/unictype/test-ctype_alpha.c
index cb52a4c1..adcf2670 100644
--- a/tests/unictype/test-ctype_alpha.c
+++ b/tests/unictype/test-ctype_alpha.c
@@ -262,7 +262,7 @@
     { 0x1C00, 0x1C23 },
     { 0x1C40, 0x1C49 },
     { 0x1C4D, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -346,10 +346,10 @@
     { 0xA6A0, 0xA6EF },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -451,6 +451,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -488,8 +489,11 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D23 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -532,6 +536,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x11450, 0x11459 },
@@ -548,6 +559,7 @@
     { 0x11680, 0x116AA },
     { 0x116B8, 0x116B8 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x11730, 0x11739 },
     { 0x11740, 0x11746 },
@@ -572,6 +584,8 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -599,7 +613,10 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
+    { 0x16130, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -611,6 +628,8 @@
     { 0x16B50, 0x16B59 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
+    { 0x16D70, 0x16D79 },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
@@ -619,7 +638,7 @@
     { 0x16FE3, 0x16FE3 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -633,6 +652,7 @@
     { 0x1BC70, 0x1BC7C },
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
+    { 0x1CCD6, 0x1CCF9 },
     { 0x1D400, 0x1D454 },
     { 0x1D456, 0x1D49C },
     { 0x1D49E, 0x1D49F },
@@ -676,6 +696,8 @@
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4D0, 0x1E4EB },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5FA },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-ctype_graph.c b/tests/unictype/test-ctype_graph.c
index bdd12a07..615f951e 100644
--- a/tests/unictype/test-ctype_graph.c
+++ b/tests/unictype/test-ctype_graph.c
@@ -41,7 +41,7 @@
     { 0x0860, 0x086A },
     { 0x0870, 0x088E },
     { 0x0890, 0x0891 },
-    { 0x0898, 0x0983 },
+    { 0x0897, 0x0983 },
     { 0x0985, 0x098C },
     { 0x098F, 0x0990 },
     { 0x0993, 0x09A8 },
@@ -234,11 +234,10 @@
     { 0x1AA0, 0x1AAD },
     { 0x1AB0, 0x1ACE },
     { 0x1B00, 0x1B4C },
-    { 0x1B50, 0x1B7E },
-    { 0x1B80, 0x1BF3 },
+    { 0x1B4E, 0x1BF3 },
     { 0x1BFC, 0x1C37 },
     { 0x1C3B, 0x1C49 },
-    { 0x1C4D, 0x1C88 },
+    { 0x1C4D, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CC7 },
     { 0x1CD0, 0x1CFA },
@@ -268,7 +267,7 @@
     { 0x20A0, 0x20C0 },
     { 0x20D0, 0x20F0 },
     { 0x2100, 0x218B },
-    { 0x2190, 0x2426 },
+    { 0x2190, 0x2429 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
@@ -297,16 +296,16 @@
     { 0x3099, 0x30FF },
     { 0x3105, 0x312F },
     { 0x3131, 0x318E },
-    { 0x3190, 0x31E3 },
+    { 0x3190, 0x31E5 },
     { 0x31EF, 0x321E },
     { 0x3220, 0xA48C },
     { 0xA490, 0xA4C6 },
     { 0xA4D0, 0xA62B },
     { 0xA640, 0xA6F7 },
-    { 0xA700, 0xA7CA },
+    { 0xA700, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA82C },
     { 0xA830, 0xA839 },
     { 0xA840, 0xA877 },
@@ -397,6 +396,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -440,11 +440,15 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10CFA, 0x10D27 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D69, 0x10D85 },
+    { 0x10D8E, 0x10D8F },
     { 0x10E60, 0x10E7E },
     { 0x10E80, 0x10EA9 },
     { 0x10EAB, 0x10EAD },
     { 0x10EB0, 0x10EB1 },
-    { 0x10EFD, 0x10F27 },
+    { 0x10EC2, 0x10EC4 },
+    { 0x10EFC, 0x10F27 },
     { 0x10F30, 0x10F59 },
     { 0x10F70, 0x10F89 },
     { 0x10FB0, 0x10FCB },
@@ -484,6 +488,17 @@
     { 0x1135D, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D5 },
+    { 0x113D7, 0x113D8 },
+    { 0x113E1, 0x113E2 },
     { 0x11400, 0x1145B },
     { 0x1145D, 0x11461 },
     { 0x11480, 0x114C7 },
@@ -495,6 +510,7 @@
     { 0x11660, 0x1166C },
     { 0x11680, 0x116B9 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x1171D, 0x1172B },
     { 0x11730, 0x11746 },
@@ -515,6 +531,8 @@
     { 0x11A50, 0x11AA2 },
     { 0x11AB0, 0x11AF8 },
     { 0x11B00, 0x11B09 },
+    { 0x11BC0, 0x11BE1 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
     { 0x11C38, 0x11C45 },
@@ -538,7 +556,7 @@
     { 0x11EE0, 0x11EF8 },
     { 0x11F00, 0x11F10 },
     { 0x11F12, 0x11F3A },
-    { 0x11F3E, 0x11F59 },
+    { 0x11F3E, 0x11F5A },
     { 0x11FB0, 0x11FB0 },
     { 0x11FC0, 0x11FF1 },
     { 0x11FFF, 0x12399 },
@@ -547,7 +565,9 @@
     { 0x12480, 0x12543 },
     { 0x12F90, 0x12FF2 },
     { 0x13000, 0x13455 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -560,6 +580,7 @@
     { 0x16B5B, 0x16B61 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D79 },
     { 0x16E40, 0x16E9A },
     { 0x16F00, 0x16F4A },
     { 0x16F4F, 0x16F87 },
@@ -568,7 +589,7 @@
     { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -583,6 +604,8 @@
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
     { 0x1BC9C, 0x1BCA3 },
+    { 0x1CC00, 0x1CCF9 },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
     { 0x1CF50, 0x1CFC3 },
@@ -634,6 +657,8 @@
     { 0x1E2C0, 0x1E2F9 },
     { 0x1E2FF, 0x1E2FF },
     { 0x1E4D0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5FA },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
@@ -703,19 +728,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA },
-    { 0x1FBF0, 0x1FBF9 },
+    { 0x1FB94, 0x1FBF9 },
     { 0x20000, 0x2A6DF },
     { 0x2A700, 0x2B739 },
     { 0x2B740, 0x2B81D },
diff --git a/tests/unictype/test-ctype_lower.c b/tests/unictype/test-ctype_lower.c
index 5bc56a9b..4b9d63c8 100644
--- a/tests/unictype/test-ctype_lower.c
+++ b/tests/unictype/test-ctype_lower.c
@@ -89,7 +89,7 @@
     { 0x018C, 0x018C },
     { 0x0192, 0x0192 },
     { 0x0195, 0x0195 },
-    { 0x0199, 0x019A },
+    { 0x0199, 0x019B },
     { 0x019E, 0x019E },
     { 0x01A1, 0x01A1 },
     { 0x01A3, 0x01A3 },
@@ -165,8 +165,7 @@
     { 0x0259, 0x0259 },
     { 0x025B, 0x025C },
     { 0x0260, 0x0261 },
-    { 0x0263, 0x0263 },
-    { 0x0265, 0x0266 },
+    { 0x0263, 0x0266 },
     { 0x0268, 0x026C },
     { 0x026F, 0x026F },
     { 0x0271, 0x0272 },
@@ -306,6 +305,7 @@
     { 0x10FD, 0x10FF },
     { 0x13F8, 0x13FD },
     { 0x1C80, 0x1C88 },
+    { 0x1C8A, 0x1C8A },
     { 0x1D79, 0x1D79 },
     { 0x1D7D, 0x1D7D },
     { 0x1D8E, 0x1D8E },
@@ -627,9 +627,11 @@
     { 0xA7C3, 0xA7C3 },
     { 0xA7C8, 0xA7C8 },
     { 0xA7CA, 0xA7CA },
+    { 0xA7CD, 0xA7CD },
     { 0xA7D1, 0xA7D1 },
     { 0xA7D7, 0xA7D7 },
     { 0xA7D9, 0xA7D9 },
+    { 0xA7DB, 0xA7DB },
     { 0xA7F6, 0xA7F6 },
     { 0xAB53, 0xAB53 },
     { 0xAB70, 0xABBF },
@@ -641,6 +643,7 @@
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D70, 0x10D85 },
     { 0x118C0, 0x118DF },
     { 0x16E60, 0x16E7F },
     { 0x1E922, 0x1E943 }
diff --git a/tests/unictype/test-ctype_print.c b/tests/unictype/test-ctype_print.c
index a7ae3cd9..19eddeb8 100644
--- a/tests/unictype/test-ctype_print.c
+++ b/tests/unictype/test-ctype_print.c
@@ -41,7 +41,7 @@
     { 0x0860, 0x086A },
     { 0x0870, 0x088E },
     { 0x0890, 0x0891 },
-    { 0x0898, 0x0983 },
+    { 0x0897, 0x0983 },
     { 0x0985, 0x098C },
     { 0x098F, 0x0990 },
     { 0x0993, 0x09A8 },
@@ -233,11 +233,10 @@
     { 0x1AA0, 0x1AAD },
     { 0x1AB0, 0x1ACE },
     { 0x1B00, 0x1B4C },
-    { 0x1B50, 0x1B7E },
-    { 0x1B80, 0x1BF3 },
+    { 0x1B4E, 0x1BF3 },
     { 0x1BFC, 0x1C37 },
     { 0x1C3B, 0x1C49 },
-    { 0x1C4D, 0x1C88 },
+    { 0x1C4D, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CC7 },
     { 0x1CD0, 0x1CFA },
@@ -265,7 +264,7 @@
     { 0x20A0, 0x20C0 },
     { 0x20D0, 0x20F0 },
     { 0x2100, 0x218B },
-    { 0x2190, 0x2426 },
+    { 0x2190, 0x2429 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
@@ -293,16 +292,16 @@
     { 0x3099, 0x30FF },
     { 0x3105, 0x312F },
     { 0x3131, 0x318E },
-    { 0x3190, 0x31E3 },
+    { 0x3190, 0x31E5 },
     { 0x31EF, 0x321E },
     { 0x3220, 0xA48C },
     { 0xA490, 0xA4C6 },
     { 0xA4D0, 0xA62B },
     { 0xA640, 0xA6F7 },
-    { 0xA700, 0xA7CA },
+    { 0xA700, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA82C },
     { 0xA830, 0xA839 },
     { 0xA840, 0xA877 },
@@ -393,6 +392,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -436,11 +436,15 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10CFA, 0x10D27 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D69, 0x10D85 },
+    { 0x10D8E, 0x10D8F },
     { 0x10E60, 0x10E7E },
     { 0x10E80, 0x10EA9 },
     { 0x10EAB, 0x10EAD },
     { 0x10EB0, 0x10EB1 },
-    { 0x10EFD, 0x10F27 },
+    { 0x10EC2, 0x10EC4 },
+    { 0x10EFC, 0x10F27 },
     { 0x10F30, 0x10F59 },
     { 0x10F70, 0x10F89 },
     { 0x10FB0, 0x10FCB },
@@ -480,6 +484,17 @@
     { 0x1135D, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D5 },
+    { 0x113D7, 0x113D8 },
+    { 0x113E1, 0x113E2 },
     { 0x11400, 0x1145B },
     { 0x1145D, 0x11461 },
     { 0x11480, 0x114C7 },
@@ -491,6 +506,7 @@
     { 0x11660, 0x1166C },
     { 0x11680, 0x116B9 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x1171D, 0x1172B },
     { 0x11730, 0x11746 },
@@ -511,6 +527,8 @@
     { 0x11A50, 0x11AA2 },
     { 0x11AB0, 0x11AF8 },
     { 0x11B00, 0x11B09 },
+    { 0x11BC0, 0x11BE1 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
     { 0x11C38, 0x11C45 },
@@ -534,7 +552,7 @@
     { 0x11EE0, 0x11EF8 },
     { 0x11F00, 0x11F10 },
     { 0x11F12, 0x11F3A },
-    { 0x11F3E, 0x11F59 },
+    { 0x11F3E, 0x11F5A },
     { 0x11FB0, 0x11FB0 },
     { 0x11FC0, 0x11FF1 },
     { 0x11FFF, 0x12399 },
@@ -543,7 +561,9 @@
     { 0x12480, 0x12543 },
     { 0x12F90, 0x12FF2 },
     { 0x13000, 0x13455 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -556,6 +576,7 @@
     { 0x16B5B, 0x16B61 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D79 },
     { 0x16E40, 0x16E9A },
     { 0x16F00, 0x16F4A },
     { 0x16F4F, 0x16F87 },
@@ -564,7 +585,7 @@
     { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -579,6 +600,8 @@
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
     { 0x1BC9C, 0x1BCA3 },
+    { 0x1CC00, 0x1CCF9 },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
     { 0x1CF50, 0x1CFC3 },
@@ -630,6 +653,8 @@
     { 0x1E2C0, 0x1E2F9 },
     { 0x1E2FF, 0x1E2FF },
     { 0x1E4D0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5FA },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
@@ -699,19 +724,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA },
-    { 0x1FBF0, 0x1FBF9 },
+    { 0x1FB94, 0x1FBF9 },
     { 0x20000, 0x2A6DF },
     { 0x2A700, 0x2B739 },
     { 0x2B740, 0x2B81D },
diff --git a/tests/unictype/test-ctype_punct.c b/tests/unictype/test-ctype_punct.c
index 1bebda2c..b77f8585 100644
--- a/tests/unictype/test-ctype_punct.c
+++ b/tests/unictype/test-ctype_punct.c
@@ -69,7 +69,7 @@
     { 0x085E, 0x085E },
     { 0x0888, 0x0888 },
     { 0x0890, 0x0891 },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x0903 },
     { 0x093A, 0x093C },
     { 0x093E, 0x094F },
@@ -206,8 +206,8 @@
     { 0x1AB0, 0x1ACE },
     { 0x1B00, 0x1B04 },
     { 0x1B34, 0x1B44 },
-    { 0x1B5A, 0x1B7E },
-    { 0x1B80, 0x1B82 },
+    { 0x1B4E, 0x1B4F },
+    { 0x1B5A, 0x1B82 },
     { 0x1BA1, 0x1BAD },
     { 0x1BE6, 0x1BF3 },
     { 0x1BFC, 0x1BFF },
@@ -249,7 +249,7 @@
     { 0x214A, 0x214D },
     { 0x214F, 0x215F },
     { 0x2189, 0x218B },
-    { 0x2190, 0x2426 },
+    { 0x2190, 0x2429 },
     { 0x2440, 0x244A },
     { 0x2460, 0x249B },
     { 0x24EA, 0x2B73 },
@@ -275,7 +275,7 @@
     { 0x30A0, 0x30A0 },
     { 0x30FB, 0x30FB },
     { 0x3190, 0x319F },
-    { 0x31C0, 0x31E3 },
+    { 0x31C0, 0x31E5 },
     { 0x31EF, 0x31EF },
     { 0x3200, 0x321E },
     { 0x3220, 0x33FF },
@@ -385,9 +385,11 @@
     { 0x10BA9, 0x10BAF },
     { 0x10CFA, 0x10CFF },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6E },
+    { 0x10D8E, 0x10D8F },
     { 0x10E60, 0x10E7E },
     { 0x10EAB, 0x10EAD },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F1D, 0x10F26 },
     { 0x10F46, 0x10F59 },
     { 0x10F82, 0x10F89 },
@@ -424,6 +426,15 @@
     { 0x11362, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113B8, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113D4, 0x113D5 },
+    { 0x113D7, 0x113D8 },
+    { 0x113E1, 0x113E2 },
     { 0x11435, 0x11446 },
     { 0x1144B, 0x1144F },
     { 0x1145A, 0x1145B },
@@ -457,6 +468,7 @@
     { 0x11A8A, 0x11A9C },
     { 0x11A9E, 0x11AA2 },
     { 0x11B00, 0x11B09 },
+    { 0x11BE1, 0x11BE1 },
     { 0x11C2F, 0x11C36 },
     { 0x11C38, 0x11C3F },
     { 0x11C41, 0x11C45 },
@@ -477,17 +489,20 @@
     { 0x11F03, 0x11F03 },
     { 0x11F34, 0x11F3A },
     { 0x11F3E, 0x11F4F },
+    { 0x11F5A, 0x11F5A },
     { 0x11FC0, 0x11FF1 },
     { 0x11FFF, 0x11FFF },
     { 0x12470, 0x12474 },
     { 0x12FF1, 0x12FF2 },
     { 0x13430, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x1612F },
     { 0x16A6E, 0x16A6F },
     { 0x16AF0, 0x16AF5 },
     { 0x16B30, 0x16B3F },
     { 0x16B44, 0x16B45 },
     { 0x16B5B, 0x16B61 },
+    { 0x16D6D, 0x16D6F },
     { 0x16E80, 0x16E9A },
     { 0x16F4F, 0x16F4F },
     { 0x16F51, 0x16F87 },
@@ -496,6 +511,8 @@
     { 0x16FE4, 0x16FE4 },
     { 0x16FF0, 0x16FF1 },
     { 0x1BC9C, 0x1BCA3 },
+    { 0x1CC00, 0x1CCD5 },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
     { 0x1CF50, 0x1CFC3 },
@@ -532,6 +549,8 @@
     { 0x1E2EC, 0x1E2EF },
     { 0x1E2FF, 0x1E2FF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E8C7, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0x1E95E, 0x1E95F },
@@ -567,18 +586,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA },
+    { 0x1FB94, 0x1FBEF },
     { 0xE0001, 0xE0001 },
     { 0xE0020, 0xE007F },
     { 0xE0100, 0xE01EF },
diff --git a/tests/unictype/test-ctype_upper.c b/tests/unictype/test-ctype_upper.c
index c8e45155..c20035d6 100644
--- a/tests/unictype/test-ctype_upper.c
+++ b/tests/unictype/test-ctype_upper.c
@@ -292,6 +292,7 @@
     { 0x10C7, 0x10C7 },
     { 0x10CD, 0x10CD },
     { 0x13A0, 0x13F5 },
+    { 0x1C89, 0x1C89 },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1E00, 0x1E00 },
@@ -611,9 +612,12 @@
     { 0xA7C2, 0xA7C2 },
     { 0xA7C4, 0xA7C7 },
     { 0xA7C9, 0xA7C9 },
+    { 0xA7CB, 0xA7CC },
     { 0xA7D0, 0xA7D0 },
     { 0xA7D6, 0xA7D6 },
     { 0xA7D8, 0xA7D8 },
+    { 0xA7DA, 0xA7DA },
+    { 0xA7DC, 0xA7DC },
     { 0xA7F5, 0xA7F5 },
     { 0xFF21, 0xFF3A },
     { 0x10400, 0x10427 },
@@ -623,6 +627,7 @@
     { 0x1058C, 0x10592 },
     { 0x10594, 0x10595 },
     { 0x10C80, 0x10CB2 },
+    { 0x10D50, 0x10D65 },
     { 0x118A0, 0x118BF },
     { 0x16E40, 0x16E5F },
     { 0x1E900, 0x1E921 }
diff --git a/tests/unictype/test-decdigit.c b/tests/unictype/test-decdigit.c
index e3b70470..1ff25ce1 100644
--- a/tests/unictype/test-decdigit.c
+++ b/tests/unictype/test-decdigit.c
@@ -45,5 +45,5 @@ main ()
   for (; c < 0x110000; c++)
     ASSERT (uc_decimal_value (c) == -1);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-decdigit.h b/tests/unictype/test-decdigit.h
index c0a46e6c..d1e45a2a 100644
--- a/tests/unictype/test-decdigit.h
+++ b/tests/unictype/test-decdigit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decimal digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -407,6 +407,16 @@
     { 0x10D37, 7 },
     { 0x10D38, 8 },
     { 0x10D39, 9 },
+    { 0x10D40, 0 },
+    { 0x10D41, 1 },
+    { 0x10D42, 2 },
+    { 0x10D43, 3 },
+    { 0x10D44, 4 },
+    { 0x10D45, 5 },
+    { 0x10D46, 6 },
+    { 0x10D47, 7 },
+    { 0x10D48, 8 },
+    { 0x10D49, 9 },
     { 0x11066, 0 },
     { 0x11067, 1 },
     { 0x11068, 2 },
@@ -497,6 +507,26 @@
     { 0x116C7, 7 },
     { 0x116C8, 8 },
     { 0x116C9, 9 },
+    { 0x116D0, 0 },
+    { 0x116D1, 1 },
+    { 0x116D2, 2 },
+    { 0x116D3, 3 },
+    { 0x116D4, 4 },
+    { 0x116D5, 5 },
+    { 0x116D6, 6 },
+    { 0x116D7, 7 },
+    { 0x116D8, 8 },
+    { 0x116D9, 9 },
+    { 0x116DA, 0 },
+    { 0x116DB, 1 },
+    { 0x116DC, 2 },
+    { 0x116DD, 3 },
+    { 0x116DE, 4 },
+    { 0x116DF, 5 },
+    { 0x116E0, 6 },
+    { 0x116E1, 7 },
+    { 0x116E2, 8 },
+    { 0x116E3, 9 },
     { 0x11730, 0 },
     { 0x11731, 1 },
     { 0x11732, 2 },
@@ -527,6 +557,16 @@
     { 0x11957, 7 },
     { 0x11958, 8 },
     { 0x11959, 9 },
+    { 0x11BF0, 0 },
+    { 0x11BF1, 1 },
+    { 0x11BF2, 2 },
+    { 0x11BF3, 3 },
+    { 0x11BF4, 4 },
+    { 0x11BF5, 5 },
+    { 0x11BF6, 6 },
+    { 0x11BF7, 7 },
+    { 0x11BF8, 8 },
+    { 0x11BF9, 9 },
     { 0x11C50, 0 },
     { 0x11C51, 1 },
     { 0x11C52, 2 },
@@ -567,6 +607,16 @@
     { 0x11F57, 7 },
     { 0x11F58, 8 },
     { 0x11F59, 9 },
+    { 0x16130, 0 },
+    { 0x16131, 1 },
+    { 0x16132, 2 },
+    { 0x16133, 3 },
+    { 0x16134, 4 },
+    { 0x16135, 5 },
+    { 0x16136, 6 },
+    { 0x16137, 7 },
+    { 0x16138, 8 },
+    { 0x16139, 9 },
     { 0x16A60, 0 },
     { 0x16A61, 1 },
     { 0x16A62, 2 },
@@ -597,6 +647,26 @@
     { 0x16B57, 7 },
     { 0x16B58, 8 },
     { 0x16B59, 9 },
+    { 0x16D70, 0 },
+    { 0x16D71, 1 },
+    { 0x16D72, 2 },
+    { 0x16D73, 3 },
+    { 0x16D74, 4 },
+    { 0x16D75, 5 },
+    { 0x16D76, 6 },
+    { 0x16D77, 7 },
+    { 0x16D78, 8 },
+    { 0x16D79, 9 },
+    { 0x1CCF0, 0 },
+    { 0x1CCF1, 1 },
+    { 0x1CCF2, 2 },
+    { 0x1CCF3, 3 },
+    { 0x1CCF4, 4 },
+    { 0x1CCF5, 5 },
+    { 0x1CCF6, 6 },
+    { 0x1CCF7, 7 },
+    { 0x1CCF8, 8 },
+    { 0x1CCF9, 9 },
     { 0x1D7CE, 0 },
     { 0x1D7CF, 1 },
     { 0x1D7D0, 2 },
@@ -677,6 +747,16 @@
     { 0x1E4F7, 7 },
     { 0x1E4F8, 8 },
     { 0x1E4F9, 9 },
+    { 0x1E5F1, 0 },
+    { 0x1E5F2, 1 },
+    { 0x1E5F3, 2 },
+    { 0x1E5F4, 3 },
+    { 0x1E5F5, 4 },
+    { 0x1E5F6, 5 },
+    { 0x1E5F7, 6 },
+    { 0x1E5F8, 7 },
+    { 0x1E5F9, 8 },
+    { 0x1E5FA, 9 },
     { 0x1E950, 0 },
     { 0x1E951, 1 },
     { 0x1E952, 2 },
diff --git a/tests/unictype/test-digit.c b/tests/unictype/test-digit.c
index 12fa387d..c60dc12f 100644
--- a/tests/unictype/test-digit.c
+++ b/tests/unictype/test-digit.c
@@ -45,5 +45,5 @@ main ()
   for (; c < 0x110000; c++)
     ASSERT (uc_digit_value (c) == -1);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-digit.h b/tests/unictype/test-digit.h
index 503b2f41..8d9d5daf 100644
--- a/tests/unictype/test-digit.h
+++ b/tests/unictype/test-digit.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Digit values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -506,6 +506,16 @@
     { 0x10D37, 7 },
     { 0x10D38, 8 },
     { 0x10D39, 9 },
+    { 0x10D40, 0 },
+    { 0x10D41, 1 },
+    { 0x10D42, 2 },
+    { 0x10D43, 3 },
+    { 0x10D44, 4 },
+    { 0x10D45, 5 },
+    { 0x10D46, 6 },
+    { 0x10D47, 7 },
+    { 0x10D48, 8 },
+    { 0x10D49, 9 },
     { 0x10E60, 1 },
     { 0x10E61, 2 },
     { 0x10E62, 3 },
@@ -614,6 +624,26 @@
     { 0x116C7, 7 },
     { 0x116C8, 8 },
     { 0x116C9, 9 },
+    { 0x116D0, 0 },
+    { 0x116D1, 1 },
+    { 0x116D2, 2 },
+    { 0x116D3, 3 },
+    { 0x116D4, 4 },
+    { 0x116D5, 5 },
+    { 0x116D6, 6 },
+    { 0x116D7, 7 },
+    { 0x116D8, 8 },
+    { 0x116D9, 9 },
+    { 0x116DA, 0 },
+    { 0x116DB, 1 },
+    { 0x116DC, 2 },
+    { 0x116DD, 3 },
+    { 0x116DE, 4 },
+    { 0x116DF, 5 },
+    { 0x116E0, 6 },
+    { 0x116E1, 7 },
+    { 0x116E2, 8 },
+    { 0x116E3, 9 },
     { 0x11730, 0 },
     { 0x11731, 1 },
     { 0x11732, 2 },
@@ -644,6 +674,16 @@
     { 0x11957, 7 },
     { 0x11958, 8 },
     { 0x11959, 9 },
+    { 0x11BF0, 0 },
+    { 0x11BF1, 1 },
+    { 0x11BF2, 2 },
+    { 0x11BF3, 3 },
+    { 0x11BF4, 4 },
+    { 0x11BF5, 5 },
+    { 0x11BF6, 6 },
+    { 0x11BF7, 7 },
+    { 0x11BF8, 8 },
+    { 0x11BF9, 9 },
     { 0x11C50, 0 },
     { 0x11C51, 1 },
     { 0x11C52, 2 },
@@ -684,6 +724,16 @@
     { 0x11F57, 7 },
     { 0x11F58, 8 },
     { 0x11F59, 9 },
+    { 0x16130, 0 },
+    { 0x16131, 1 },
+    { 0x16132, 2 },
+    { 0x16133, 3 },
+    { 0x16134, 4 },
+    { 0x16135, 5 },
+    { 0x16136, 6 },
+    { 0x16137, 7 },
+    { 0x16138, 8 },
+    { 0x16139, 9 },
     { 0x16A60, 0 },
     { 0x16A61, 1 },
     { 0x16A62, 2 },
@@ -714,6 +764,26 @@
     { 0x16B57, 7 },
     { 0x16B58, 8 },
     { 0x16B59, 9 },
+    { 0x16D70, 0 },
+    { 0x16D71, 1 },
+    { 0x16D72, 2 },
+    { 0x16D73, 3 },
+    { 0x16D74, 4 },
+    { 0x16D75, 5 },
+    { 0x16D76, 6 },
+    { 0x16D77, 7 },
+    { 0x16D78, 8 },
+    { 0x16D79, 9 },
+    { 0x1CCF0, 0 },
+    { 0x1CCF1, 1 },
+    { 0x1CCF2, 2 },
+    { 0x1CCF3, 3 },
+    { 0x1CCF4, 4 },
+    { 0x1CCF5, 5 },
+    { 0x1CCF6, 6 },
+    { 0x1CCF7, 7 },
+    { 0x1CCF8, 8 },
+    { 0x1CCF9, 9 },
     { 0x1D7CE, 0 },
     { 0x1D7CF, 1 },
     { 0x1D7D0, 2 },
@@ -794,6 +864,16 @@
     { 0x1E4F7, 7 },
     { 0x1E4F8, 8 },
     { 0x1E4F9, 9 },
+    { 0x1E5F1, 0 },
+    { 0x1E5F2, 1 },
+    { 0x1E5F3, 2 },
+    { 0x1E5F4, 3 },
+    { 0x1E5F5, 4 },
+    { 0x1E5F6, 5 },
+    { 0x1E5F7, 6 },
+    { 0x1E5F8, 7 },
+    { 0x1E5F9, 8 },
+    { 0x1E5FA, 9 },
     { 0x1E950, 0 },
     { 0x1E951, 1 },
     { 0x1E952, 2 },
diff --git a/tests/unictype/test-incb_byname.c b/tests/unictype/test-incb_byname.c
index 5031d313..0f909195 100644
--- a/tests/unictype/test-incb_byname.c
+++ b/tests/unictype/test-incb_byname.c
@@ -39,5 +39,5 @@ main ()
   ASSERT (uc_indic_conjunct_break_byname ("X") < 0);
   ASSERT (uc_indic_conjunct_break_byname ("") < 0);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-incb_name.c b/tests/unictype/test-incb_name.c
index 25f53c28..639b2fcd 100644
--- a/tests/unictype/test-incb_name.c
+++ b/tests/unictype/test-incb_name.c
@@ -33,5 +33,5 @@ main ()
   ASSERT (strcmp (uc_indic_conjunct_break_name (UC_INDIC_CONJUNCT_BREAK_EXTEND),    "Extend") == 0);
   ASSERT (uc_indic_conjunct_break_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-incb_of.c b/tests/unictype/test-incb_of.c
index d2adeb5c..ceb5965c 100644
--- a/tests/unictype/test-incb_of.c
+++ b/tests/unictype/test-incb_of.c
@@ -48,5 +48,5 @@ main ()
   for (; c < 0x110000; c++)
     ASSERT (uc_indic_conjunct_break (c) == UC_INDIC_CONJUNCT_BREAK_NONE);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-incb_of.h b/tests/unictype/test-incb_of.h
index 0eb99aaf..e809feab 100644
--- a/tests/unictype/test-incb_of.h
+++ b/tests/unictype/test-incb_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Indic_Conjunct_Break attribute of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -96,6 +96,7 @@
     { 0x034C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x034D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x034E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x034F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0350, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0351, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0352, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -133,6 +134,8 @@
     { 0x0485, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0486, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0487, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0488, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0489, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0591, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0592, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0593, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -264,6 +267,17 @@
     { 0x0748, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0749, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x074A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07A6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07A7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07A8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07A9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07AF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x07B0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x07EB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x07EC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x07ED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -298,6 +312,7 @@
     { 0x0859, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x085A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x085B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0897, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0898, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0899, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x089A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -359,6 +374,9 @@
     { 0x08FD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x08FE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x08FF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0900, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0901, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0902, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0915, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0916, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0917, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -396,12 +414,24 @@
     { 0x0937, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0938, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0939, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x093A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x093C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0941, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0942, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0943, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0944, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0945, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0946, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0947, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0948, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x094D, UC_INDIC_CONJUNCT_BREAK_LINKER },
     { 0x0951, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0952, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0953, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0954, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0955, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0956, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0957, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0958, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0959, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x095A, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -410,6 +440,8 @@
     { 0x095D, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x095E, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x095F, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0962, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0963, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0978, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0979, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x097A, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -418,6 +450,7 @@
     { 0x097D, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x097E, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x097F, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0981, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0995, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0996, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0997, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -451,14 +484,37 @@
     { 0x09B8, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09B9, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09BE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09C1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09C2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09C3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09C4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x09CD, UC_INDIC_CONJUNCT_BREAK_LINKER },
+    { 0x09D7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x09DC, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09DD, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09DF, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x09E2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x09E3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x09F0, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09F1, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x09FE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0A3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A48, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A4B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A4C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A4D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A51, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A70, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A71, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A75, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A81, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0A82, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0A95, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0A96, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0A97, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -494,8 +550,24 @@
     { 0x0AB8, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0AB9, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0ABC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AC8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0ACD, UC_INDIC_CONJUNCT_BREAK_LINKER },
+    { 0x0AE2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AE3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0AF9, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0AFA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AFB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AFC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AFD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AFE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0AFF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0B15, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B16, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B17, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -531,11 +603,29 @@
     { 0x0B38, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B39, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0B4D, UC_INDIC_CONJUNCT_BREAK_LINKER },
+    { 0x0B55, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B56, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B57, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0B5C, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B5D, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0B5F, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0B62, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0B63, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0B71, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0B82, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0BBE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0BC0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0BCD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0BD7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C04, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0C15, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C16, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C17, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -573,13 +663,41 @@
     { 0x0C38, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C39, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C40, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C46, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C48, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C4A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C4B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C4C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0C4D, UC_INDIC_CONJUNCT_BREAK_LINKER },
     { 0x0C55, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0C56, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0C58, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C59, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0C5A, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
+    { 0x0C62, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C63, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0C81, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0CBC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CBF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CC0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CC2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CC6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CC7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CC8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CCA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CCB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CCC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CCD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CD5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CD6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CE2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0CE3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0D15, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0D16, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0D17, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
@@ -620,21 +738,56 @@
     { 0x0D3A, UC_INDIC_CONJUNCT_BREAK_CONSONANT },
     { 0x0D3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0D3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0D4D, UC_INDIC_CONJUNCT_BREAK_LINKER },
+    { 0x0D57, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D62, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D63, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0D81, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DCA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DCF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DD2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DD3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DD4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DD6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0DDF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E48, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E49, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E4A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0E4B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E4C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E4D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0E4E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EB1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EB4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EB5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EB6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EB7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0EB8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0EB9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0EBA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EBB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0EBC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0EC8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0EC9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0ECA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0ECB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0ECC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0ECD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0ECE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F18, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F19, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -642,35 +795,176 @@
     { 0x0F39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F71, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F72, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F73, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F74, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F75, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F76, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F77, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F78, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F79, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F7A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F7B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F7C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F7D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F7E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F80, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F81, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F82, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F83, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F84, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F86, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0F87, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F8D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F8E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F8F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F90, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F91, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F92, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F93, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F94, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F95, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F96, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F97, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F99, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0F9F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FA9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FAF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FB9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FBA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FBB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x0FBC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x0FC6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x102D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x102E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x102F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1030, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1032, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1033, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1034, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1035, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1036, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1037, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1039, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x103A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x103D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x103E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1058, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1059, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x105E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x105F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1060, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1071, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1072, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1073, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1074, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1082, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1085, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1086, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x108D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x109D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x135D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x135E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x135F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1712, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1713, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1714, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1715, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1732, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1733, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1734, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1752, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1753, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1772, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1773, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17B9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17BA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17BB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17C6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17C9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17CF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17D0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17D1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x17D2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x17D3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x17DD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x180B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x180C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x180D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x180F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1885, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1886, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x18A9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1920, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1921, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1922, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1927, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1928, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1932, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1939, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x193A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x193B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A17, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A18, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A1B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A56, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A58, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A59, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A5A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A5B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A5C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A5D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A5E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A60, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A62, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A65, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A66, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A67, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A68, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A69, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A6A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A6B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A6C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A73, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1A74, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A75, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A76, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1A77, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -694,6 +988,7 @@
     { 0x1ABB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1ABC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1ABD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1ABE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1ABF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1AC0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1AC1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -710,7 +1005,23 @@
     { 0x1ACC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1ACD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1ACE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B6B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B6C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B6D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -720,8 +1031,36 @@
     { 0x1B71, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B72, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1B73, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B80, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1B81, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BA9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BAA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1BAB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BAC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BAD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1BE6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BE8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BE9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BEF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BF0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BF1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BF2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BF3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C2C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C2D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C2E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C2F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C30, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1C36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1C37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1CD0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1CD1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -828,7 +1167,14 @@
     { 0x20DA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20DB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20DC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20DD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20DE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20DF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20E0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20E1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20E2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20E3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x20E4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20E5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20E6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x20E7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -886,6 +1232,9 @@
     { 0x3099, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x309A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA66F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA670, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA671, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA672, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA674, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA675, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA676, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -900,7 +1249,14 @@
     { 0xA69F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA6F0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA6F1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA802, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA806, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA80B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA825, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA826, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA82C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA8C4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA8C5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA8E0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA8E1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA8E2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -919,10 +1275,52 @@
     { 0xA8EF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA8F0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA8F1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA8FF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA926, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA927, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA928, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA929, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA92A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA92B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA92C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA92D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA947, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA948, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA949, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA94F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA950, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA951, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA953, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA980, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA981, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA982, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xA9B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9B9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xA9E5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA29, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA2A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA2B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA2C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA2D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA2E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA4C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAA7C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAAB0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAAB2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAAB3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -932,9 +1330,29 @@
     { 0xAABE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAABF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAAC1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAAEC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xAAED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xAAF6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xABE5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xABE8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xABED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFB1E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE04, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE05, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE06, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE07, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE08, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE09, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFE0F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFE20, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFE21, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFE22, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -951,6 +1369,8 @@
     { 0xFE2D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFE2E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0xFE2F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFF9E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xFF9F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x101FD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x102E0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10376, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -958,7 +1378,14 @@
     { 0x10378, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10379, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1037A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A05, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A06, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A0C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10A0D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10A0E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10A0F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10A38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10A39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -970,8 +1397,14 @@
     { 0x10D25, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10D26, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10D27, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10D69, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10D6A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10D6B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10D6C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10D6D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10EAB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10EAC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x10EFC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10EFD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10EFE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10EFF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -990,21 +1423,95 @@
     { 0x10F83, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10F84, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x10F85, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11001, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11038, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11039, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1103F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11040, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11041, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11042, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11043, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11044, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11045, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11046, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11070, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11073, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11074, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1107F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11080, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11081, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110B9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x110BA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x110C2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11100, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11101, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11102, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11127, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11128, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11129, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1112A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1112B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1112D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1112E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1112F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11130, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11131, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11132, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11133, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11134, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11173, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11180, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11181, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111B9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111BA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111BB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111BE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111C9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x111CA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111CB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111CC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x111CF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1122F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11230, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11231, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11234, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11235, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11236, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11237, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1123E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11241, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112DF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x112E8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x112E9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x112EA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11300, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11301, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1133B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1133C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1133E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11340, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1134D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11357, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11366, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11367, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11368, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -1017,23 +1524,274 @@
     { 0x11372, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11373, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11374, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113BB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113BE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113BF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113C9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113CE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113CF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113D0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113D2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113E1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x113E2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11438, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11439, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1143F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11442, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11443, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11444, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11446, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1145E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114BA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114BF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x114C2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x114C3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115AF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115B2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115BF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x115C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115DC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x115DD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11633, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11634, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11635, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11636, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11637, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11638, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11639, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1163A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1163D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1163F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11640, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116AB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116AD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x116B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x116B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1171D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1171F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11722, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11723, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11724, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11725, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11727, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11728, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11729, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1172A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1172B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1182F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11830, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11831, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11832, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11833, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11834, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11835, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11836, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11837, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11839, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1183A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11930, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1193B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1193C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1193D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1193E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11943, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119D4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119D5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119D6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119D7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119DA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119DB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x119E0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A04, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A05, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A06, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A07, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A08, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A09, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A0A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11A34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11A47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A51, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A52, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A53, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A54, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A55, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A56, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A59, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A5A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A5B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A8F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A90, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A91, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A92, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A93, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A94, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A95, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A96, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11A98, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11A99, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C30, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C92, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C93, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C94, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C95, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C96, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C97, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C98, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C99, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11C9F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CA7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CAF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CB0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CB2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CB3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CB5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11CB6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D40, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11D42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11D44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11D45, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D90, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D91, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11D95, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11D97, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11EF3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11EF4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F40, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x11F42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x11F5A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13440, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13447, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13448, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13449, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1344F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13450, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13451, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13452, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13453, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13454, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x13455, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1611E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1611F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16120, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16121, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16122, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16123, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16124, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16125, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16126, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16127, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16128, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16129, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1612D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1612E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1612F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x16AF0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x16AF1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x16AF2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -1046,11 +1804,91 @@
     { 0x16B34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x16B35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x16B36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16F4F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16F8F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16F90, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16F91, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16F92, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16FE4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16FF0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x16FF1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1BC9D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1BC9E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF04, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF05, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF06, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF07, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF08, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF09, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF0F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF10, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF11, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF12, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF13, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF14, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF15, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF16, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF17, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF18, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF19, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF1F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF20, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF21, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF22, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF23, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF24, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF25, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF26, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF27, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF28, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF29, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF2A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF2B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF2C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF2D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF30, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF37, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF38, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF39, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF40, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF45, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1CF46, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D165, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1D166, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D167, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D168, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D169, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1D16D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D16E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D16F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D170, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -1078,6 +1916,133 @@
     { 0x1D242, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D243, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1D244, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA00, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA01, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA02, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA03, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA04, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA05, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA06, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA07, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA08, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA09, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA0F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA10, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA11, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA12, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA13, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA14, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA15, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA16, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA17, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA18, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA19, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA1F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA20, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA21, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA22, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA23, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA24, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA25, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA26, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA27, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA28, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA29, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA2F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA30, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA31, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA32, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA33, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA34, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA35, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA36, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA3B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA3C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA3D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA3E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA3F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA40, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA41, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA42, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA43, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA44, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA45, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA46, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA47, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA48, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA49, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA4F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA50, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA51, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA52, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA53, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA54, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA55, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA56, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA57, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA58, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA59, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA5F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA60, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA61, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA62, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA63, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA64, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA65, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA66, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA67, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA68, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA69, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA6A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA6B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA6C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA75, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA84, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA9B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA9C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA9D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA9E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DA9F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAA9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1DAAF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E000, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E001, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E002, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -1133,6 +2098,8 @@
     { 0x1E4ED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E4EE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E4EF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1E5EE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1E5EF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E8D0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E8D1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E8D2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
@@ -1146,4 +2113,345 @@
     { 0x1E947, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E948, UC_INDIC_CONJUNCT_BREAK_EXTEND },
     { 0x1E949, UC_INDIC_CONJUNCT_BREAK_EXTEND },
-    { 0x1E94A, UC_INDIC_CONJUNCT_BREAK_EXTEND }
+    { 0x1E94A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1F3FB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1F3FC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1F3FD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1F3FE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0x1F3FF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0020, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0021, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0022, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0023, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0024, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0025, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0026, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0027, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0028, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0029, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE002F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0030, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0031, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0032, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0033, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0034, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0035, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0036, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0037, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0038, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0039, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE003F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0040, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0041, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0042, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0043, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0044, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0045, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0046, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0047, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0048, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0049, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE004F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0050, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0051, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0052, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0053, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0054, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0055, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0056, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0057, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0058, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0059, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE005F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0060, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0061, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0062, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0063, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0064, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0065, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0066, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0067, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0068, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0069, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE006F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0070, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0071, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0072, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0073, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0074, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0075, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0076, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0077, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0078, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0079, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE007F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0100, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0101, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0102, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0103, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0104, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0105, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0106, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0107, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0108, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0109, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE010F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0110, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0111, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0112, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0113, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0114, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0115, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0116, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0117, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0118, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0119, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE011F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0120, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0121, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0122, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0123, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0124, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0125, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0126, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0127, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0128, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0129, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE012F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0130, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0131, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0132, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0133, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0134, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0135, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0136, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0137, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0138, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0139, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE013F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0140, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0141, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0142, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0143, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0144, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0145, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0146, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0147, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0148, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0149, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE014F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0150, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0151, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0152, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0153, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0154, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0155, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0156, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0157, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0158, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0159, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE015F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0160, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0161, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0162, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0163, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0164, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0165, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0166, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0167, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0168, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0169, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE016F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0170, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0171, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0172, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0173, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0174, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0175, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0176, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0177, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0178, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0179, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE017F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0180, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0181, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0182, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0183, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0184, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0185, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0186, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0187, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0188, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0189, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE018F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0190, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0191, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0192, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0193, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0194, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0195, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0196, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0197, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0198, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE0199, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019A, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019B, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019C, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019D, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019E, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE019F, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01A9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01AF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01B9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01BF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01C9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01CF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01D9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DD, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01DF, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E0, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E1, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E2, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E3, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E4, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E5, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E6, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E7, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E8, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01E9, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01EA, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01EB, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01EC, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01ED, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01EE, UC_INDIC_CONJUNCT_BREAK_EXTEND },
+    { 0xE01EF, UC_INDIC_CONJUNCT_BREAK_EXTEND }
diff --git a/tests/unictype/test-joininggroup_byname.c b/tests/unictype/test-joininggroup_byname.c
index 24d5c19d..f57f6ad1 100644
--- a/tests/unictype/test-joininggroup_byname.c
+++ b/tests/unictype/test-joininggroup_byname.c
@@ -174,5 +174,5 @@ main ()
   ASSERT (uc_joining_group_byname ("X") < 0);
   ASSERT (uc_joining_group_byname ("") < 0);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joininggroup_name.c b/tests/unictype/test-joininggroup_name.c
index 9e4ef511..40202ced 100644
--- a/tests/unictype/test-joininggroup_name.c
+++ b/tests/unictype/test-joininggroup_name.c
@@ -86,5 +86,5 @@ main ()
   ASSERT (strcmp (uc_joining_group_name (UC_JOINING_GROUP_ZHAIN),                 "Zhain") == 0);
   ASSERT (uc_joining_group_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joininggroup_of.c b/tests/unictype/test-joininggroup_of.c
index 65a70d5f..859f13fd 100644
--- a/tests/unictype/test-joininggroup_of.c
+++ b/tests/unictype/test-joininggroup_of.c
@@ -48,5 +48,5 @@ main ()
   for (; c < 0x110000; c++)
     ASSERT (uc_joining_group (c) == UC_JOINING_GROUP_NONE);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joininggroup_of.h b/tests/unictype/test-joininggroup_of.h
index 1ee9c058..2bfe0a68 100644
--- a/tests/unictype/test-joininggroup_of.h
+++ b/tests/unictype/test-joininggroup_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining group of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-    { 0x0620, UC_JOINING_GROUP_YEH },
+    { 0x0620, UC_JOINING_GROUP_KASHMIRI_YEH },
     { 0x0622, UC_JOINING_GROUP_ALEF },
     { 0x0623, UC_JOINING_GROUP_ALEF },
     { 0x0624, UC_JOINING_GROUP_WAW },
@@ -366,4 +366,7 @@
     { 0x10D1C, UC_JOINING_GROUP_HANIFI_ROHINGYA_PA },
     { 0x10D1E, UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA },
     { 0x10D20, UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA },
-    { 0x10D23, UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA }
+    { 0x10D23, UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA },
+    { 0x10EC2, UC_JOINING_GROUP_DAL },
+    { 0x10EC3, UC_JOINING_GROUP_TAH },
+    { 0x10EC4, UC_JOINING_GROUP_KAF }
diff --git a/tests/unictype/test-joiningtype_byname.c b/tests/unictype/test-joiningtype_byname.c
index ecde322e..1d6d6e88 100644
--- a/tests/unictype/test-joiningtype_byname.c
+++ b/tests/unictype/test-joiningtype_byname.c
@@ -60,5 +60,5 @@ main ()
   ASSERT (uc_joining_type_byname ("X") < 0);
   ASSERT (uc_joining_type_byname ("") < 0);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joiningtype_longname.c b/tests/unictype/test-joiningtype_longname.c
index 3d18ae2f..7416d2f9 100644
--- a/tests/unictype/test-joiningtype_longname.c
+++ b/tests/unictype/test-joiningtype_longname.c
@@ -35,5 +35,5 @@ main ()
   ASSERT (strcmp (uc_joining_type_long_name (UC_JOINING_TYPE_D), "Dual Joining") == 0);
   ASSERT (uc_joining_type_long_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joiningtype_name.c b/tests/unictype/test-joiningtype_name.c
index 0b2ca424..004d1594 100644
--- a/tests/unictype/test-joiningtype_name.c
+++ b/tests/unictype/test-joiningtype_name.c
@@ -35,5 +35,5 @@ main ()
   ASSERT (strcmp (uc_joining_type_name (UC_JOINING_TYPE_D), "D") == 0);
   ASSERT (uc_joining_type_name (-1) == NULL);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joiningtype_of.c b/tests/unictype/test-joiningtype_of.c
index f0760b91..6402150f 100644
--- a/tests/unictype/test-joiningtype_of.c
+++ b/tests/unictype/test-joiningtype_of.c
@@ -61,5 +61,5 @@ main ()
   ASSERT (uc_joining_type (0x0613) == UC_JOINING_TYPE_T);
   ASSERT (uc_joining_type (0x0614) == UC_JOINING_TYPE_T);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-joiningtype_of.h b/tests/unictype/test-joiningtype_of.h
index 7b1e072a..f36660e5 100644
--- a/tests/unictype/test-joiningtype_of.h
+++ b/tests/unictype/test-joiningtype_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Arabic joining type of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -702,6 +702,9 @@
     { 0x10D21, UC_JOINING_TYPE_D },
     { 0x10D22, UC_JOINING_TYPE_R },
     { 0x10D23, UC_JOINING_TYPE_D },
+    { 0x10EC2, UC_JOINING_TYPE_R },
+    { 0x10EC3, UC_JOINING_TYPE_D },
+    { 0x10EC4, UC_JOINING_TYPE_D },
     { 0x10F30, UC_JOINING_TYPE_D },
     { 0x10F31, UC_JOINING_TYPE_D },
     { 0x10F32, UC_JOINING_TYPE_D },
diff --git a/tests/unictype/test-mirror.c b/tests/unictype/test-mirror.c
index 5494e197..b93add15 100644
--- a/tests/unictype/test-mirror.c
+++ b/tests/unictype/test-mirror.c
@@ -37,5 +37,5 @@ main ()
   ASSERT (uc_mirror_char ('}', &mirrored) && mirrored == '{');
   ASSERT (!uc_mirror_char ('X', &mirrored));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-numeric.c b/tests/unictype/test-numeric.c
index 86718bf2..65330533 100644
--- a/tests/unictype/test-numeric.c
+++ b/tests/unictype/test-numeric.c
@@ -55,5 +55,5 @@ main ()
       ASSERT (value.numerator == 0 && value.denominator == 0);
     }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-numeric.h b/tests/unictype/test-numeric.h
index b8a7f809..67db592c 100644
--- a/tests/unictype/test-numeric.h
+++ b/tests/unictype/test-numeric.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Numeric values of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -1068,6 +1068,16 @@
     { 0x10D37, 7, 1 },
     { 0x10D38, 8, 1 },
     { 0x10D39, 9, 1 },
+    { 0x10D40, 0, 1 },
+    { 0x10D41, 1, 1 },
+    { 0x10D42, 2, 1 },
+    { 0x10D43, 3, 1 },
+    { 0x10D44, 4, 1 },
+    { 0x10D45, 5, 1 },
+    { 0x10D46, 6, 1 },
+    { 0x10D47, 7, 1 },
+    { 0x10D48, 8, 1 },
+    { 0x10D49, 9, 1 },
     { 0x10E60, 1, 1 },
     { 0x10E61, 2, 1 },
     { 0x10E62, 3, 1 },
@@ -1250,6 +1260,26 @@
     { 0x116C7, 7, 1 },
     { 0x116C8, 8, 1 },
     { 0x116C9, 9, 1 },
+    { 0x116D0, 0, 1 },
+    { 0x116D1, 1, 1 },
+    { 0x116D2, 2, 1 },
+    { 0x116D3, 3, 1 },
+    { 0x116D4, 4, 1 },
+    { 0x116D5, 5, 1 },
+    { 0x116D6, 6, 1 },
+    { 0x116D7, 7, 1 },
+    { 0x116D8, 8, 1 },
+    { 0x116D9, 9, 1 },
+    { 0x116DA, 0, 1 },
+    { 0x116DB, 1, 1 },
+    { 0x116DC, 2, 1 },
+    { 0x116DD, 3, 1 },
+    { 0x116DE, 4, 1 },
+    { 0x116DF, 5, 1 },
+    { 0x116E0, 6, 1 },
+    { 0x116E1, 7, 1 },
+    { 0x116E2, 8, 1 },
+    { 0x116E3, 9, 1 },
     { 0x11730, 0, 1 },
     { 0x11731, 1, 1 },
     { 0x11732, 2, 1 },
@@ -1291,6 +1321,16 @@
     { 0x11957, 7, 1 },
     { 0x11958, 8, 1 },
     { 0x11959, 9, 1 },
+    { 0x11BF0, 0, 1 },
+    { 0x11BF1, 1, 1 },
+    { 0x11BF2, 2, 1 },
+    { 0x11BF3, 3, 1 },
+    { 0x11BF4, 4, 1 },
+    { 0x11BF5, 5, 1 },
+    { 0x11BF6, 6, 1 },
+    { 0x11BF7, 7, 1 },
+    { 0x11BF8, 8, 1 },
+    { 0x11BF9, 9, 1 },
     { 0x11C50, 0, 1 },
     { 0x11C51, 1, 1 },
     { 0x11C52, 2, 1 },
@@ -1482,6 +1522,16 @@
     { 0x1246C, 7, 1 },
     { 0x1246D, 8, 1 },
     { 0x1246E, 9, 1 },
+    { 0x16130, 0, 1 },
+    { 0x16131, 1, 1 },
+    { 0x16132, 2, 1 },
+    { 0x16133, 3, 1 },
+    { 0x16134, 4, 1 },
+    { 0x16135, 5, 1 },
+    { 0x16136, 6, 1 },
+    { 0x16137, 7, 1 },
+    { 0x16138, 8, 1 },
+    { 0x16139, 9, 1 },
     { 0x16A60, 0, 1 },
     { 0x16A61, 1, 1 },
     { 0x16A62, 2, 1 },
@@ -1519,6 +1569,16 @@
     { 0x16B5F, 100000000, 1 },
     { 0x16B60, 1410065408, 1 },
     { 0x16B61, -727379968, 1 },
+    { 0x16D70, 0, 1 },
+    { 0x16D71, 1, 1 },
+    { 0x16D72, 2, 1 },
+    { 0x16D73, 3, 1 },
+    { 0x16D74, 4, 1 },
+    { 0x16D75, 5, 1 },
+    { 0x16D76, 6, 1 },
+    { 0x16D77, 7, 1 },
+    { 0x16D78, 8, 1 },
+    { 0x16D79, 9, 1 },
     { 0x16E80, 0, 1 },
     { 0x16E81, 1, 1 },
     { 0x16E82, 2, 1 },
@@ -1542,6 +1602,16 @@
     { 0x16E94, 1, 1 },
     { 0x16E95, 2, 1 },
     { 0x16E96, 3, 1 },
+    { 0x1CCF0, 0, 1 },
+    { 0x1CCF1, 1, 1 },
+    { 0x1CCF2, 2, 1 },
+    { 0x1CCF3, 3, 1 },
+    { 0x1CCF4, 4, 1 },
+    { 0x1CCF5, 5, 1 },
+    { 0x1CCF6, 6, 1 },
+    { 0x1CCF7, 7, 1 },
+    { 0x1CCF8, 8, 1 },
+    { 0x1CCF9, 9, 1 },
     { 0x1D2C0, 0, 1 },
     { 0x1D2C1, 1, 1 },
     { 0x1D2C2, 2, 1 },
@@ -1687,6 +1757,16 @@
     { 0x1E4F7, 7, 1 },
     { 0x1E4F8, 8, 1 },
     { 0x1E4F9, 9, 1 },
+    { 0x1E5F1, 0, 1 },
+    { 0x1E5F2, 1, 1 },
+    { 0x1E5F3, 2, 1 },
+    { 0x1E5F4, 3, 1 },
+    { 0x1E5F5, 4, 1 },
+    { 0x1E5F6, 5, 1 },
+    { 0x1E5F7, 6, 1 },
+    { 0x1E5F8, 7, 1 },
+    { 0x1E5F9, 8, 1 },
+    { 0x1E5FA, 9, 1 },
     { 0x1E8C7, 1, 1 },
     { 0x1E8C8, 2, 1 },
     { 0x1E8C9, 3, 1 },
diff --git a/tests/unictype/test-pr_alphabetic.c b/tests/unictype/test-pr_alphabetic.c
index 027b3a01..56a580e8 100644
--- a/tests/unictype/test-pr_alphabetic.c
+++ b/tests/unictype/test-pr_alphabetic.c
@@ -30,7 +30,7 @@
     { 0x02EC, 0x02EC },
     { 0x02EE, 0x02EE },
     { 0x0345, 0x0345 },
-    { 0x0370, 0x0374 },
+    { 0x0363, 0x0374 },
     { 0x0376, 0x0377 },
     { 0x037A, 0x037D },
     { 0x037F, 0x037F },
@@ -71,6 +71,7 @@
     { 0x0860, 0x086A },
     { 0x0870, 0x0887 },
     { 0x0889, 0x088E },
+    { 0x0897, 0x0897 },
     { 0x08A0, 0x08C9 },
     { 0x08D4, 0x08DF },
     { 0x08E3, 0x08E9 },
@@ -284,7 +285,7 @@
     { 0x1C00, 0x1C36 },
     { 0x1C4D, 0x1C4F },
     { 0x1C5A, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -292,7 +293,7 @@
     { 0x1CF5, 0x1CF6 },
     { 0x1CFA, 0x1CFA },
     { 0x1D00, 0x1DBF },
-    { 0x1DE7, 0x1DF4 },
+    { 0x1DD3, 0x1DF4 },
     { 0x1E00, 0x1F15 },
     { 0x1F18, 0x1F1D },
     { 0x1F20, 0x1F45 },
@@ -372,10 +373,10 @@
     { 0xA67F, 0xA6EF },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA805 },
     { 0xA807, 0xA827 },
     { 0xA840, 0xA873 },
@@ -466,6 +467,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -503,9 +505,14 @@
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D27 },
+    { 0x10D4A, 0x10D65 },
+    { 0x10D69, 0x10D69 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EAB, 0x10EAC },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
+    { 0x10EFC, 0x10EFC },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -549,6 +556,17 @@
     { 0x11350, 0x11350 },
     { 0x11357, 0x11357 },
     { 0x1135D, 0x11363 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113CD },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11441 },
     { 0x11443, 0x11445 },
     { 0x11447, 0x1144A },
@@ -587,6 +605,7 @@
     { 0x11A50, 0x11A97 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
     { 0x11C38, 0x11C3E },
@@ -619,7 +638,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1612E },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A70, 0x16ABE },
@@ -628,6 +649,7 @@
     { 0x16B40, 0x16B43 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F4F, 0x16F87 },
@@ -637,7 +659,7 @@
     { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -697,6 +719,8 @@
     { 0x1E290, 0x1E2AD },
     { 0x1E2C0, 0x1E2EB },
     { 0x1E4D0, 0x1E4EB },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5F0 },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-pr_bidi_arabic_digit.c b/tests/unictype/test-pr_bidi_arabic_digit.c
index 10e6bf03..1a832df4 100644
--- a/tests/unictype/test-pr_bidi_arabic_digit.c
+++ b/tests/unictype/test-pr_bidi_arabic_digit.c
@@ -24,6 +24,7 @@
     { 0x0890, 0x0891 },
     { 0x08E2, 0x08E2 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D49 },
     { 0x10E60, 0x10E7E }
 
 #define PREDICATE(c) uc_is_property_bidi_arabic_digit (c)
diff --git a/tests/unictype/test-pr_bidi_arabic_right_to_left.c b/tests/unictype/test-pr_bidi_arabic_right_to_left.c
index d97eb529..26f7e36a 100644
--- a/tests/unictype/test-pr_bidi_arabic_right_to_left.c
+++ b/tests/unictype/test-pr_bidi_arabic_right_to_left.c
@@ -41,6 +41,7 @@
     { 0xFE67, 0xFE67 },
     { 0xFE6C, 0xFEFE },
     { 0x10D00, 0x10D23 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F30, 0x10F45 },
     { 0x10F51, 0x10F59 },
     { 0x1EC71, 0x1ECB4 },
diff --git a/tests/unictype/test-pr_bidi_european_digit.c b/tests/unictype/test-pr_bidi_european_digit.c
index 3f72d04c..c12a8a17 100644
--- a/tests/unictype/test-pr_bidi_european_digit.c
+++ b/tests/unictype/test-pr_bidi_european_digit.c
@@ -27,6 +27,7 @@
     { 0x2488, 0x249B },
     { 0xFF10, 0xFF19 },
     { 0x102E1, 0x102FB },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1D7CE, 0x1D7FF },
     { 0x1F100, 0x1F10A },
     { 0x1FBF0, 0x1FBF9 }
diff --git a/tests/unictype/test-pr_bidi_hebrew_right_to_left.c b/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
index f6b97339..e652aa5b 100644
--- a/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
+++ b/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
@@ -34,7 +34,7 @@
     { 0x085C, 0x085F },
     { 0x086B, 0x086F },
     { 0x088F, 0x088F },
-    { 0x0892, 0x0897 },
+    { 0x0892, 0x0896 },
     { 0x200F, 0x200F },
     { 0xFB1D, 0xFB1D },
     { 0xFB1F, 0xFB28 },
@@ -49,9 +49,12 @@
     { 0x10AE7, 0x10B38 },
     { 0x10B40, 0x10CFF },
     { 0x10D28, 0x10D2F },
-    { 0x10D3A, 0x10E5F },
+    { 0x10D3A, 0x10D3F },
+    { 0x10D4A, 0x10D68 },
+    { 0x10D6F, 0x10E5F },
     { 0x10E7F, 0x10EAA },
-    { 0x10EAD, 0x10EFC },
+    { 0x10EAD, 0x10EC1 },
+    { 0x10EC5, 0x10EFB },
     { 0x10F00, 0x10F2F },
     { 0x10F5A, 0x10F81 },
     { 0x10F86, 0x10FFF },
diff --git a/tests/unictype/test-pr_bidi_left_to_right.c b/tests/unictype/test-pr_bidi_left_to_right.c
index 3a81b5ec..21ea1543 100644
--- a/tests/unictype/test-pr_bidi_left_to_right.c
+++ b/tests/unictype/test-pr_bidi_left_to_right.c
@@ -217,7 +217,7 @@
     { 0x218C, 0x218F },
     { 0x2336, 0x237A },
     { 0x2395, 0x2395 },
-    { 0x2427, 0x243F },
+    { 0x242A, 0x243F },
     { 0x244B, 0x245F },
     { 0x249C, 0x24E9 },
     { 0x26AC, 0x26AC },
@@ -242,7 +242,7 @@
     { 0x309D, 0x309F },
     { 0x30A1, 0x30FA },
     { 0x30FC, 0x31BF },
-    { 0x31E4, 0x31EE },
+    { 0x31E6, 0x31EE },
     { 0x31F0, 0x321C },
     { 0x321F, 0x324F },
     { 0x3260, 0x327B },
@@ -337,7 +337,12 @@
     { 0x1133D, 0x1133F },
     { 0x11341, 0x11365 },
     { 0x1136D, 0x1136F },
-    { 0x11375, 0x11437 },
+    { 0x11375, 0x113BA },
+    { 0x113C1, 0x113CD },
+    { 0x113CF, 0x113CF },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113E0 },
+    { 0x113E3, 0x11437 },
     { 0x11440, 0x11441 },
     { 0x11445, 0x11445 },
     { 0x11447, 0x1145D },
@@ -358,6 +363,7 @@
     { 0x116AE, 0x116AF },
     { 0x116B6, 0x116B6 },
     { 0x116B8, 0x1171C },
+    { 0x1171E, 0x1171E },
     { 0x11720, 0x11721 },
     { 0x11726, 0x11726 },
     { 0x1172C, 0x1182E },
@@ -396,10 +402,13 @@
     { 0x11F02, 0x11F35 },
     { 0x11F3B, 0x11F3F },
     { 0x11F41, 0x11F41 },
-    { 0x11F43, 0x11FD4 },
+    { 0x11F43, 0x11F59 },
+    { 0x11F5B, 0x11FD4 },
     { 0x11FF2, 0x1343F },
     { 0x13441, 0x13446 },
-    { 0x13456, 0x16AEF },
+    { 0x13456, 0x1611D },
+    { 0x1612A, 0x1612C },
+    { 0x16130, 0x16AEF },
     { 0x16AF5, 0x16B2F },
     { 0x16B37, 0x16F4E },
     { 0x16F50, 0x16F8E },
@@ -407,7 +416,10 @@
     { 0x16FE3, 0x16FE3 },
     { 0x16FE5, 0x1BC9C },
     { 0x1BC9F, 0x1BC9F },
-    { 0x1BCA4, 0x1CEFF },
+    { 0x1BCA4, 0x1CBFF },
+    { 0x1CCD6, 0x1CCEF },
+    { 0x1CCFA, 0x1CCFF },
+    { 0x1CEB4, 0x1CEFF },
     { 0x1CF2E, 0x1CF2F },
     { 0x1CF47, 0x1D166 },
     { 0x1D16A, 0x1D172 },
@@ -416,11 +428,16 @@
     { 0x1D1AE, 0x1D1E8 },
     { 0x1D1EB, 0x1D1FF },
     { 0x1D246, 0x1D2FF },
-    { 0x1D357, 0x1D6DA },
-    { 0x1D6DC, 0x1D714 },
-    { 0x1D716, 0x1D74E },
-    { 0x1D750, 0x1D788 },
-    { 0x1D78A, 0x1D7C2 },
+    { 0x1D357, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
     { 0x1D7C4, 0x1D7CD },
     { 0x1D800, 0x1D9FF },
     { 0x1DA37, 0x1DA3A },
@@ -439,7 +456,8 @@
     { 0x1E2AF, 0x1E2EB },
     { 0x1E2F0, 0x1E2FE },
     { 0x1E300, 0x1E4EB },
-    { 0x1E4F0, 0x1E7FF },
+    { 0x1E4F0, 0x1E5ED },
+    { 0x1E5F0, 0x1E7FF },
     { 0x1E8C5, 0x1E8C6 },
     { 0x1E8D7, 0x1E8FF },
     { 0x1E94C, 0x1E94F },
@@ -504,18 +522,17 @@
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
     { 0x1F8AE, 0x1F8AF },
-    { 0x1F8B2, 0x1F8FF },
+    { 0x1F8BC, 0x1F8BF },
+    { 0x1F8C2, 0x1F8FF },
     { 0x1FA54, 0x1FA5F },
     { 0x1FA6E, 0x1FA6F },
     { 0x1FA7D, 0x1FA7F },
-    { 0x1FA89, 0x1FA8F },
-    { 0x1FABE, 0x1FABE },
-    { 0x1FAC6, 0x1FACD },
-    { 0x1FADC, 0x1FADF },
-    { 0x1FAE9, 0x1FAEF },
+    { 0x1FA8A, 0x1FA8E },
+    { 0x1FAC7, 0x1FACD },
+    { 0x1FADD, 0x1FADE },
+    { 0x1FAEA, 0x1FAEF },
     { 0x1FAF9, 0x1FAFF },
     { 0x1FB93, 0x1FB93 },
-    { 0x1FBCB, 0x1FBEF },
     { 0x1FBFA, 0x1FFFD },
     { 0x20000, 0x2FFFD },
     { 0x30000, 0x3FFFD },
diff --git a/tests/unictype/test-pr_bidi_non_spacing_mark.c b/tests/unictype/test-pr_bidi_non_spacing_mark.c
index 813373ac..29e458ab 100644
--- a/tests/unictype/test-pr_bidi_non_spacing_mark.c
+++ b/tests/unictype/test-pr_bidi_non_spacing_mark.c
@@ -41,7 +41,7 @@
     { 0x0825, 0x0827 },
     { 0x0829, 0x082D },
     { 0x0859, 0x085B },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x08E1 },
     { 0x08E3, 0x0902 },
     { 0x093A, 0x093A },
@@ -234,8 +234,9 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6D },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11001, 0x11001 },
@@ -266,6 +267,11 @@
     { 0x11340, 0x11340 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113BB, 0x113C0 },
+    { 0x113CE, 0x113CE },
+    { 0x113D0, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11438, 0x1143F },
     { 0x11442, 0x11444 },
     { 0x11446, 0x11446 },
@@ -285,7 +291,8 @@
     { 0x116AD, 0x116AD },
     { 0x116B0, 0x116B5 },
     { 0x116B7, 0x116B7 },
-    { 0x1171D, 0x1171F },
+    { 0x1171D, 0x1171D },
+    { 0x1171F, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
     { 0x1182F, 0x11837 },
@@ -324,8 +331,11 @@
     { 0x11F36, 0x11F3A },
     { 0x11F40, 0x11F40 },
     { 0x11F42, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13440, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x16129 },
+    { 0x1612D, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F4F, 0x16F4F },
@@ -355,6 +365,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0xE0100, 0xE01EF }
diff --git a/tests/unictype/test-pr_bidi_other_neutral.c b/tests/unictype/test-pr_bidi_other_neutral.c
index 0c968235..c31c4dfe 100644
--- a/tests/unictype/test-pr_bidi_other_neutral.c
+++ b/tests/unictype/test-pr_bidi_other_neutral.c
@@ -88,7 +88,7 @@
     { 0x2190, 0x2211 },
     { 0x2214, 0x2335 },
     { 0x237B, 0x2394 },
-    { 0x2396, 0x2426 },
+    { 0x2396, 0x2429 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2487 },
     { 0x24EA, 0x26AB },
@@ -111,7 +111,7 @@
     { 0x309B, 0x309C },
     { 0x30A0, 0x30A0 },
     { 0x30FB, 0x30FB },
-    { 0x31C0, 0x31E3 },
+    { 0x31C0, 0x31E5 },
     { 0x31EF, 0x31EF },
     { 0x321D, 0x321E },
     { 0x3250, 0x325F },
@@ -157,19 +157,27 @@
     { 0x101A0, 0x101A0 },
     { 0x1091F, 0x1091F },
     { 0x10B39, 0x10B3F },
+    { 0x10D6E, 0x10D6E },
     { 0x11052, 0x11065 },
     { 0x11660, 0x1166C },
     { 0x11FD5, 0x11FDC },
     { 0x11FE1, 0x11FF1 },
     { 0x16FE2, 0x16FE2 },
+    { 0x1CC00, 0x1CCD5 },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1D1E9, 0x1D1EA },
     { 0x1D200, 0x1D241 },
     { 0x1D245, 0x1D245 },
     { 0x1D300, 0x1D356 },
+    { 0x1D6C1, 0x1D6C1 },
     { 0x1D6DB, 0x1D6DB },
+    { 0x1D6FB, 0x1D6FB },
     { 0x1D715, 0x1D715 },
+    { 0x1D735, 0x1D735 },
     { 0x1D74F, 0x1D74F },
+    { 0x1D76F, 0x1D76F },
     { 0x1D789, 0x1D789 },
+    { 0x1D7A9, 0x1D7A9 },
     { 0x1D7C3, 0x1D7C3 },
     { 0x1EEF0, 0x1EEF1 },
     { 0x1F000, 0x1F02B },
@@ -195,18 +203,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA }
+    { 0x1FB94, 0x1FBEF }
 
 #define PREDICATE(c) uc_is_property_bidi_other_neutral (c)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_byname.c b/tests/unictype/test-pr_byname.c
index a3435e26..4b7132f8 100644
--- a/tests/unictype/test-pr_byname.c
+++ b/tests/unictype/test-pr_byname.c
@@ -38,5 +38,5 @@ main ()
     ASSERT (! uc_property_is_valid (pr));
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-pr_case_ignorable.c b/tests/unictype/test-pr_case_ignorable.c
index b0f33ab9..31a41b7e 100644
--- a/tests/unictype/test-pr_case_ignorable.c
+++ b/tests/unictype/test-pr_case_ignorable.c
@@ -61,7 +61,7 @@
     { 0x0859, 0x085B },
     { 0x0888, 0x0888 },
     { 0x0890, 0x0891 },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08C9, 0x0902 },
     { 0x093A, 0x093A },
     { 0x093C, 0x093C },
@@ -318,8 +318,11 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D4E, 0x10D4E },
+    { 0x10D69, 0x10D6D },
+    { 0x10D6F, 0x10D6F },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11001, 0x11001 },
@@ -352,6 +355,11 @@
     { 0x11340, 0x11340 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113BB, 0x113C0 },
+    { 0x113CE, 0x113CE },
+    { 0x113D0, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11438, 0x1143F },
     { 0x11442, 0x11444 },
     { 0x11446, 0x11446 },
@@ -371,7 +379,8 @@
     { 0x116AD, 0x116AD },
     { 0x116B0, 0x116B5 },
     { 0x116B7, 0x116B7 },
-    { 0x1171D, 0x1171F },
+    { 0x1171D, 0x1171D },
+    { 0x1171F, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
     { 0x1182F, 0x11837 },
@@ -410,11 +419,16 @@
     { 0x11F36, 0x11F3A },
     { 0x11F40, 0x11F40 },
     { 0x11F42, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13430, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x16129 },
+    { 0x1612D, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16B40, 0x16B43 },
+    { 0x16D40, 0x16D42 },
+    { 0x16D6B, 0x16D6C },
     { 0x16F4F, 0x16F4F },
     { 0x16F8F, 0x16F9F },
     { 0x16FE0, 0x16FE1 },
@@ -448,6 +462,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EB, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94B },
     { 0x1F3FB, 0x1F3FF },
diff --git a/tests/unictype/test-pr_cased.c b/tests/unictype/test-pr_cased.c
index d1966ad7..260f3d14 100644
--- a/tests/unictype/test-pr_cased.c
+++ b/tests/unictype/test-pr_cased.c
@@ -51,7 +51,7 @@
     { 0x10FC, 0x10FF },
     { 0x13A0, 0x13F5 },
     { 0x13F8, 0x13FD },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1D00, 0x1DBF },
@@ -104,10 +104,10 @@
     { 0xA680, 0xA69D },
     { 0xA722, 0xA787 },
     { 0xA78B, 0xA78E },
-    { 0xA790, 0xA7CA },
+    { 0xA790, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA7F6 },
     { 0xA7F8, 0xA7FA },
     { 0xAB30, 0xAB5A },
@@ -134,6 +134,8 @@
     { 0x107B2, 0x107BA },
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D50, 0x10D65 },
+    { 0x10D70, 0x10D85 },
     { 0x118A0, 0x118DF },
     { 0x16E40, 0x16E7F },
     { 0x1D400, 0x1D454 },
diff --git a/tests/unictype/test-pr_changes_when_casefolded.c b/tests/unictype/test-pr_changes_when_casefolded.c
index 7c7c5cea..02c03f82 100644
--- a/tests/unictype/test-pr_changes_when_casefolded.c
+++ b/tests/unictype/test-pr_changes_when_casefolded.c
@@ -299,7 +299,7 @@
     { 0x10C7, 0x10C7 },
     { 0x10CD, 0x10CD },
     { 0x13F8, 0x13FD },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C89 },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1E00, 0x1E00 },
@@ -621,9 +621,12 @@
     { 0xA7C2, 0xA7C2 },
     { 0xA7C4, 0xA7C7 },
     { 0xA7C9, 0xA7C9 },
+    { 0xA7CB, 0xA7CC },
     { 0xA7D0, 0xA7D0 },
     { 0xA7D6, 0xA7D6 },
     { 0xA7D8, 0xA7D8 },
+    { 0xA7DA, 0xA7DA },
+    { 0xA7DC, 0xA7DC },
     { 0xA7F5, 0xA7F5 },
     { 0xAB70, 0xABBF },
     { 0xFB00, 0xFB06 },
@@ -636,6 +639,7 @@
     { 0x1058C, 0x10592 },
     { 0x10594, 0x10595 },
     { 0x10C80, 0x10CB2 },
+    { 0x10D50, 0x10D65 },
     { 0x118A0, 0x118BF },
     { 0x16E40, 0x16E5F },
     { 0x1E900, 0x1E921 }
diff --git a/tests/unictype/test-pr_changes_when_casemapped.c b/tests/unictype/test-pr_changes_when_casemapped.c
index c8e508b2..de9abd98 100644
--- a/tests/unictype/test-pr_changes_when_casemapped.c
+++ b/tests/unictype/test-pr_changes_when_casemapped.c
@@ -24,8 +24,7 @@
     { 0x00D8, 0x00F6 },
     { 0x00F8, 0x0137 },
     { 0x0139, 0x018C },
-    { 0x018E, 0x019A },
-    { 0x019C, 0x01A9 },
+    { 0x018E, 0x01A9 },
     { 0x01AC, 0x01B9 },
     { 0x01BC, 0x01BD },
     { 0x01BF, 0x01BF },
@@ -36,8 +35,7 @@
     { 0x0259, 0x0259 },
     { 0x025B, 0x025C },
     { 0x0260, 0x0261 },
-    { 0x0263, 0x0263 },
-    { 0x0265, 0x0266 },
+    { 0x0263, 0x0266 },
     { 0x0268, 0x026C },
     { 0x026F, 0x026F },
     { 0x0271, 0x0272 },
@@ -71,7 +69,7 @@
     { 0x10FD, 0x10FF },
     { 0x13A0, 0x13F5 },
     { 0x13F8, 0x13FD },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1D79, 0x1D79 },
@@ -122,9 +120,9 @@
     { 0xA78B, 0xA78D },
     { 0xA790, 0xA794 },
     { 0xA796, 0xA7AE },
-    { 0xA7B0, 0xA7CA },
+    { 0xA7B0, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
-    { 0xA7D6, 0xA7D9 },
+    { 0xA7D6, 0xA7DC },
     { 0xA7F5, 0xA7F6 },
     { 0xAB53, 0xAB53 },
     { 0xAB70, 0xABBF },
@@ -145,6 +143,8 @@
     { 0x105BB, 0x105BC },
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D50, 0x10D65 },
+    { 0x10D70, 0x10D85 },
     { 0x118A0, 0x118DF },
     { 0x16E40, 0x16E7F },
     { 0x1E900, 0x1E943 }
diff --git a/tests/unictype/test-pr_changes_when_lowercased.c b/tests/unictype/test-pr_changes_when_lowercased.c
index 95a4b888..d8a56d3f 100644
--- a/tests/unictype/test-pr_changes_when_lowercased.c
+++ b/tests/unictype/test-pr_changes_when_lowercased.c
@@ -292,6 +292,7 @@
     { 0x10C7, 0x10C7 },
     { 0x10CD, 0x10CD },
     { 0x13A0, 0x13F5 },
+    { 0x1C89, 0x1C89 },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1E00, 0x1E00 },
@@ -611,9 +612,12 @@
     { 0xA7C2, 0xA7C2 },
     { 0xA7C4, 0xA7C7 },
     { 0xA7C9, 0xA7C9 },
+    { 0xA7CB, 0xA7CC },
     { 0xA7D0, 0xA7D0 },
     { 0xA7D6, 0xA7D6 },
     { 0xA7D8, 0xA7D8 },
+    { 0xA7DA, 0xA7DA },
+    { 0xA7DC, 0xA7DC },
     { 0xA7F5, 0xA7F5 },
     { 0xFF21, 0xFF3A },
     { 0x10400, 0x10427 },
@@ -623,6 +627,7 @@
     { 0x1058C, 0x10592 },
     { 0x10594, 0x10595 },
     { 0x10C80, 0x10CB2 },
+    { 0x10D50, 0x10D65 },
     { 0x118A0, 0x118BF },
     { 0x16E40, 0x16E5F },
     { 0x1E900, 0x1E921 }
diff --git a/tests/unictype/test-pr_changes_when_titlecased.c b/tests/unictype/test-pr_changes_when_titlecased.c
index 2ce0e2bb..b1596bf3 100644
--- a/tests/unictype/test-pr_changes_when_titlecased.c
+++ b/tests/unictype/test-pr_changes_when_titlecased.c
@@ -89,7 +89,7 @@
     { 0x018C, 0x018C },
     { 0x0192, 0x0192 },
     { 0x0195, 0x0195 },
-    { 0x0199, 0x019A },
+    { 0x0199, 0x019B },
     { 0x019E, 0x019E },
     { 0x01A1, 0x01A1 },
     { 0x01A3, 0x01A3 },
@@ -166,8 +166,7 @@
     { 0x0259, 0x0259 },
     { 0x025B, 0x025C },
     { 0x0260, 0x0261 },
-    { 0x0263, 0x0263 },
-    { 0x0265, 0x0266 },
+    { 0x0263, 0x0266 },
     { 0x0268, 0x026C },
     { 0x026F, 0x026F },
     { 0x0271, 0x0272 },
@@ -305,6 +304,7 @@
     { 0x0561, 0x0587 },
     { 0x13F8, 0x13FD },
     { 0x1C80, 0x1C88 },
+    { 0x1C8A, 0x1C8A },
     { 0x1D79, 0x1D79 },
     { 0x1D7D, 0x1D7D },
     { 0x1D8E, 0x1D8E },
@@ -624,9 +624,11 @@
     { 0xA7C3, 0xA7C3 },
     { 0xA7C8, 0xA7C8 },
     { 0xA7CA, 0xA7CA },
+    { 0xA7CD, 0xA7CD },
     { 0xA7D1, 0xA7D1 },
     { 0xA7D7, 0xA7D7 },
     { 0xA7D9, 0xA7D9 },
+    { 0xA7DB, 0xA7DB },
     { 0xA7F6, 0xA7F6 },
     { 0xAB53, 0xAB53 },
     { 0xAB70, 0xABBF },
@@ -640,6 +642,7 @@
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D70, 0x10D85 },
     { 0x118C0, 0x118DF },
     { 0x16E60, 0x16E7F },
     { 0x1E922, 0x1E943 }
diff --git a/tests/unictype/test-pr_changes_when_uppercased.c b/tests/unictype/test-pr_changes_when_uppercased.c
index ebbe3cf9..041ec255 100644
--- a/tests/unictype/test-pr_changes_when_uppercased.c
+++ b/tests/unictype/test-pr_changes_when_uppercased.c
@@ -89,7 +89,7 @@
     { 0x018C, 0x018C },
     { 0x0192, 0x0192 },
     { 0x0195, 0x0195 },
-    { 0x0199, 0x019A },
+    { 0x0199, 0x019B },
     { 0x019E, 0x019E },
     { 0x01A1, 0x01A1 },
     { 0x01A3, 0x01A3 },
@@ -165,8 +165,7 @@
     { 0x0259, 0x0259 },
     { 0x025B, 0x025C },
     { 0x0260, 0x0261 },
-    { 0x0263, 0x0263 },
-    { 0x0265, 0x0266 },
+    { 0x0263, 0x0266 },
     { 0x0268, 0x026C },
     { 0x026F, 0x026F },
     { 0x0271, 0x0272 },
@@ -306,6 +305,7 @@
     { 0x10FD, 0x10FF },
     { 0x13F8, 0x13FD },
     { 0x1C80, 0x1C88 },
+    { 0x1C8A, 0x1C8A },
     { 0x1D79, 0x1D79 },
     { 0x1D7D, 0x1D7D },
     { 0x1D8E, 0x1D8E },
@@ -625,9 +625,11 @@
     { 0xA7C3, 0xA7C3 },
     { 0xA7C8, 0xA7C8 },
     { 0xA7CA, 0xA7CA },
+    { 0xA7CD, 0xA7CD },
     { 0xA7D1, 0xA7D1 },
     { 0xA7D7, 0xA7D7 },
     { 0xA7D9, 0xA7D9 },
+    { 0xA7DB, 0xA7DB },
     { 0xA7F6, 0xA7F6 },
     { 0xAB53, 0xAB53 },
     { 0xAB70, 0xABBF },
@@ -641,6 +643,7 @@
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D70, 0x10D85 },
     { 0x118C0, 0x118DF },
     { 0x16E60, 0x16E7F },
     { 0x1E922, 0x1E943 }
diff --git a/tests/unictype/test-pr_combining.c b/tests/unictype/test-pr_combining.c
index bccf27d3..0b1ef822 100644
--- a/tests/unictype/test-pr_combining.c
+++ b/tests/unictype/test-pr_combining.c
@@ -41,7 +41,7 @@
     { 0x0825, 0x0827 },
     { 0x0829, 0x082D },
     { 0x0859, 0x085B },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x08E1 },
     { 0x08E3, 0x0903 },
     { 0x093A, 0x093C },
@@ -217,8 +217,9 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6D },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11000, 0x11002 },
@@ -249,6 +250,13 @@
     { 0x11362, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113B8, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11435, 0x11446 },
     { 0x1145E, 0x1145E },
     { 0x114B0, 0x114C3 },
@@ -290,8 +298,10 @@
     { 0x11F03, 0x11F03 },
     { 0x11F34, 0x11F3A },
     { 0x11F3E, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13440, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F4F, 0x16F4F },
@@ -324,6 +334,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0xE0100, 0xE01EF }
diff --git a/tests/unictype/test-pr_composite.c b/tests/unictype/test-pr_composite.c
index 054b7fc9..4720716f 100644
--- a/tests/unictype/test-pr_composite.c
+++ b/tests/unictype/test-pr_composite.c
@@ -285,15 +285,25 @@
     { 0xFE7D, 0xFE7D },
     { 0xFE7F, 0xFE7F },
     { 0xFEF5, 0xFEFC },
+    { 0x105C9, 0x105C9 },
+    { 0x105E4, 0x105E4 },
     { 0x1109A, 0x1109A },
     { 0x1109C, 0x1109C },
     { 0x110AB, 0x110AB },
     { 0x1112E, 0x1112F },
     { 0x1134B, 0x1134C },
+    { 0x11383, 0x11383 },
+    { 0x11385, 0x11385 },
+    { 0x1138E, 0x1138E },
+    { 0x11391, 0x11391 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113C8 },
     { 0x114BB, 0x114BC },
     { 0x114BE, 0x114BE },
     { 0x115BA, 0x115BB },
     { 0x11938, 0x11938 },
+    { 0x16121, 0x16128 },
+    { 0x16D68, 0x16D6A },
     { 0x1D15E, 0x1D164 },
     { 0x1D1BB, 0x1D1C0 },
     { 0x1F100, 0x1F10A },
diff --git a/tests/unictype/test-pr_dash.c b/tests/unictype/test-pr_dash.c
index 5788ddbb..6eb59f2f 100644
--- a/tests/unictype/test-pr_dash.c
+++ b/tests/unictype/test-pr_dash.c
@@ -39,6 +39,7 @@
     { 0xFE58, 0xFE58 },
     { 0xFE63, 0xFE63 },
     { 0xFF0D, 0xFF0D },
+    { 0x10D6E, 0x10D6E },
     { 0x10EAD, 0x10EAD }
 
 #define PREDICATE(c) uc_is_property_dash (c)
diff --git a/tests/unictype/test-pr_decimal_digit.c b/tests/unictype/test-pr_decimal_digit.c
index aedacc94..312e74db 100644
--- a/tests/unictype/test-pr_decimal_digit.c
+++ b/tests/unictype/test-pr_decimal_digit.c
@@ -56,6 +56,7 @@
     { 0xFF10, 0xFF19 },
     { 0x104A0, 0x104A9 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D49 },
     { 0x11066, 0x1106F },
     { 0x110F0, 0x110F9 },
     { 0x11136, 0x1113F },
@@ -65,20 +66,26 @@
     { 0x114D0, 0x114D9 },
     { 0x11650, 0x11659 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11730, 0x11739 },
     { 0x118E0, 0x118E9 },
     { 0x11950, 0x11959 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C50, 0x11C59 },
     { 0x11D50, 0x11D59 },
     { 0x11DA0, 0x11DA9 },
     { 0x11F50, 0x11F59 },
+    { 0x16130, 0x16139 },
     { 0x16A60, 0x16A69 },
     { 0x16AC0, 0x16AC9 },
     { 0x16B50, 0x16B59 },
+    { 0x16D70, 0x16D79 },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1D7CE, 0x1D7FF },
     { 0x1E140, 0x1E149 },
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5F1, 0x1E5FA },
     { 0x1E950, 0x1E959 },
     { 0x1FBF0, 0x1FBF9 }
 
diff --git a/tests/unictype/test-pr_diacritic.c b/tests/unictype/test-pr_diacritic.c
index d4c20042..444d67a6 100644
--- a/tests/unictype/test-pr_diacritic.c
+++ b/tests/unictype/test-pr_diacritic.c
@@ -70,6 +70,7 @@
     { 0x0D3B, 0x0D3C },
     { 0x0D4D, 0x0D4D },
     { 0x0DCA, 0x0DCA },
+    { 0x0E3A, 0x0E3A },
     { 0x0E47, 0x0E4C },
     { 0x0E4E, 0x0E4E },
     { 0x0EBA, 0x0EBA },
@@ -91,9 +92,11 @@
     { 0x109A, 0x109B },
     { 0x135D, 0x135F },
     { 0x1714, 0x1715 },
+    { 0x1734, 0x1734 },
     { 0x17C9, 0x17D3 },
     { 0x17DD, 0x17DD },
     { 0x1939, 0x193B },
+    { 0x1A60, 0x1A60 },
     { 0x1A75, 0x1A7C },
     { 0x1A7F, 0x1A7F },
     { 0x1AB0, 0x1ABE },
@@ -102,6 +105,8 @@
     { 0x1B44, 0x1B44 },
     { 0x1B6B, 0x1B73 },
     { 0x1BAA, 0x1BAB },
+    { 0x1BE6, 0x1BE6 },
+    { 0x1BF2, 0x1BF3 },
     { 0x1C36, 0x1C37 },
     { 0x1C78, 0x1C7D },
     { 0x1CD0, 0x1CE8 },
@@ -130,6 +135,8 @@
     { 0xA700, 0xA721 },
     { 0xA788, 0xA78A },
     { 0xA7F8, 0xA7F9 },
+    { 0xA806, 0xA806 },
+    { 0xA82C, 0xA82C },
     { 0xA8C4, 0xA8C4 },
     { 0xA8E0, 0xA8F1 },
     { 0xA92B, 0xA92E },
@@ -154,8 +161,12 @@
     { 0x10780, 0x10785 },
     { 0x10787, 0x107B0 },
     { 0x107B2, 0x107BA },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D22, 0x10D27 },
+    { 0x10D4E, 0x10D4E },
+    { 0x10D69, 0x10D6D },
     { 0x10EFD, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
@@ -168,10 +179,13 @@
     { 0x111CA, 0x111CC },
     { 0x11235, 0x11236 },
     { 0x112E9, 0x112EA },
-    { 0x1133C, 0x1133C },
+    { 0x1133B, 0x1133C },
     { 0x1134D, 0x1134D },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113CE, 0x113D0 },
+    { 0x113D2, 0x113D3 },
+    { 0x113E1, 0x113E2 },
     { 0x11442, 0x11442 },
     { 0x11446, 0x11446 },
     { 0x114C2, 0x114C3 },
@@ -190,9 +204,13 @@
     { 0x11D42, 0x11D42 },
     { 0x11D44, 0x11D45 },
     { 0x11D97, 0x11D97 },
+    { 0x11F41, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13447, 0x13455 },
+    { 0x1612F, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
+    { 0x16D6B, 0x16D6C },
     { 0x16F8F, 0x16F9F },
     { 0x16FF0, 0x16FF1 },
     { 0x1AFF0, 0x1AFF3 },
@@ -209,6 +227,7 @@
     { 0x1E130, 0x1E136 },
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E946 },
     { 0x1E948, 0x1E94A }
diff --git a/tests/unictype/test-pr_emoji.c b/tests/unictype/test-pr_emoji.c
index f6b7859d..c53d810f 100644
--- a/tests/unictype/test-pr_emoji.c
+++ b/tests/unictype/test-pr_emoji.c
@@ -162,11 +162,10 @@
     { 0x1F93C, 0x1F945 },
     { 0x1F947, 0x1F9FF },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 }
 
 #define PREDICATE(c) uc_is_property_emoji (c)
diff --git a/tests/unictype/test-pr_emoji_presentation.c b/tests/unictype/test-pr_emoji_presentation.c
index fe6b3a20..c250d0ac 100644
--- a/tests/unictype/test-pr_emoji_presentation.c
+++ b/tests/unictype/test-pr_emoji_presentation.c
@@ -92,11 +92,10 @@
     { 0x1F93C, 0x1F945 },
     { 0x1F947, 0x1F9FF },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 }
 
 #define PREDICATE(c) uc_is_property_emoji_presentation (c)
diff --git a/tests/unictype/test-pr_extender.c b/tests/unictype/test-pr_extender.c
index 886710f0..e65d2f32 100644
--- a/tests/unictype/test-pr_extender.c
+++ b/tests/unictype/test-pr_extender.c
@@ -21,6 +21,8 @@
     { 0x02D0, 0x02D1 },
     { 0x0640, 0x0640 },
     { 0x07FA, 0x07FA },
+    { 0x0A71, 0x0A71 },
+    { 0x0AFB, 0x0AFB },
     { 0x0B55, 0x0B55 },
     { 0x0E46, 0x0E46 },
     { 0x0EC6, 0x0EC6 },
@@ -42,13 +44,19 @@
     { 0xAAF3, 0xAAF4 },
     { 0xFF70, 0xFF70 },
     { 0x10781, 0x10782 },
+    { 0x10D4E, 0x10D4E },
+    { 0x10D6A, 0x10D6A },
+    { 0x10D6F, 0x10D6F },
+    { 0x11237, 0x11237 },
     { 0x1135D, 0x1135D },
+    { 0x113D2, 0x113D3 },
     { 0x115C6, 0x115C8 },
     { 0x11A98, 0x11A98 },
     { 0x16B42, 0x16B43 },
     { 0x16FE0, 0x16FE1 },
     { 0x16FE3, 0x16FE3 },
     { 0x1E13C, 0x1E13D },
+    { 0x1E5EF, 0x1E5EF },
     { 0x1E944, 0x1E946 }
 
 #define PREDICATE(c) uc_is_property_extender (c)
diff --git a/tests/unictype/test-pr_grapheme_base.c b/tests/unictype/test-pr_grapheme_base.c
index aeb6af9b..bf969ca6 100644
--- a/tests/unictype/test-pr_grapheme_base.c
+++ b/tests/unictype/test-pr_grapheme_base.c
@@ -159,10 +159,8 @@
     { 0x0CAA, 0x0CB3 },
     { 0x0CB5, 0x0CB9 },
     { 0x0CBD, 0x0CBE },
-    { 0x0CC0, 0x0CC1 },
+    { 0x0CC1, 0x0CC1 },
     { 0x0CC3, 0x0CC4 },
-    { 0x0CC7, 0x0CC8 },
-    { 0x0CCA, 0x0CCB },
     { 0x0CDD, 0x0CDE },
     { 0x0CE0, 0x0CE1 },
     { 0x0CE6, 0x0CEF },
@@ -253,9 +251,8 @@
     { 0x1400, 0x169C },
     { 0x16A0, 0x16F8 },
     { 0x1700, 0x1711 },
-    { 0x1715, 0x1715 },
     { 0x171F, 0x1731 },
-    { 0x1734, 0x1736 },
+    { 0x1735, 0x1736 },
     { 0x1740, 0x1751 },
     { 0x1760, 0x176C },
     { 0x176E, 0x1770 },
@@ -295,23 +292,20 @@
     { 0x1A90, 0x1A99 },
     { 0x1AA0, 0x1AAD },
     { 0x1B04, 0x1B33 },
-    { 0x1B3B, 0x1B3B },
-    { 0x1B3D, 0x1B41 },
-    { 0x1B43, 0x1B4C },
-    { 0x1B50, 0x1B6A },
-    { 0x1B74, 0x1B7E },
+    { 0x1B3E, 0x1B41 },
+    { 0x1B45, 0x1B4C },
+    { 0x1B4E, 0x1B6A },
+    { 0x1B74, 0x1B7F },
     { 0x1B82, 0x1BA1 },
     { 0x1BA6, 0x1BA7 },
-    { 0x1BAA, 0x1BAA },
     { 0x1BAE, 0x1BE5 },
     { 0x1BE7, 0x1BE7 },
     { 0x1BEA, 0x1BEC },
     { 0x1BEE, 0x1BEE },
-    { 0x1BF2, 0x1BF3 },
     { 0x1BFC, 0x1C2B },
     { 0x1C34, 0x1C35 },
     { 0x1C3B, 0x1C49 },
-    { 0x1C4D, 0x1C88 },
+    { 0x1C4D, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CC7 },
     { 0x1CD3, 0x1CD3 },
@@ -345,7 +339,7 @@
     { 0x2090, 0x209C },
     { 0x20A0, 0x20C0 },
     { 0x2100, 0x218B },
-    { 0x2190, 0x2426 },
+    { 0x2190, 0x2429 },
     { 0x2440, 0x244A },
     { 0x2460, 0x2B73 },
     { 0x2B76, 0x2B95 },
@@ -375,7 +369,7 @@
     { 0x309B, 0x30FF },
     { 0x3105, 0x312F },
     { 0x3131, 0x318E },
-    { 0x3190, 0x31E3 },
+    { 0x3190, 0x31E5 },
     { 0x31EF, 0x321E },
     { 0x3220, 0xA48C },
     { 0xA490, 0xA4C6 },
@@ -385,10 +379,10 @@
     { 0xA67E, 0xA69D },
     { 0xA6A0, 0xA6EF },
     { 0xA6F2, 0xA6F7 },
-    { 0xA700, 0xA7CA },
+    { 0xA700, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -401,12 +395,13 @@
     { 0xA8F2, 0xA8FE },
     { 0xA900, 0xA925 },
     { 0xA92E, 0xA946 },
-    { 0xA952, 0xA953 },
+    { 0xA952, 0xA952 },
     { 0xA95F, 0xA97C },
     { 0xA983, 0xA9B2 },
     { 0xA9B4, 0xA9B5 },
     { 0xA9BA, 0xA9BB },
-    { 0xA9BE, 0xA9CD },
+    { 0xA9BE, 0xA9BF },
+    { 0xA9C1, 0xA9CD },
     { 0xA9CF, 0xA9D9 },
     { 0xA9DE, 0xA9E4 },
     { 0xA9E6, 0xA9FE },
@@ -505,6 +500,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -546,10 +542,14 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10CFA, 0x10D23 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D6E, 0x10D85 },
+    { 0x10D8E, 0x10D8F },
     { 0x10E60, 0x10E7E },
     { 0x10E80, 0x10EA9 },
     { 0x10EAD, 0x10EAD },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F27 },
     { 0x10F30, 0x10F45 },
     { 0x10F51, 0x10F59 },
@@ -575,14 +575,14 @@
     { 0x11150, 0x11172 },
     { 0x11174, 0x11176 },
     { 0x11182, 0x111B5 },
-    { 0x111BF, 0x111C8 },
+    { 0x111BF, 0x111BF },
+    { 0x111C1, 0x111C8 },
     { 0x111CD, 0x111CE },
     { 0x111D0, 0x111DF },
     { 0x111E1, 0x111F4 },
     { 0x11200, 0x11211 },
     { 0x11213, 0x1122E },
     { 0x11232, 0x11233 },
-    { 0x11235, 0x11235 },
     { 0x11238, 0x1123D },
     { 0x1123F, 0x11240 },
     { 0x11280, 0x11286 },
@@ -604,9 +604,20 @@
     { 0x1133F, 0x1133F },
     { 0x11341, 0x11344 },
     { 0x11347, 0x11348 },
-    { 0x1134B, 0x1134D },
+    { 0x1134B, 0x1134C },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11363 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113B9, 0x113BA },
+    { 0x113CA, 0x113CA },
+    { 0x113CC, 0x113CD },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D5 },
+    { 0x113D7, 0x113D8 },
     { 0x11400, 0x11437 },
     { 0x11440, 0x11441 },
     { 0x11445, 0x11445 },
@@ -635,10 +646,11 @@
     { 0x11680, 0x116AA },
     { 0x116AC, 0x116AC },
     { 0x116AE, 0x116AF },
-    { 0x116B6, 0x116B6 },
     { 0x116B8, 0x116B9 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
+    { 0x1171E, 0x1171E },
     { 0x11720, 0x11721 },
     { 0x11726, 0x11726 },
     { 0x11730, 0x11746 },
@@ -653,7 +665,6 @@
     { 0x11918, 0x1192F },
     { 0x11931, 0x11935 },
     { 0x11937, 0x11938 },
-    { 0x1193D, 0x1193D },
     { 0x1193F, 0x11942 },
     { 0x11944, 0x11946 },
     { 0x11950, 0x11959 },
@@ -672,6 +683,8 @@
     { 0x11A9A, 0x11AA2 },
     { 0x11AB0, 0x11AF8 },
     { 0x11B00, 0x11B09 },
+    { 0x11BC0, 0x11BE1 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2F },
     { 0x11C3E, 0x11C3E },
@@ -698,7 +711,6 @@
     { 0x11F02, 0x11F10 },
     { 0x11F12, 0x11F35 },
     { 0x11F3E, 0x11F3F },
-    { 0x11F41, 0x11F41 },
     { 0x11F43, 0x11F59 },
     { 0x11FB0, 0x11FB0 },
     { 0x11FC0, 0x11FF1 },
@@ -709,7 +721,11 @@
     { 0x12F90, 0x12FF2 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
+    { 0x1612A, 0x1612C },
+    { 0x16130, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -723,15 +739,15 @@
     { 0x16B5B, 0x16B61 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D79 },
     { 0x16E40, 0x16E9A },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F87 },
     { 0x16F93, 0x16F9F },
     { 0x16FE0, 0x16FE3 },
-    { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -747,12 +763,13 @@
     { 0x1BC90, 0x1BC99 },
     { 0x1BC9C, 0x1BC9C },
     { 0x1BC9F, 0x1BC9F },
+    { 0x1CC00, 0x1CCF9 },
+    { 0x1CD00, 0x1CEB3 },
     { 0x1CF50, 0x1CFC3 },
     { 0x1D000, 0x1D0F5 },
     { 0x1D100, 0x1D126 },
     { 0x1D129, 0x1D164 },
-    { 0x1D166, 0x1D166 },
-    { 0x1D16A, 0x1D16D },
+    { 0x1D16A, 0x1D16C },
     { 0x1D183, 0x1D184 },
     { 0x1D18C, 0x1D1A9 },
     { 0x1D1AE, 0x1D1EA },
@@ -800,6 +817,9 @@
     { 0x1E2FF, 0x1E2FF },
     { 0x1E4D0, 0x1E4EB },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5FA },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
@@ -870,19 +890,18 @@
     { 0x1F850, 0x1F859 },
     { 0x1F860, 0x1F887 },
     { 0x1F890, 0x1F8AD },
-    { 0x1F8B0, 0x1F8B1 },
+    { 0x1F8B0, 0x1F8BB },
+    { 0x1F8C0, 0x1F8C1 },
     { 0x1F900, 0x1FA53 },
     { 0x1FA60, 0x1FA6D },
     { 0x1FA70, 0x1FA7C },
-    { 0x1FA80, 0x1FA88 },
-    { 0x1FA90, 0x1FABD },
-    { 0x1FABF, 0x1FAC5 },
-    { 0x1FACE, 0x1FADB },
-    { 0x1FAE0, 0x1FAE8 },
+    { 0x1FA80, 0x1FA89 },
+    { 0x1FA8F, 0x1FAC6 },
+    { 0x1FACE, 0x1FADC },
+    { 0x1FADF, 0x1FAE9 },
     { 0x1FAF0, 0x1FAF8 },
     { 0x1FB00, 0x1FB92 },
-    { 0x1FB94, 0x1FBCA },
-    { 0x1FBF0, 0x1FBF9 },
+    { 0x1FB94, 0x1FBF9 },
     { 0x20000, 0x2A6DF },
     { 0x2A700, 0x2B739 },
     { 0x2B740, 0x2B81D },
diff --git a/tests/unictype/test-pr_grapheme_extend.c b/tests/unictype/test-pr_grapheme_extend.c
index d168a4ce..6ef0b8a4 100644
--- a/tests/unictype/test-pr_grapheme_extend.c
+++ b/tests/unictype/test-pr_grapheme_extend.c
@@ -41,7 +41,7 @@
     { 0x0825, 0x0827 },
     { 0x0829, 0x082D },
     { 0x0859, 0x085B },
-    { 0x0898, 0x089F },
+    { 0x0897, 0x089F },
     { 0x08CA, 0x08E1 },
     { 0x08E3, 0x0902 },
     { 0x093A, 0x093A },
@@ -95,10 +95,10 @@
     { 0x0C62, 0x0C63 },
     { 0x0C81, 0x0C81 },
     { 0x0CBC, 0x0CBC },
-    { 0x0CBF, 0x0CBF },
+    { 0x0CBF, 0x0CC0 },
     { 0x0CC2, 0x0CC2 },
-    { 0x0CC6, 0x0CC6 },
-    { 0x0CCC, 0x0CCD },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
     { 0x0CD5, 0x0CD6 },
     { 0x0CE2, 0x0CE3 },
     { 0x0D00, 0x0D01 },
@@ -142,8 +142,8 @@
     { 0x108D, 0x108D },
     { 0x109D, 0x109D },
     { 0x135D, 0x135F },
-    { 0x1712, 0x1714 },
-    { 0x1732, 0x1733 },
+    { 0x1712, 0x1715 },
+    { 0x1732, 0x1734 },
     { 0x1752, 0x1753 },
     { 0x1772, 0x1773 },
     { 0x17B4, 0x17B5 },
@@ -170,18 +170,16 @@
     { 0x1A7F, 0x1A7F },
     { 0x1AB0, 0x1ACE },
     { 0x1B00, 0x1B03 },
-    { 0x1B34, 0x1B3A },
-    { 0x1B3C, 0x1B3C },
-    { 0x1B42, 0x1B42 },
+    { 0x1B34, 0x1B3D },
+    { 0x1B42, 0x1B44 },
     { 0x1B6B, 0x1B73 },
     { 0x1B80, 0x1B81 },
     { 0x1BA2, 0x1BA5 },
-    { 0x1BA8, 0x1BA9 },
-    { 0x1BAB, 0x1BAD },
+    { 0x1BA8, 0x1BAD },
     { 0x1BE6, 0x1BE6 },
     { 0x1BE8, 0x1BE9 },
     { 0x1BED, 0x1BED },
-    { 0x1BEF, 0x1BF1 },
+    { 0x1BEF, 0x1BF3 },
     { 0x1C2C, 0x1C33 },
     { 0x1C36, 0x1C37 },
     { 0x1CD0, 0x1CD2 },
@@ -212,10 +210,12 @@
     { 0xA8FF, 0xA8FF },
     { 0xA926, 0xA92D },
     { 0xA947, 0xA951 },
+    { 0xA953, 0xA953 },
     { 0xA980, 0xA982 },
     { 0xA9B3, 0xA9B3 },
     { 0xA9B6, 0xA9B9 },
     { 0xA9BC, 0xA9BD },
+    { 0xA9C0, 0xA9C0 },
     { 0xA9E5, 0xA9E5 },
     { 0xAA29, 0xAA2E },
     { 0xAA31, 0xAA32 },
@@ -247,8 +247,9 @@
     { 0x10A3F, 0x10A3F },
     { 0x10AE5, 0x10AE6 },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D6D },
     { 0x10EAB, 0x10EAC },
-    { 0x10EFD, 0x10EFF },
+    { 0x10EFC, 0x10EFF },
     { 0x10F46, 0x10F50 },
     { 0x10F82, 0x10F85 },
     { 0x11001, 0x11001 },
@@ -265,11 +266,11 @@
     { 0x11173, 0x11173 },
     { 0x11180, 0x11181 },
     { 0x111B6, 0x111BE },
+    { 0x111C0, 0x111C0 },
     { 0x111C9, 0x111CC },
     { 0x111CF, 0x111CF },
     { 0x1122F, 0x11231 },
-    { 0x11234, 0x11234 },
-    { 0x11236, 0x11237 },
+    { 0x11234, 0x11237 },
     { 0x1123E, 0x1123E },
     { 0x11241, 0x11241 },
     { 0x112DF, 0x112DF },
@@ -278,9 +279,18 @@
     { 0x1133B, 0x1133C },
     { 0x1133E, 0x1133E },
     { 0x11340, 0x11340 },
+    { 0x1134D, 0x1134D },
     { 0x11357, 0x11357 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x113B8, 0x113B8 },
+    { 0x113BB, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113C9 },
+    { 0x113CE, 0x113D0 },
+    { 0x113D2, 0x113D2 },
+    { 0x113E1, 0x113E2 },
     { 0x11438, 0x1143F },
     { 0x11442, 0x11444 },
     { 0x11446, 0x11446 },
@@ -301,16 +311,15 @@
     { 0x1163F, 0x11640 },
     { 0x116AB, 0x116AB },
     { 0x116AD, 0x116AD },
-    { 0x116B0, 0x116B5 },
-    { 0x116B7, 0x116B7 },
-    { 0x1171D, 0x1171F },
+    { 0x116B0, 0x116B7 },
+    { 0x1171D, 0x1171D },
+    { 0x1171F, 0x1171F },
     { 0x11722, 0x11725 },
     { 0x11727, 0x1172B },
     { 0x1182F, 0x11837 },
     { 0x11839, 0x1183A },
     { 0x11930, 0x11930 },
-    { 0x1193B, 0x1193C },
-    { 0x1193E, 0x1193E },
+    { 0x1193B, 0x1193E },
     { 0x11943, 0x11943 },
     { 0x119D4, 0x119D7 },
     { 0x119DA, 0x119DB },
@@ -341,21 +350,23 @@
     { 0x11EF3, 0x11EF4 },
     { 0x11F00, 0x11F01 },
     { 0x11F36, 0x11F3A },
-    { 0x11F40, 0x11F40 },
-    { 0x11F42, 0x11F42 },
+    { 0x11F40, 0x11F42 },
+    { 0x11F5A, 0x11F5A },
     { 0x13440, 0x13440 },
     { 0x13447, 0x13455 },
+    { 0x1611E, 0x16129 },
+    { 0x1612D, 0x1612F },
     { 0x16AF0, 0x16AF4 },
     { 0x16B30, 0x16B36 },
     { 0x16F4F, 0x16F4F },
     { 0x16F8F, 0x16F92 },
     { 0x16FE4, 0x16FE4 },
+    { 0x16FF0, 0x16FF1 },
     { 0x1BC9D, 0x1BC9E },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
-    { 0x1D165, 0x1D165 },
-    { 0x1D167, 0x1D169 },
-    { 0x1D16E, 0x1D172 },
+    { 0x1D165, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
     { 0x1D17B, 0x1D182 },
     { 0x1D185, 0x1D18B },
     { 0x1D1AA, 0x1D1AD },
@@ -376,6 +387,7 @@
     { 0x1E2AE, 0x1E2AE },
     { 0x1E2EC, 0x1E2EF },
     { 0x1E4EC, 0x1E4EF },
+    { 0x1E5EE, 0x1E5EF },
     { 0x1E8D0, 0x1E8D6 },
     { 0x1E944, 0x1E94A },
     { 0xE0020, 0xE007F },
diff --git a/tests/unictype/test-pr_grapheme_link.c b/tests/unictype/test-pr_grapheme_link.c
index 3b741be4..ae98c301 100644
--- a/tests/unictype/test-pr_grapheme_link.c
+++ b/tests/unictype/test-pr_grapheme_link.c
@@ -57,6 +57,7 @@
     { 0x11235, 0x11235 },
     { 0x112EA, 0x112EA },
     { 0x1134D, 0x1134D },
+    { 0x113CE, 0x113D0 },
     { 0x11442, 0x11442 },
     { 0x114C2, 0x114C2 },
     { 0x115BF, 0x115BF },
@@ -72,7 +73,8 @@
     { 0x11C3F, 0x11C3F },
     { 0x11D44, 0x11D45 },
     { 0x11D97, 0x11D97 },
-    { 0x11F41, 0x11F42 }
+    { 0x11F41, 0x11F42 },
+    { 0x1612F, 0x1612F }
 
 #define PREDICATE(c) uc_is_property_grapheme_link (c)
 #include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_id_continue.c b/tests/unictype/test-pr_id_continue.c
index 39675ef1..fa766caf 100644
--- a/tests/unictype/test-pr_id_continue.c
+++ b/tests/unictype/test-pr_id_continue.c
@@ -70,7 +70,7 @@
     { 0x0860, 0x086A },
     { 0x0870, 0x0887 },
     { 0x0889, 0x088E },
-    { 0x0898, 0x08E1 },
+    { 0x0897, 0x08E1 },
     { 0x08E3, 0x0963 },
     { 0x0966, 0x096F },
     { 0x0971, 0x0983 },
@@ -293,7 +293,7 @@
     { 0x1C00, 0x1C37 },
     { 0x1C40, 0x1C49 },
     { 0x1C4D, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CD0, 0x1CD2 },
@@ -377,10 +377,10 @@
     { 0xA67F, 0xA6F1 },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA827 },
     { 0xA82C, 0xA82C },
     { 0xA840, 0xA873 },
@@ -478,6 +478,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -518,10 +519,14 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D27 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D69, 0x10D6D },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EAB, 0x10EAC },
     { 0x10EB0, 0x10EB1 },
-    { 0x10EFD, 0x10F1C },
+    { 0x10EC2, 0x10EC4 },
+    { 0x10EFC, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F50 },
     { 0x10F70, 0x10F85 },
@@ -567,6 +572,16 @@
     { 0x1135D, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D3 },
+    { 0x113E1, 0x113E2 },
     { 0x11400, 0x1144A },
     { 0x11450, 0x11459 },
     { 0x1145E, 0x11461 },
@@ -581,6 +596,7 @@
     { 0x11650, 0x11659 },
     { 0x11680, 0x116B8 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x1171D, 0x1172B },
     { 0x11730, 0x11739 },
@@ -604,6 +620,8 @@
     { 0x11A50, 0x11A99 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
     { 0x11C38, 0x11C40 },
@@ -628,7 +646,7 @@
     { 0x11F00, 0x11F10 },
     { 0x11F12, 0x11F3A },
     { 0x11F3E, 0x11F42 },
-    { 0x11F50, 0x11F59 },
+    { 0x11F50, 0x11F5A },
     { 0x11FB0, 0x11FB0 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
@@ -636,7 +654,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13440, 0x13455 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -649,6 +669,8 @@
     { 0x16B50, 0x16B59 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
+    { 0x16D70, 0x16D79 },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F4F, 0x16F87 },
@@ -658,7 +680,7 @@
     { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -673,6 +695,7 @@
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
     { 0x1BC9D, 0x1BC9E },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
     { 0x1D165, 0x1D169 },
@@ -734,6 +757,7 @@
     { 0x1E290, 0x1E2AE },
     { 0x1E2C0, 0x1E2F9 },
     { 0x1E4D0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5FA },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-pr_id_start.c b/tests/unictype/test-pr_id_start.c
index 62bfc045..b6d64403 100644
--- a/tests/unictype/test-pr_id_start.c
+++ b/tests/unictype/test-pr_id_start.c
@@ -241,7 +241,7 @@
     { 0x1C00, 0x1C23 },
     { 0x1C4D, 0x1C4F },
     { 0x1C5A, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -324,10 +324,10 @@
     { 0xA6A0, 0xA6EF },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -425,6 +425,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -461,8 +462,11 @@
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D23 },
+    { 0x10D4A, 0x10D65 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -501,6 +505,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x1145F, 0x11461 },
@@ -535,6 +546,7 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -558,7 +570,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A70, 0x16ABE },
@@ -567,6 +581,7 @@
     { 0x16B40, 0x16B43 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
@@ -575,7 +590,7 @@
     { 0x16FE3, 0x16FE3 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -628,6 +643,8 @@
     { 0x1E290, 0x1E2AD },
     { 0x1E2C0, 0x1E2EB },
     { 0x1E4D0, 0x1E4EB },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5F0 },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-pr_ideographic.c b/tests/unictype/test-pr_ideographic.c
index 0d71c94c..d8b64d41 100644
--- a/tests/unictype/test-pr_ideographic.c
+++ b/tests/unictype/test-pr_ideographic.c
@@ -27,7 +27,7 @@
     { 0x16FE4, 0x16FE4 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1B170, 0x1B2FB },
     { 0x20000, 0x2A6DF },
     { 0x2A700, 0x2B739 },
diff --git a/tests/unictype/test-pr_lowercase.c b/tests/unictype/test-pr_lowercase.c
index ec16470f..4ffaf156 100644
--- a/tests/unictype/test-pr_lowercase.c
+++ b/tests/unictype/test-pr_lowercase.c
@@ -296,6 +296,7 @@
     { 0x10FC, 0x10FF },
     { 0x13F8, 0x13FD },
     { 0x1C80, 0x1C88 },
+    { 0x1C8A, 0x1C8A },
     { 0x1D00, 0x1DBF },
     { 0x1E01, 0x1E01 },
     { 0x1E03, 0x1E03 },
@@ -628,11 +629,13 @@
     { 0xA7C3, 0xA7C3 },
     { 0xA7C8, 0xA7C8 },
     { 0xA7CA, 0xA7CA },
+    { 0xA7CD, 0xA7CD },
     { 0xA7D1, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
     { 0xA7D5, 0xA7D5 },
     { 0xA7D7, 0xA7D7 },
     { 0xA7D9, 0xA7D9 },
+    { 0xA7DB, 0xA7DB },
     { 0xA7F2, 0xA7F4 },
     { 0xA7F6, 0xA7F6 },
     { 0xA7F8, 0xA7FA },
@@ -653,6 +656,7 @@
     { 0x10787, 0x107B0 },
     { 0x107B2, 0x107BA },
     { 0x10CC0, 0x10CF2 },
+    { 0x10D70, 0x10D85 },
     { 0x118C0, 0x118DF },
     { 0x16E60, 0x16E7F },
     { 0x1D41A, 0x1D433 },
diff --git a/tests/unictype/test-pr_math.c b/tests/unictype/test-pr_math.c
index 98daf24f..4bcf8336 100644
--- a/tests/unictype/test-pr_math.c
+++ b/tests/unictype/test-pr_math.c
@@ -100,6 +100,7 @@
     { 0xFF5E, 0xFF5E },
     { 0xFFE2, 0xFFE2 },
     { 0xFFE9, 0xFFEC },
+    { 0x10D8E, 0x10D8F },
     { 0x1D400, 0x1D454 },
     { 0x1D456, 0x1D49C },
     { 0x1D49E, 0x1D49F },
diff --git a/tests/unictype/test-pr_modifier_combining_mark.c b/tests/unictype/test-pr_modifier_combining_mark.c
new file mode 100644
index 00000000..7e1f90cd
--- /dev/null
+++ b/tests/unictype/test-pr_modifier_combining_mark.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   This 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0654, 0x0655 },
+    { 0x0658, 0x0658 },
+    { 0x06DC, 0x06DC },
+    { 0x06E3, 0x06E3 },
+    { 0x06E7, 0x06E8 },
+    { 0x08CA, 0x08CB },
+    { 0x08CD, 0x08CF },
+    { 0x08D3, 0x08D3 },
+    { 0x08F3, 0x08F3 }
+
+#define PREDICATE(c) uc_is_property_modifier_combining_mark (c)
+#include "test-predicate-part2.h"
diff --git a/tests/unictype/test-pr_numeric.c b/tests/unictype/test-pr_numeric.c
index 746abd28..3ea5acec 100644
--- a/tests/unictype/test-pr_numeric.c
+++ b/tests/unictype/test-pr_numeric.c
@@ -117,6 +117,7 @@
     { 0x10BA9, 0x10BAF },
     { 0x10CFA, 0x10CFF },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D49 },
     { 0x10E60, 0x10E7E },
     { 0x10F1D, 0x10F26 },
     { 0x10F51, 0x10F54 },
@@ -131,20 +132,25 @@
     { 0x114D0, 0x114D9 },
     { 0x11650, 0x11659 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11730, 0x1173B },
     { 0x118E0, 0x118F2 },
     { 0x11950, 0x11959 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C50, 0x11C6C },
     { 0x11D50, 0x11D59 },
     { 0x11DA0, 0x11DA9 },
     { 0x11F50, 0x11F59 },
     { 0x11FC0, 0x11FD4 },
     { 0x12400, 0x1246E },
+    { 0x16130, 0x16139 },
     { 0x16A60, 0x16A69 },
     { 0x16AC0, 0x16AC9 },
     { 0x16B50, 0x16B59 },
     { 0x16B5B, 0x16B61 },
+    { 0x16D70, 0x16D79 },
     { 0x16E80, 0x16E96 },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1D2C0, 0x1D2D3 },
     { 0x1D2E0, 0x1D2F3 },
     { 0x1D360, 0x1D378 },
@@ -152,6 +158,7 @@
     { 0x1E140, 0x1E149 },
     { 0x1E2F0, 0x1E2F9 },
     { 0x1E4F0, 0x1E4F9 },
+    { 0x1E5F1, 0x1E5FA },
     { 0x1E8C7, 0x1E8CF },
     { 0x1E950, 0x1E959 },
     { 0x1EC71, 0x1ECAB },
diff --git a/tests/unictype/test-pr_other_alphabetic.c b/tests/unictype/test-pr_other_alphabetic.c
index d0ff062f..b8a85ce0 100644
--- a/tests/unictype/test-pr_other_alphabetic.c
+++ b/tests/unictype/test-pr_other_alphabetic.c
@@ -18,6 +18,7 @@
 #include "test-predicate-part1.h"
 
     { 0x0345, 0x0345 },
+    { 0x0363, 0x036F },
     { 0x05B0, 0x05BD },
     { 0x05BF, 0x05BF },
     { 0x05C1, 0x05C2 },
@@ -38,6 +39,7 @@
     { 0x081B, 0x0823 },
     { 0x0825, 0x0827 },
     { 0x0829, 0x082C },
+    { 0x0897, 0x0897 },
     { 0x08D4, 0x08DF },
     { 0x08E3, 0x08E9 },
     { 0x08F0, 0x0903 },
@@ -142,7 +144,7 @@
     { 0x1BAC, 0x1BAD },
     { 0x1BE7, 0x1BF1 },
     { 0x1C24, 0x1C36 },
-    { 0x1DE7, 0x1DF4 },
+    { 0x1DD3, 0x1DF4 },
     { 0x24B6, 0x24E9 },
     { 0x2DE0, 0x2DFF },
     { 0xA674, 0xA67B },
@@ -176,7 +178,9 @@
     { 0x10A05, 0x10A06 },
     { 0x10A0C, 0x10A0F },
     { 0x10D24, 0x10D27 },
+    { 0x10D69, 0x10D69 },
     { 0x10EAB, 0x10EAC },
+    { 0x10EFC, 0x10EFC },
     { 0x11000, 0x11002 },
     { 0x11038, 0x11045 },
     { 0x11073, 0x11074 },
@@ -200,6 +204,11 @@
     { 0x1134B, 0x1134C },
     { 0x11357, 0x11357 },
     { 0x11362, 0x11363 },
+    { 0x113B8, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113CD },
     { 0x11435, 0x11441 },
     { 0x11443, 0x11445 },
     { 0x114B0, 0x114C1 },
@@ -242,6 +251,7 @@
     { 0x11F03, 0x11F03 },
     { 0x11F34, 0x11F3A },
     { 0x11F3E, 0x11F40 },
+    { 0x1611E, 0x1612E },
     { 0x16F4F, 0x16F4F },
     { 0x16F51, 0x16F87 },
     { 0x16F8F, 0x16F92 },
diff --git a/tests/unictype/test-pr_other_grapheme_extend.c b/tests/unictype/test-pr_other_grapheme_extend.c
index 960fb927..d5e47af0 100644
--- a/tests/unictype/test-pr_other_grapheme_extend.c
+++ b/tests/unictype/test-pr_other_grapheme_extend.c
@@ -23,24 +23,48 @@
     { 0x0B57, 0x0B57 },
     { 0x0BBE, 0x0BBE },
     { 0x0BD7, 0x0BD7 },
+    { 0x0CC0, 0x0CC0 },
     { 0x0CC2, 0x0CC2 },
+    { 0x0CC7, 0x0CC8 },
+    { 0x0CCA, 0x0CCB },
     { 0x0CD5, 0x0CD6 },
     { 0x0D3E, 0x0D3E },
     { 0x0D57, 0x0D57 },
     { 0x0DCF, 0x0DCF },
     { 0x0DDF, 0x0DDF },
+    { 0x1715, 0x1715 },
+    { 0x1734, 0x1734 },
     { 0x1B35, 0x1B35 },
+    { 0x1B3B, 0x1B3B },
+    { 0x1B3D, 0x1B3D },
+    { 0x1B43, 0x1B44 },
+    { 0x1BAA, 0x1BAA },
+    { 0x1BF2, 0x1BF3 },
     { 0x200C, 0x200C },
     { 0x302E, 0x302F },
+    { 0xA953, 0xA953 },
+    { 0xA9C0, 0xA9C0 },
     { 0xFF9E, 0xFF9F },
+    { 0x111C0, 0x111C0 },
+    { 0x11235, 0x11235 },
     { 0x1133E, 0x1133E },
+    { 0x1134D, 0x1134D },
     { 0x11357, 0x11357 },
+    { 0x113B8, 0x113B8 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113C9 },
+    { 0x113CF, 0x113CF },
     { 0x114B0, 0x114B0 },
     { 0x114BD, 0x114BD },
     { 0x115AF, 0x115AF },
+    { 0x116B6, 0x116B6 },
     { 0x11930, 0x11930 },
-    { 0x1D165, 0x1D165 },
-    { 0x1D16E, 0x1D172 },
+    { 0x1193D, 0x1193D },
+    { 0x11F41, 0x11F41 },
+    { 0x16FF0, 0x16FF1 },
+    { 0x1D165, 0x1D166 },
+    { 0x1D16D, 0x1D172 },
     { 0xE0020, 0xE007F }
 
 #define PREDICATE(c) uc_is_property_other_grapheme_extend (c)
diff --git a/tests/unictype/test-pr_punctuation.c b/tests/unictype/test-pr_punctuation.c
index 29748f58..24a9e748 100644
--- a/tests/unictype/test-pr_punctuation.c
+++ b/tests/unictype/test-pr_punctuation.c
@@ -82,8 +82,9 @@
     { 0x1A1E, 0x1A1F },
     { 0x1AA0, 0x1AA6 },
     { 0x1AA8, 0x1AAD },
+    { 0x1B4E, 0x1B4F },
     { 0x1B5A, 0x1B60 },
-    { 0x1B7D, 0x1B7E },
+    { 0x1B7D, 0x1B7F },
     { 0x1BFC, 0x1BFF },
     { 0x1C3B, 0x1C3F },
     { 0x1C7E, 0x1C7F },
@@ -162,6 +163,7 @@
     { 0x10AF0, 0x10AF6 },
     { 0x10B39, 0x10B3F },
     { 0x10B99, 0x10B9C },
+    { 0x10D6E, 0x10D6E },
     { 0x10EAD, 0x10EAD },
     { 0x10F55, 0x10F59 },
     { 0x10F86, 0x10F89 },
@@ -176,6 +178,8 @@
     { 0x111DD, 0x111DF },
     { 0x11238, 0x1123D },
     { 0x112A9, 0x112A9 },
+    { 0x113D4, 0x113D5 },
+    { 0x113D7, 0x113D8 },
     { 0x1144B, 0x1144F },
     { 0x1145A, 0x1145B },
     { 0x1145D, 0x1145D },
@@ -192,6 +196,7 @@
     { 0x11A9A, 0x11A9C },
     { 0x11A9E, 0x11AA2 },
     { 0x11B00, 0x11B09 },
+    { 0x11BE1, 0x11BE1 },
     { 0x11C41, 0x11C45 },
     { 0x11C70, 0x11C71 },
     { 0x11EF7, 0x11EF8 },
@@ -203,10 +208,12 @@
     { 0x16AF5, 0x16AF5 },
     { 0x16B37, 0x16B3B },
     { 0x16B44, 0x16B44 },
+    { 0x16D6D, 0x16D6F },
     { 0x16E97, 0x16E9A },
     { 0x16FE2, 0x16FE2 },
     { 0x1BC9F, 0x1BC9F },
     { 0x1DA87, 0x1DA8B },
+    { 0x1E5FF, 0x1E5FF },
     { 0x1E95E, 0x1E95F }
 
 #define PREDICATE(c) uc_is_property_punctuation (c)
diff --git a/tests/unictype/test-pr_sentence_terminal.c b/tests/unictype/test-pr_sentence_terminal.c
index 100b7650..8f770920 100644
--- a/tests/unictype/test-pr_sentence_terminal.c
+++ b/tests/unictype/test-pr_sentence_terminal.c
@@ -39,13 +39,16 @@
     { 0x1809, 0x1809 },
     { 0x1944, 0x1945 },
     { 0x1AA8, 0x1AAB },
+    { 0x1B4E, 0x1B4F },
     { 0x1B5A, 0x1B5B },
     { 0x1B5E, 0x1B5F },
-    { 0x1B7D, 0x1B7E },
+    { 0x1B7D, 0x1B7F },
     { 0x1C3B, 0x1C3C },
     { 0x1C7E, 0x1C7F },
+    { 0x2024, 0x2024 },
     { 0x203C, 0x203D },
     { 0x2047, 0x2049 },
+    { 0x2CF9, 0x2CFB },
     { 0x2E2E, 0x2E2E },
     { 0x2E3C, 0x2E3C },
     { 0x2E53, 0x2E54 },
@@ -61,6 +64,8 @@
     { 0xAA5D, 0xAA5F },
     { 0xAAF0, 0xAAF1 },
     { 0xABEB, 0xABEB },
+    { 0xFE12, 0xFE12 },
+    { 0xFE15, 0xFE16 },
     { 0xFE52, 0xFE52 },
     { 0xFE56, 0xFE57 },
     { 0xFF01, 0xFF01 },
@@ -79,6 +84,7 @@
     { 0x11238, 0x11239 },
     { 0x1123B, 0x1123C },
     { 0x112A9, 0x112A9 },
+    { 0x113D4, 0x113D5 },
     { 0x1144B, 0x1144C },
     { 0x115C2, 0x115C3 },
     { 0x115C9, 0x115D7 },
@@ -95,6 +101,7 @@
     { 0x16AF5, 0x16AF5 },
     { 0x16B37, 0x16B38 },
     { 0x16B44, 0x16B44 },
+    { 0x16D6E, 0x16D6F },
     { 0x16E98, 0x16E98 },
     { 0x1BC9F, 0x1BC9F },
     { 0x1DA88, 0x1DA88 }
diff --git a/tests/unictype/test-pr_terminal_punctuation.c b/tests/unictype/test-pr_terminal_punctuation.c
index b41adece..45bbd0bb 100644
--- a/tests/unictype/test-pr_terminal_punctuation.c
+++ b/tests/unictype/test-pr_terminal_punctuation.c
@@ -33,7 +33,8 @@
     { 0x0700, 0x070A },
     { 0x070C, 0x070C },
     { 0x07F8, 0x07F9 },
-    { 0x0830, 0x083E },
+    { 0x0830, 0x0835 },
+    { 0x0837, 0x083E },
     { 0x085E, 0x085E },
     { 0x0964, 0x0965 },
     { 0x0E5A, 0x0E5B },
@@ -50,13 +51,16 @@
     { 0x1808, 0x1809 },
     { 0x1944, 0x1945 },
     { 0x1AA8, 0x1AAB },
+    { 0x1B4E, 0x1B4F },
     { 0x1B5A, 0x1B5B },
     { 0x1B5D, 0x1B5F },
-    { 0x1B7D, 0x1B7E },
+    { 0x1B7D, 0x1B7F },
     { 0x1C3B, 0x1C3F },
     { 0x1C7E, 0x1C7F },
+    { 0x2024, 0x2024 },
     { 0x203C, 0x203D },
     { 0x2047, 0x2049 },
+    { 0x2CF9, 0x2CFB },
     { 0x2E2E, 0x2E2E },
     { 0x2E3C, 0x2E3C },
     { 0x2E41, 0x2E41 },
@@ -75,6 +79,8 @@
     { 0xAADF, 0xAADF },
     { 0xAAF0, 0xAAF1 },
     { 0xABEB, 0xABEB },
+    { 0xFE12, 0xFE12 },
+    { 0xFE15, 0xFE16 },
     { 0xFE50, 0xFE52 },
     { 0xFE54, 0xFE57 },
     { 0xFF01, 0xFF01 },
@@ -102,6 +108,7 @@
     { 0x111DE, 0x111DF },
     { 0x11238, 0x1123C },
     { 0x112A9, 0x112A9 },
+    { 0x113D4, 0x113D5 },
     { 0x1144B, 0x1144D },
     { 0x1145A, 0x1145B },
     { 0x115C2, 0x115C5 },
@@ -122,6 +129,7 @@
     { 0x16AF5, 0x16AF5 },
     { 0x16B37, 0x16B39 },
     { 0x16B44, 0x16B44 },
+    { 0x16D6E, 0x16D6F },
     { 0x16E97, 0x16E98 },
     { 0x1BC9F, 0x1BC9F },
     { 0x1DA87, 0x1DA8A }
diff --git a/tests/unictype/test-pr_test.c b/tests/unictype/test-pr_test.c
index e479123c..ae38031a 100644
--- a/tests/unictype/test-pr_test.c
+++ b/tests/unictype/test-pr_test.c
@@ -31,5 +31,5 @@ main ()
   for (c = 0; c < 0x110000; c++)
     ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-pr_unassigned_code_value.c b/tests/unictype/test-pr_unassigned_code_value.c
index be826822..ab6200cd 100644
--- a/tests/unictype/test-pr_unassigned_code_value.c
+++ b/tests/unictype/test-pr_unassigned_code_value.c
@@ -39,7 +39,7 @@
     { 0x085F, 0x085F },
     { 0x086B, 0x086F },
     { 0x088F, 0x088F },
-    { 0x0892, 0x0897 },
+    { 0x0892, 0x0896 },
     { 0x0984, 0x0984 },
     { 0x098D, 0x098E },
     { 0x0991, 0x0992 },
@@ -231,12 +231,11 @@
     { 0x1A9A, 0x1A9F },
     { 0x1AAE, 0x1AAF },
     { 0x1ACF, 0x1AFF },
-    { 0x1B4D, 0x1B4F },
-    { 0x1B7F, 0x1B7F },
+    { 0x1B4D, 0x1B4D },
     { 0x1BF4, 0x1BFB },
     { 0x1C38, 0x1C3A },
     { 0x1C4A, 0x1C4C },
-    { 0x1C89, 0x1C8F },
+    { 0x1C8B, 0x1C8F },
     { 0x1CBB, 0x1CBC },
     { 0x1CC8, 0x1CCF },
     { 0x1CFB, 0x1CFF },
@@ -263,7 +262,7 @@
     { 0x20C1, 0x20CF },
     { 0x20F1, 0x20FF },
     { 0x218C, 0x218F },
-    { 0x2427, 0x243F },
+    { 0x242A, 0x243F },
     { 0x244B, 0x245F },
     { 0x2B74, 0x2B75 },
     { 0x2B96, 0x2B96 },
@@ -291,16 +290,16 @@
     { 0x3100, 0x3104 },
     { 0x3130, 0x3130 },
     { 0x318F, 0x318F },
-    { 0x31E4, 0x31EE },
+    { 0x31E6, 0x31EE },
     { 0x321F, 0x321F },
     { 0xA48D, 0xA48F },
     { 0xA4C7, 0xA4CF },
     { 0xA62C, 0xA63F },
     { 0xA6F8, 0xA6FF },
-    { 0xA7CB, 0xA7CF },
+    { 0xA7CE, 0xA7CF },
     { 0xA7D2, 0xA7D2 },
     { 0xA7D4, 0xA7D4 },
-    { 0xA7DA, 0xA7F1 },
+    { 0xA7DD, 0xA7F1 },
     { 0xA82D, 0xA82F },
     { 0xA83A, 0xA83F },
     { 0xA878, 0xA87F },
@@ -388,7 +387,8 @@
     { 0x105A2, 0x105A2 },
     { 0x105B2, 0x105B2 },
     { 0x105BA, 0x105BA },
-    { 0x105BD, 0x105FF },
+    { 0x105BD, 0x105BF },
+    { 0x105F4, 0x105FF },
     { 0x10737, 0x1073F },
     { 0x10756, 0x1075F },
     { 0x10768, 0x1077F },
@@ -431,11 +431,15 @@
     { 0x10CB3, 0x10CBF },
     { 0x10CF3, 0x10CF9 },
     { 0x10D28, 0x10D2F },
-    { 0x10D3A, 0x10E5F },
+    { 0x10D3A, 0x10D3F },
+    { 0x10D66, 0x10D68 },
+    { 0x10D86, 0x10D8D },
+    { 0x10D90, 0x10E5F },
     { 0x10E7F, 0x10E7F },
     { 0x10EAA, 0x10EAA },
     { 0x10EAE, 0x10EAF },
-    { 0x10EB2, 0x10EFC },
+    { 0x10EB2, 0x10EC1 },
+    { 0x10EC5, 0x10EFB },
     { 0x10F28, 0x10F2F },
     { 0x10F5A, 0x10F6F },
     { 0x10F8A, 0x10FAF },
@@ -475,7 +479,18 @@
     { 0x11358, 0x1135C },
     { 0x11364, 0x11365 },
     { 0x1136D, 0x1136F },
-    { 0x11375, 0x113FF },
+    { 0x11375, 0x1137F },
+    { 0x1138A, 0x1138A },
+    { 0x1138C, 0x1138D },
+    { 0x1138F, 0x1138F },
+    { 0x113B6, 0x113B6 },
+    { 0x113C1, 0x113C1 },
+    { 0x113C3, 0x113C4 },
+    { 0x113C6, 0x113C6 },
+    { 0x113CB, 0x113CB },
+    { 0x113D6, 0x113D6 },
+    { 0x113D9, 0x113E0 },
+    { 0x113E3, 0x113FF },
     { 0x1145C, 0x1145C },
     { 0x11462, 0x1147F },
     { 0x114C8, 0x114CF },
@@ -486,7 +501,8 @@
     { 0x1165A, 0x1165F },
     { 0x1166D, 0x1167F },
     { 0x116BA, 0x116BF },
-    { 0x116CA, 0x116FF },
+    { 0x116CA, 0x116CF },
+    { 0x116E4, 0x116FF },
     { 0x1171B, 0x1171C },
     { 0x1172C, 0x1172F },
     { 0x11747, 0x117FF },
@@ -506,7 +522,9 @@
     { 0x11A48, 0x11A4F },
     { 0x11AA3, 0x11AAF },
     { 0x11AF9, 0x11AFF },
-    { 0x11B0A, 0x11BFF },
+    { 0x11B0A, 0x11BBF },
+    { 0x11BE2, 0x11BEF },
+    { 0x11BFA, 0x11BFF },
     { 0x11C09, 0x11C09 },
     { 0x11C37, 0x11C37 },
     { 0x11C46, 0x11C4F },
@@ -530,7 +548,7 @@
     { 0x11EF9, 0x11EFF },
     { 0x11F11, 0x11F11 },
     { 0x11F3B, 0x11F3D },
-    { 0x11F5A, 0x11FAF },
+    { 0x11F5B, 0x11FAF },
     { 0x11FB1, 0x11FBF },
     { 0x11FF2, 0x11FFE },
     { 0x1239A, 0x123FF },
@@ -538,8 +556,10 @@
     { 0x12475, 0x1247F },
     { 0x12544, 0x12F8F },
     { 0x12FF3, 0x12FFF },
-    { 0x13456, 0x143FF },
-    { 0x14647, 0x167FF },
+    { 0x13456, 0x1345F },
+    { 0x143FB, 0x143FF },
+    { 0x14647, 0x160FF },
+    { 0x1613A, 0x167FF },
     { 0x16A39, 0x16A3F },
     { 0x16A5F, 0x16A5F },
     { 0x16A6A, 0x16A6D },
@@ -551,7 +571,8 @@
     { 0x16B5A, 0x16B5A },
     { 0x16B62, 0x16B62 },
     { 0x16B78, 0x16B7C },
-    { 0x16B90, 0x16E3F },
+    { 0x16B90, 0x16D3F },
+    { 0x16D7A, 0x16E3F },
     { 0x16E9B, 0x16EFF },
     { 0x16F4B, 0x16F4E },
     { 0x16F88, 0x16F8E },
@@ -559,7 +580,7 @@
     { 0x16FE5, 0x16FEF },
     { 0x16FF2, 0x16FFF },
     { 0x187F8, 0x187FF },
-    { 0x18CD6, 0x18CFF },
+    { 0x18CD6, 0x18CFE },
     { 0x18D09, 0x1AFEF },
     { 0x1AFF4, 0x1AFF4 },
     { 0x1AFFC, 0x1AFFC },
@@ -574,7 +595,9 @@
     { 0x1BC7D, 0x1BC7F },
     { 0x1BC89, 0x1BC8F },
     { 0x1BC9A, 0x1BC9B },
-    { 0x1BCA4, 0x1CEFF },
+    { 0x1BCA4, 0x1CBFF },
+    { 0x1CCFA, 0x1CCFF },
+    { 0x1CEB4, 0x1CEFF },
     { 0x1CF2E, 0x1CF2F },
     { 0x1CF47, 0x1CF4F },
     { 0x1CFC4, 0x1CFFF },
@@ -625,7 +648,9 @@
     { 0x1E2AF, 0x1E2BF },
     { 0x1E2FA, 0x1E2FE },
     { 0x1E300, 0x1E4CF },
-    { 0x1E4FA, 0x1E7DF },
+    { 0x1E4FA, 0x1E5CF },
+    { 0x1E5FB, 0x1E5FE },
+    { 0x1E600, 0x1E7DF },
     { 0x1E7E7, 0x1E7E7 },
     { 0x1E7EC, 0x1E7EC },
     { 0x1E7EF, 0x1E7EF },
@@ -695,18 +720,17 @@
     { 0x1F85A, 0x1F85F },
     { 0x1F888, 0x1F88F },
     { 0x1F8AE, 0x1F8AF },
-    { 0x1F8B2, 0x1F8FF },
+    { 0x1F8BC, 0x1F8BF },
+    { 0x1F8C2, 0x1F8FF },
     { 0x1FA54, 0x1FA5F },
     { 0x1FA6E, 0x1FA6F },
     { 0x1FA7D, 0x1FA7F },
-    { 0x1FA89, 0x1FA8F },
-    { 0x1FABE, 0x1FABE },
-    { 0x1FAC6, 0x1FACD },
-    { 0x1FADC, 0x1FADF },
-    { 0x1FAE9, 0x1FAEF },
+    { 0x1FA8A, 0x1FA8E },
+    { 0x1FAC7, 0x1FACD },
+    { 0x1FADD, 0x1FADE },
+    { 0x1FAEA, 0x1FAEF },
     { 0x1FAF9, 0x1FAFF },
     { 0x1FB93, 0x1FB93 },
-    { 0x1FBCB, 0x1FBEF },
     { 0x1FBFA, 0x1FFFD },
     { 0x2A6E0, 0x2A6FF },
     { 0x2B73A, 0x2B73F },
diff --git a/tests/unictype/test-pr_uppercase.c b/tests/unictype/test-pr_uppercase.c
index 826eb210..f5adf186 100644
--- a/tests/unictype/test-pr_uppercase.c
+++ b/tests/unictype/test-pr_uppercase.c
@@ -293,6 +293,7 @@
     { 0x10C7, 0x10C7 },
     { 0x10CD, 0x10CD },
     { 0x13A0, 0x13F5 },
+    { 0x1C89, 0x1C89 },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1E00, 0x1E00 },
@@ -619,9 +620,12 @@
     { 0xA7C2, 0xA7C2 },
     { 0xA7C4, 0xA7C7 },
     { 0xA7C9, 0xA7C9 },
+    { 0xA7CB, 0xA7CC },
     { 0xA7D0, 0xA7D0 },
     { 0xA7D6, 0xA7D6 },
     { 0xA7D8, 0xA7D8 },
+    { 0xA7DA, 0xA7DA },
+    { 0xA7DC, 0xA7DC },
     { 0xA7F5, 0xA7F5 },
     { 0xFF21, 0xFF3A },
     { 0x10400, 0x10427 },
@@ -631,6 +635,7 @@
     { 0x1058C, 0x10592 },
     { 0x10594, 0x10595 },
     { 0x10C80, 0x10CB2 },
+    { 0x10D50, 0x10D65 },
     { 0x118A0, 0x118BF },
     { 0x16E40, 0x16E5F },
     { 0x1D400, 0x1D419 },
diff --git a/tests/unictype/test-pr_xid_continue.c b/tests/unictype/test-pr_xid_continue.c
index 91371e8f..664876a4 100644
--- a/tests/unictype/test-pr_xid_continue.c
+++ b/tests/unictype/test-pr_xid_continue.c
@@ -70,7 +70,7 @@
     { 0x0860, 0x086A },
     { 0x0870, 0x0887 },
     { 0x0889, 0x088E },
-    { 0x0898, 0x08E1 },
+    { 0x0897, 0x08E1 },
     { 0x08E3, 0x0963 },
     { 0x0966, 0x096F },
     { 0x0971, 0x0983 },
@@ -293,7 +293,7 @@
     { 0x1C00, 0x1C37 },
     { 0x1C40, 0x1C49 },
     { 0x1C4D, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CD0, 0x1CD2 },
@@ -378,10 +378,10 @@
     { 0xA67F, 0xA6F1 },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA827 },
     { 0xA82C, 0xA82C },
     { 0xA840, 0xA873 },
@@ -485,6 +485,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -525,10 +526,14 @@
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D27 },
     { 0x10D30, 0x10D39 },
+    { 0x10D40, 0x10D65 },
+    { 0x10D69, 0x10D6D },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EAB, 0x10EAC },
     { 0x10EB0, 0x10EB1 },
-    { 0x10EFD, 0x10F1C },
+    { 0x10EC2, 0x10EC4 },
+    { 0x10EFC, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F50 },
     { 0x10F70, 0x10F85 },
@@ -574,6 +579,16 @@
     { 0x1135D, 0x11363 },
     { 0x11366, 0x1136C },
     { 0x11370, 0x11374 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113C0 },
+    { 0x113C2, 0x113C2 },
+    { 0x113C5, 0x113C5 },
+    { 0x113C7, 0x113CA },
+    { 0x113CC, 0x113D3 },
+    { 0x113E1, 0x113E2 },
     { 0x11400, 0x1144A },
     { 0x11450, 0x11459 },
     { 0x1145E, 0x11461 },
@@ -588,6 +603,7 @@
     { 0x11650, 0x11659 },
     { 0x11680, 0x116B8 },
     { 0x116C0, 0x116C9 },
+    { 0x116D0, 0x116E3 },
     { 0x11700, 0x1171A },
     { 0x1171D, 0x1172B },
     { 0x11730, 0x11739 },
@@ -611,6 +627,8 @@
     { 0x11A50, 0x11A99 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
+    { 0x11BF0, 0x11BF9 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C36 },
     { 0x11C38, 0x11C40 },
@@ -635,7 +653,7 @@
     { 0x11F00, 0x11F10 },
     { 0x11F12, 0x11F3A },
     { 0x11F3E, 0x11F42 },
-    { 0x11F50, 0x11F59 },
+    { 0x11F50, 0x11F5A },
     { 0x11FB0, 0x11FB0 },
     { 0x12000, 0x12399 },
     { 0x12400, 0x1246E },
@@ -643,7 +661,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13440, 0x13455 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x16139 },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A60, 0x16A69 },
@@ -656,6 +676,8 @@
     { 0x16B50, 0x16B59 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
+    { 0x16D70, 0x16D79 },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F4F, 0x16F87 },
@@ -665,7 +687,7 @@
     { 0x16FF0, 0x16FF1 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -680,6 +702,7 @@
     { 0x1BC80, 0x1BC88 },
     { 0x1BC90, 0x1BC99 },
     { 0x1BC9D, 0x1BC9E },
+    { 0x1CCF0, 0x1CCF9 },
     { 0x1CF00, 0x1CF2D },
     { 0x1CF30, 0x1CF46 },
     { 0x1D165, 0x1D169 },
@@ -741,6 +764,7 @@
     { 0x1E290, 0x1E2AE },
     { 0x1E2C0, 0x1E2F9 },
     { 0x1E4D0, 0x1E4F9 },
+    { 0x1E5D0, 0x1E5FA },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-pr_xid_start.c b/tests/unictype/test-pr_xid_start.c
index 09ce3db1..7cb8f019 100644
--- a/tests/unictype/test-pr_xid_start.c
+++ b/tests/unictype/test-pr_xid_start.c
@@ -241,7 +241,7 @@
     { 0x1C00, 0x1C23 },
     { 0x1C4D, 0x1C4F },
     { 0x1C5A, 0x1C7D },
-    { 0x1C80, 0x1C88 },
+    { 0x1C80, 0x1C8A },
     { 0x1C90, 0x1CBA },
     { 0x1CBD, 0x1CBF },
     { 0x1CE9, 0x1CEC },
@@ -324,10 +324,10 @@
     { 0xA6A0, 0xA6EF },
     { 0xA717, 0xA71F },
     { 0xA722, 0xA788 },
-    { 0xA78B, 0xA7CA },
+    { 0xA78B, 0xA7CD },
     { 0xA7D0, 0xA7D1 },
     { 0xA7D3, 0xA7D3 },
-    { 0xA7D5, 0xA7D9 },
+    { 0xA7D5, 0xA7DC },
     { 0xA7F2, 0xA801 },
     { 0xA803, 0xA805 },
     { 0xA807, 0xA80A },
@@ -432,6 +432,7 @@
     { 0x105A3, 0x105B1 },
     { 0x105B3, 0x105B9 },
     { 0x105BB, 0x105BC },
+    { 0x105C0, 0x105F3 },
     { 0x10600, 0x10736 },
     { 0x10740, 0x10755 },
     { 0x10760, 0x10767 },
@@ -468,8 +469,11 @@
     { 0x10C80, 0x10CB2 },
     { 0x10CC0, 0x10CF2 },
     { 0x10D00, 0x10D23 },
+    { 0x10D4A, 0x10D65 },
+    { 0x10D6F, 0x10D85 },
     { 0x10E80, 0x10EA9 },
     { 0x10EB0, 0x10EB1 },
+    { 0x10EC2, 0x10EC4 },
     { 0x10F00, 0x10F1C },
     { 0x10F27, 0x10F27 },
     { 0x10F30, 0x10F45 },
@@ -508,6 +512,13 @@
     { 0x1133D, 0x1133D },
     { 0x11350, 0x11350 },
     { 0x1135D, 0x11361 },
+    { 0x11380, 0x11389 },
+    { 0x1138B, 0x1138B },
+    { 0x1138E, 0x1138E },
+    { 0x11390, 0x113B5 },
+    { 0x113B7, 0x113B7 },
+    { 0x113D1, 0x113D1 },
+    { 0x113D3, 0x113D3 },
     { 0x11400, 0x11434 },
     { 0x11447, 0x1144A },
     { 0x1145F, 0x11461 },
@@ -542,6 +553,7 @@
     { 0x11A5C, 0x11A89 },
     { 0x11A9D, 0x11A9D },
     { 0x11AB0, 0x11AF8 },
+    { 0x11BC0, 0x11BE0 },
     { 0x11C00, 0x11C08 },
     { 0x11C0A, 0x11C2E },
     { 0x11C40, 0x11C40 },
@@ -565,7 +577,9 @@
     { 0x12F90, 0x12FF0 },
     { 0x13000, 0x1342F },
     { 0x13441, 0x13446 },
+    { 0x13460, 0x143FA },
     { 0x14400, 0x14646 },
+    { 0x16100, 0x1611D },
     { 0x16800, 0x16A38 },
     { 0x16A40, 0x16A5E },
     { 0x16A70, 0x16ABE },
@@ -574,6 +588,7 @@
     { 0x16B40, 0x16B43 },
     { 0x16B63, 0x16B77 },
     { 0x16B7D, 0x16B8F },
+    { 0x16D40, 0x16D6C },
     { 0x16E40, 0x16E7F },
     { 0x16F00, 0x16F4A },
     { 0x16F50, 0x16F50 },
@@ -582,7 +597,7 @@
     { 0x16FE3, 0x16FE3 },
     { 0x17000, 0x187F7 },
     { 0x18800, 0x18CD5 },
-    { 0x18D00, 0x18D08 },
+    { 0x18CFF, 0x18D08 },
     { 0x1AFF0, 0x1AFF3 },
     { 0x1AFF5, 0x1AFFB },
     { 0x1AFFD, 0x1AFFE },
@@ -635,6 +650,8 @@
     { 0x1E290, 0x1E2AD },
     { 0x1E2C0, 0x1E2EB },
     { 0x1E4D0, 0x1E4EB },
+    { 0x1E5D0, 0x1E5ED },
+    { 0x1E5F0, 0x1E5F0 },
     { 0x1E7E0, 0x1E7E6 },
     { 0x1E7E8, 0x1E7EB },
     { 0x1E7ED, 0x1E7EE },
diff --git a/tests/unictype/test-predicate-part2.h b/tests/unictype/test-predicate-part2.h
index aecd5f5a..c6553334 100644
--- a/tests/unictype/test-predicate-part2.h
+++ b/tests/unictype/test-predicate-part2.h
@@ -33,5 +33,5 @@ main ()
   for (; c < 0x110000; c++)
     ASSERT (!PREDICATE (c));
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-scripts.c b/tests/unictype/test-scripts.c
index 6f51b631..b75501d0 100644
--- a/tests/unictype/test-scripts.c
+++ b/tests/unictype/test-scripts.c
@@ -70,5 +70,5 @@ main ()
     ASSERT (found);
   }
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-sy_c_ident.c b/tests/unictype/test-sy_c_ident.c
index 87022732..1790de3c 100644
--- a/tests/unictype/test-sy_c_ident.c
+++ b/tests/unictype/test-sy_c_ident.c
@@ -34,5 +34,5 @@ main ()
   ASSERT (uc_c_ident_category (0x001B) == UC_IDENTIFIER_INVALID);
   ASSERT (uc_c_ident_category (0xE0001) == UC_IDENTIFIER_INVALID);
 
-  return 0;
+  return test_exit_status;
 }
diff --git a/tests/unictype/test-sy_java_ident.c b/tests/unictype/test-sy_java_ident.c
index d3075b17..3ad382a9 100644
--- a/tests/unictype/test-sy_java_ident.c
+++ b/tests/unictype/test-sy_java_ident.c
@@ -34,5 +34,5 @@ main ()
   ASSERT (uc_java_ident_category (0x001B) == UC_IDENTIFIER_IGNORABLE);
   ASSERT (uc_java_ident_category (0xE0001) == UC_IDENTIFIER_IGNORABLE);
 
-  return 0;
+  return test_exit_status;
 }
author	Jörg Frings-Fürst <debian@jff.email>	2024-10-20 15:21:43 +0200
committer	Jörg Frings-Fürst <debian@jff.email>	2024-10-20 15:21:43 +0200
commit	4682deeb62247d34de87f8e777f99e2d337fd377 (patch)
tree	5bd5b5605b5f3a4b3c8ea7468c34c23094afdef4 /tests/unictype
parent	00893e79fc62966067af1a106567db96bd170338 (diff)