diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c
index 8a25afd4bc9..07719c65655 100644
--- a/dlls/usp10/indicsyllable.c
+++ b/dlls/usp10/indicsyllable.c
@@ -5,7 +5,7 @@
 
 #include "windef.h"
 
-const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
+const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3016] =
 {
     /* level 1 offsets */
     0x0100, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e,
@@ -41,53 +41,51 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e,
     0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e,
     /* level 2 offsets */
-    0x025d, 0x026d, 0x0270, 0x0280, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x0290, 0x029e, 0x026d, 0x02a7, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x02b7, 0x02c2,
-    0x02c7, 0x02cd, 0x02dd, 0x02ed, 0x02fd, 0x030d, 0x031d, 0x0329,
-    0x0330, 0x033f, 0x034f, 0x035e, 0x02fd, 0x036d, 0x037c, 0x0329,
-    0x0330, 0x038c, 0x039c, 0x03ab, 0x03ba, 0x03ca, 0x03d9, 0x03e5,
-    0x0330, 0x03f4, 0x0404, 0x026d, 0x02fd, 0x0412, 0x0422, 0x0329,
-    0x0330, 0x0432, 0x0442, 0x0450, 0x02fd, 0x045e, 0x046c, 0x047b,
-    0x048b, 0x0499, 0x04a9, 0x04b7, 0x03ba, 0x026d, 0x04c7, 0x04d3,
-    0x0330, 0x04d9, 0x04e8, 0x04f6, 0x02fd, 0x026d, 0x0506, 0x04d3,
-    0x0330, 0x0516, 0x0526, 0x0534, 0x02fd, 0x0543, 0x0553, 0x04d3,
-    0x02c7, 0x0563, 0x0571, 0x0580, 0x02fd, 0x0590, 0x05a0, 0x05a9,
-    0x02c7, 0x05b7, 0x05c7, 0x05d6, 0x03ba, 0x05e6, 0x05f5, 0x02c7,
-    0x05f6, 0x0606, 0x0616, 0x0280, 0x026d, 0x026d, 0x0625, 0x02c7,
-    0x0631, 0x0641, 0x0651, 0x0661, 0x026d, 0x026d, 0x0671, 0x0681,
-    0x068d, 0x069d, 0x02c7, 0x06a6, 0x06b5, 0x06c5, 0x06d2, 0x06db,
-    0x06de, 0x06eb, 0x026d, 0x026d, 0x026d, 0x02c7, 0x02c7, 0x06fb,
-    0x070a, 0x071a, 0x072a, 0x0739, 0x0748, 0x0756, 0x0766, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x0776, 0x0784, 0x02c4,
-    0x0784, 0x02c4, 0x0794, 0x0776, 0x07a4, 0x02c7, 0x02c7, 0x07b4,
-    0x07c0, 0x07cf, 0x07de, 0x0280, 0x026d, 0x07ee, 0x05f6, 0x07fe,
-    0x080e, 0x03ba, 0x02c7, 0x081e, 0x082e, 0x02c7, 0x02c7, 0x083e,
-    0x084e, 0x085d, 0x086d, 0x026d, 0x026d, 0x02c7, 0x087d, 0x02c7,
-    0x02c7, 0x088d, 0x089a, 0x08aa, 0x08b8, 0x0280, 0x0280, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x08c8, 0x02c4, 0x02c7,
-    0x08d8, 0x08e8, 0x0280, 0x08f4, 0x0901, 0x0911, 0x02c7, 0x0920,
-    0x0930, 0x02c7, 0x02c7, 0x0940, 0x0950, 0x02c7, 0x02c7, 0x0960,
-    0x096d, 0x097d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x098d, 0x099d, 0x09ab, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x09b6, 0x09c2, 0x09d2, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x09de, 0x09ec, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x09fc, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x02a2, 0x026d, 0x026d, 0x026d, 0x0a0c, 0x02c7, 0x0a19,
-    0x026d, 0x02c7, 0x0a29, 0x0a37, 0x0a46, 0x0a56, 0x02c5, 0x02c7,
-    0x0a66, 0x0a72, 0x0280, 0x0a82, 0x0a90, 0x0aa0, 0x02c7, 0x0aae,
-    0x02c7, 0x0abe, 0x0acd, 0x026d, 0x026d, 0x0add, 0x02c7, 0x02c7,
-    0x0aec, 0x0afc, 0x0280, 0x0b0c, 0x0b1c, 0x02c1, 0x02c7, 0x0b2c,
-    0x0b3b, 0x0b4b, 0x0280, 0x02c7, 0x0b5a, 0x02c7, 0x02c7, 0x02c7,
-    0x0b6a, 0x0b7a, 0x026d, 0x0b8a, 0x0b9a, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d, 0x026d,
-    0x026d, 0x0baa, 0x0bba, 0x0bc7, 0x0280,
+    0x025d, 0x025d, 0x0260, 0x0270, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x0280, 0x028e, 0x025d, 0x0297, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x02a7, 0x02b2,
+    0x02b7, 0x02bd, 0x02cd, 0x02dd, 0x02ed, 0x02fd, 0x030d, 0x0319,
+    0x0320, 0x032f, 0x033f, 0x034e, 0x02ed, 0x035d, 0x036c, 0x0319,
+    0x0320, 0x037c, 0x038c, 0x039b, 0x03aa, 0x03ba, 0x03c9, 0x03d5,
+    0x0320, 0x03e4, 0x03f4, 0x025d, 0x02ed, 0x0402, 0x0412, 0x0319,
+    0x0320, 0x0422, 0x0432, 0x0440, 0x02ed, 0x044e, 0x045c, 0x046b,
+    0x047b, 0x0489, 0x0499, 0x04a7, 0x03aa, 0x025d, 0x04b7, 0x04c3,
+    0x0320, 0x04c9, 0x04d8, 0x04e6, 0x02ed, 0x025d, 0x04f6, 0x04c3,
+    0x0320, 0x0506, 0x0516, 0x0524, 0x02ed, 0x0533, 0x0543, 0x04c3,
+    0x02b7, 0x0553, 0x0561, 0x0570, 0x02ed, 0x0580, 0x0590, 0x0599,
+    0x02b7, 0x05a7, 0x05b7, 0x05c6, 0x03aa, 0x05d6, 0x05e5, 0x02b7,
+    0x05e6, 0x05f6, 0x0606, 0x0270, 0x025d, 0x025d, 0x0615, 0x02b7,
+    0x0621, 0x0631, 0x0641, 0x0651, 0x025d, 0x025d, 0x0661, 0x0671,
+    0x067d, 0x068d, 0x02b7, 0x0696, 0x06a5, 0x06b5, 0x06c2, 0x06cb,
+    0x06ce, 0x06db, 0x025d, 0x025d, 0x025d, 0x02b7, 0x02b7, 0x06eb,
+    0x06fa, 0x070a, 0x071a, 0x0729, 0x0738, 0x0746, 0x0756, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x0766, 0x0774, 0x02b4,
+    0x0774, 0x02b4, 0x0784, 0x0766, 0x0794, 0x02b7, 0x02b7, 0x07a4,
+    0x07b0, 0x07c0, 0x07cf, 0x0270, 0x025d, 0x07df, 0x05e6, 0x07ef,
+    0x07ff, 0x03aa, 0x02b7, 0x080f, 0x081f, 0x02b7, 0x02b7, 0x082f,
+    0x083f, 0x084e, 0x085e, 0x025d, 0x025d, 0x02b7, 0x086e, 0x02b7,
+    0x02b7, 0x087e, 0x088b, 0x089b, 0x08a9, 0x0270, 0x0270, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x08b9, 0x02b4, 0x02b7,
+    0x08c9, 0x08d9, 0x0270, 0x08e5, 0x08f2, 0x0902, 0x02b7, 0x0911,
+    0x0921, 0x02b7, 0x02b7, 0x0931, 0x0941, 0x02b7, 0x02b7, 0x0951,
+    0x095e, 0x096e, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x097e, 0x098e, 0x099c, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x09a7, 0x09b3, 0x09c3, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x09cf, 0x09dd, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x09ed, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x0292, 0x025d, 0x025d, 0x025d, 0x09fd, 0x02b7, 0x0a0a,
+    0x025d, 0x02b7, 0x0a1a, 0x0a28, 0x0a37, 0x0a47, 0x02b5, 0x02b7,
+    0x0a57, 0x0a63, 0x0270, 0x0a73, 0x0a81, 0x0a91, 0x02b7, 0x0a9f,
+    0x02b7, 0x0aaf, 0x0abe, 0x025d, 0x025d, 0x0ace, 0x02b7, 0x02b7,
+    0x0add, 0x0aed, 0x0270, 0x0afd, 0x0b0d, 0x02b1, 0x02b7, 0x0b1d,
+    0x0b2c, 0x0b3c, 0x0270, 0x02b7, 0x0b4b, 0x02b7, 0x02b7, 0x02b7,
+    0x0b5b, 0x0b6b, 0x025d, 0x0b7b, 0x0b8b, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d, 0x025d,
+    0x025d, 0x0b9b, 0x0bab, 0x0bb8, 0x0270,
     /* values */
-    0x5f00, 0x9c00, 0x9500, 0x9500, 0x8600, 0x8600, 0x8600, 0x8600,
-    0x7e00, 0x6e00, 0x6c00, 0x6000, 0x5100, 0x3c00, 0x2600, 0x1900,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0009, 0x0000, 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
@@ -140,16 +138,16 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a,
     0x000a, 0x0000, 0x0000, 0x0604, 0x0003, 0x0107, 0x0207, 0x0107,
     0x0607, 0x0607, 0x0607, 0x0607, 0x0507, 0x0000, 0x0507, 0x0507,
-    0x0007, 0x0000, 0x0107, 0x0107, 0x0605, 0x0000, 0x0000, 0x0000,
+    0x0807, 0x0000, 0x0107, 0x0107, 0x0605, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x0519,
     0x0519, 0x0519, 0x0504, 0x0504, 0x0504, 0x0000, 0x0501, 0x0101,
     0x0102, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
     0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x000a, 0x0000, 0x000a,
     0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000,
     0x0000, 0x0604, 0x0003, 0x0107, 0x0507, 0x0107, 0x0607, 0x0607,
-    0x0607, 0x0607, 0x0000, 0x0000, 0x0207, 0x0007, 0x0000, 0x0000,
-    0x0007, 0x0007, 0x0605, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0507, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a,
+    0x0607, 0x0607, 0x0000, 0x0000, 0x0207, 0x0907, 0x0000, 0x0000,
+    0x0407, 0x0a07, 0x0605, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0507, 0x0807, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a,
     0x000a, 0x0000, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0501, 0x0011, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006,
@@ -168,14 +166,14 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000,
     0x0000, 0x0003, 0x0507, 0x0507, 0x0107, 0x0107, 0x0107, 0x0107,
-    0x0000, 0x0507, 0x0507, 0x0007, 0x0000, 0x0507, 0x0507, 0x0507,
+    0x0000, 0x0507, 0x0507, 0x0707, 0x0000, 0x0507, 0x0507, 0x0507,
     0x0505, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0507, 0x0607,
     0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0001, 0x0501, 0x0101, 0x0102, 0x0000, 0x0006, 0x0006,
     0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006,
     0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a,
     0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0604, 0x0003, 0x0107,
-    0x0507, 0x0007, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0507,
+    0x0507, 0x0807, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0507,
     0x0807, 0x0807, 0x0000, 0x0807, 0x0807, 0x0507, 0x0505, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0107, 0x0107, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x0000, 0x001f,
@@ -198,7 +196,7 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x000a, 0x0000, 0x0000, 0x0000, 0x0505, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0107, 0x0107, 0x0507, 0x0507, 0x0607, 0x0000, 0x0607,
-    0x0000, 0x0107, 0x0207, 0x0007, 0x0207, 0x0007, 0x0007, 0x0007,
+    0x0000, 0x0107, 0x0207, 0x0907, 0x0207, 0x0407, 0x0a07, 0x0407,
     0x0107, 0x0000, 0x0000, 0x0107, 0x0107, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
@@ -225,9 +223,9 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000,
-    0x0000, 0x0607, 0x0507, 0x0007, 0x0607, 0x0607, 0x0707, 0x0707,
+    0x0000, 0x0607, 0x0507, 0x0707, 0x0607, 0x0607, 0x0707, 0x0707,
     0x0707, 0x0707, 0x0507, 0x0507, 0x0507, 0x0507, 0x0501, 0x0102,
-    0x0507, 0x0007, 0x0501, 0x0501, 0x0616, 0x0003, 0x0500, 0x0500,
+    0x0507, 0x0707, 0x0501, 0x0501, 0x0616, 0x0003, 0x0500, 0x0500,
     0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x060d, 0x060d, 0x060d,
     0x060d, 0x060d, 0x060d, 0x060d, 0x060d, 0x0000, 0x060d, 0x060d,
     0x060d, 0x060d, 0x060d, 0x060d, 0x060d, 0x060d, 0x060d, 0x060d,
@@ -260,134 +258,134 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3031] =
     0x000a, 0x000a, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
     0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000,
     0x0000, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0607,
-    0x0607, 0x0007, 0x0007, 0x0207, 0x0207, 0x0207, 0x0407, 0x0407,
-    0x0501, 0x0102, 0x0107, 0x0514, 0x0514, 0x0521, 0x050c, 0x0522,
-    0x0521, 0x0521, 0x0516, 0x0017, 0x0521, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0521, 0x0000,
-    0x0000, 0x0009, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x0607, 0x0907, 0x0a07, 0x0407, 0x0207, 0x0207, 0x0207, 0x0407,
+    0x0407, 0x0501, 0x0102, 0x0107, 0x0514, 0x0514, 0x0521, 0x050c,
+    0x0522, 0x0521, 0x0521, 0x0516, 0x0017, 0x0521, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0521,
+    0x0000, 0x0000, 0x0009, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x0507, 0x0507, 0x0607, 0x0107, 0x0107, 0x0807, 0x0807,
-    0x0507, 0x0507, 0x010d, 0x010d, 0x010d, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x010f, 0x010f, 0x0601, 0x010f, 0x010f, 0x010f, 0x010f,
-    0x010f, 0x010f, 0x060f, 0x0507, 0x0621, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008, 0x0008,
-    0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0000,
-    0x0000, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0000, 0x0000,
+    0x000a, 0x000a, 0x0507, 0x0507, 0x0607, 0x0107, 0x0107, 0x0807,
+    0x0807, 0x0507, 0x0507, 0x010d, 0x010d, 0x010d, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x010f, 0x010f, 0x0601, 0x010f, 0x010f, 0x010f,
+    0x010f, 0x010f, 0x010f, 0x060f, 0x0507, 0x0621, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008,
+    0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+    0x0000, 0x0000, 0x0012, 0x0012, 0x0012, 0x0012, 0x0012, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0307,
+    0x0307, 0x0307, 0x0107, 0x0107, 0x0307, 0x0107, 0x0107, 0x0107,
+    0x0107, 0x0107, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f,
+    0x000f, 0x0113, 0x0113, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
+    0x001d, 0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0307, 0x0307,
-    0x0307, 0x0107, 0x0107, 0x0007, 0x0107, 0x0107, 0x0107, 0x0107,
-    0x0107, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f,
-    0x0113, 0x0113, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
-    0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507,
-    0x0607, 0x0207, 0x0107, 0x0507, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006,
-    0x000a, 0x000a, 0x020e, 0x060e, 0x010d, 0x050f, 0x050f, 0x0523,
-    0x060d, 0x060d, 0x060d, 0x060d, 0x0000, 0x0017, 0x0107, 0x0507,
-    0x0107, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0607,
-    0x0507, 0x0607, 0x0107, 0x0207, 0x0207, 0x0207, 0x0507, 0x0501,
-    0x0513, 0x0513, 0x0513, 0x0513, 0x0513, 0x0516, 0x0521, 0x0521,
-    0x0000, 0x0000, 0x0621, 0x0501, 0x0501, 0x0501, 0x050c, 0x0102,
-    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
-    0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0504,
-    0x0107, 0x0507, 0x0507, 0x0607, 0x0607, 0x0607, 0x0007, 0x0007,
-    0x0007, 0x0207, 0x0207, 0x0407, 0x0407, 0x0507, 0x0007, 0x0105,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000,
+    0x0507, 0x0607, 0x0207, 0x0107, 0x0507, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006,
+    0x0006, 0x000a, 0x000a, 0x020e, 0x060e, 0x010d, 0x050f, 0x050f,
+    0x0523, 0x060d, 0x060d, 0x060d, 0x060d, 0x0000, 0x0017, 0x0107,
+    0x0507, 0x0107, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607,
+    0x0607, 0x0507, 0x0607, 0x0107, 0x0207, 0x0207, 0x0207, 0x0507,
+    0x0501, 0x0513, 0x0513, 0x0513, 0x0513, 0x0513, 0x0516, 0x0521,
+    0x0521, 0x0000, 0x0000, 0x0621, 0x0501, 0x0501, 0x0501, 0x050c,
+    0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
+    0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x0504, 0x0107, 0x0507, 0x0507, 0x0607, 0x0607, 0x0607, 0x0b07,
+    0x0707, 0x0c07, 0x0207, 0x0207, 0x0407, 0x0407, 0x0507, 0x0807,
+    0x0105, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0500, 0x0600, 0x0500, 0x0500, 0x0500, 0x0500,
+    0x0000, 0x0000, 0x0000, 0x0500, 0x0600, 0x0500, 0x0500, 0x0500,
+    0x0500, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x050c, 0x0102,
+    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x010d, 0x060d, 0x060d,
+    0x0507, 0x0607, 0x0207, 0x0107, 0x0507, 0x0507, 0x0116, 0x0017,
+    0x060d, 0x060d, 0x000a, 0x000a, 0x001d, 0x001d, 0x001d, 0x001d,
+    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0003, 0x000a,
+    0x000a, 0x000a, 0x000f, 0x000f, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x0006, 0x0006, 0x0504, 0x0107, 0x0507, 0x0507, 0x0107, 0x0107,
+    0x0107, 0x0507, 0x0107, 0x0507, 0x050f, 0x050f, 0x0116, 0x0116,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x050c, 0x0102, 0x0006,
-    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x010d, 0x060d, 0x060d, 0x0507,
-    0x0607, 0x0207, 0x0107, 0x0507, 0x0507, 0x0116, 0x0017, 0x060d,
-    0x060d, 0x000a, 0x000a, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
-    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0003, 0x000a, 0x000a,
-    0x000a, 0x000f, 0x000f, 0x000a, 0x000a, 0x000a, 0x000a, 0x0006,
-    0x0006, 0x0504, 0x0107, 0x0507, 0x0507, 0x0107, 0x0107, 0x0107,
-    0x0507, 0x0107, 0x0507, 0x050f, 0x050f, 0x0116, 0x0116, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x010d,
-    0x010d, 0x0107, 0x0207, 0x0207, 0x0007, 0x0107, 0x0107, 0x0607,
-    0x050f, 0x050f, 0x050f, 0x050f, 0x0201, 0x0201, 0x0521, 0x0604,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
-    0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a,
-    0x0519, 0x0519, 0x0519, 0x0000, 0x0d19, 0x0619, 0x0619, 0x0619,
-    0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, 0x0619, 0x0619,
-    0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00,
-    0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000,
-    0x000b, 0x000b, 0x0519, 0x001f, 0x001f, 0x0119, 0x0019, 0x0019,
-    0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x001a, 0x001b, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009,
-    0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006,
-    0x0006, 0x0507, 0x0006, 0x0006, 0x0006, 0x0505, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x0501, 0x000a, 0x000a, 0x000a, 0x000a, 0x0107,
-    0x0107, 0x0607, 0x0507, 0x0107, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x0008, 0x0008, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x0008, 0x000d, 0x000d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000d, 0x000a, 0x0001, 0x0000, 0x0000, 0x0000,
+    0x010d, 0x010d, 0x0107, 0x0207, 0x0207, 0x0907, 0x0107, 0x0107,
+    0x0607, 0x050f, 0x050f, 0x050f, 0x050f, 0x0201, 0x0201, 0x0521,
+    0x0604, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
+    0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a,
+    0x000a, 0x0519, 0x0519, 0x0519, 0x0000, 0x0d19, 0x0619, 0x0619,
+    0x0619, 0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, 0x0619,
+    0x0619, 0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00,
+    0x0d00, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000,
+    0x0000, 0x000b, 0x000b, 0x0519, 0x001f, 0x001f, 0x0119, 0x0019,
+    0x0019, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0101, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
-    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
-    0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x010e, 0x0107, 0x0107,
-    0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107,
-    0x0107, 0x0605, 0x0501, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519, 0x0519, 0x0519,
-    0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519,
-    0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0001, 0x0001, 0x0000,
+    0x0000, 0x0000, 0x001a, 0x001b, 0x0000, 0x0000, 0x0009, 0x0009,
+    0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0006, 0x0507, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
-    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-    0x0008, 0x0008, 0x0008, 0x0008, 0x0613, 0x0613, 0x0613, 0x0000,
-    0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x0607, 0x0607, 0x0607, 0x0507, 0x0607, 0x0607, 0x0607, 0x0607,
-    0x050f, 0x050f, 0x010f, 0x0116, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006,
-    0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, 0x000a,
-    0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, 0x0507, 0x0607,
-    0x0607, 0x0207, 0x0207, 0x0507, 0x060e, 0x010e, 0x000e, 0x0005,
+    0x0519, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x001d,
-    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
-    0x001d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0507, 0x0207, 0x0507,
-    0x0607, 0x010e, 0x020e, 0x060e, 0x060e, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000f, 0x000f,
-    0x000f, 0x050f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f,
-    0x000f, 0x000f, 0x050f, 0x010f, 0x0000, 0x0000, 0x000a, 0x000a,
-    0x000a, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x000a,
-    0x0113, 0x0513, 0x0113, 0x000a, 0x000a, 0x0507, 0x0107, 0x0507,
-    0x0507, 0x0607, 0x0307, 0x0307, 0x0507, 0x0507, 0x0007, 0x0107,
-    0x0307, 0x0307, 0x0107, 0x0507, 0x0513, 0x0012, 0x0513, 0x0012,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x0207, 0x0607, 0x0507, 0x0207, 0x0107, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0102, 0x0017, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0006, 0x0006, 0x0507, 0x0006, 0x0006, 0x0006, 0x0505, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x0501, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x0107, 0x0107, 0x0607, 0x0507, 0x0107, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a,
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x000a, 0x0006, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x0008, 0x000d, 0x000d, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000d, 0x000a, 0x0001, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0101, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006,
+    0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006,
+    0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x010e, 0x0107,
+    0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107,
+    0x0107, 0x0107, 0x0605, 0x0501, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519, 0x0519,
+    0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519,
+    0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0001, 0x0001,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0006, 0x0507, 0x001d, 0x001d, 0x001d, 0x001d,
+    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x0008, 0x0008, 0x0008, 0x0008,
+    0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0613, 0x0613, 0x0613,
+    0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x0607, 0x0607, 0x0607, 0x0507, 0x0607, 0x0607, 0x0607,
+    0x0607, 0x050f, 0x050f, 0x010f, 0x0116, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006,
+    0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006,
+    0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, 0x0507,
+    0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x060e, 0x010e, 0x0f0e,
+    0x0b05, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a,
     0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
-    0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x0107, 0x0107, 0x0507,
-    0x0107, 0x0107, 0x0607, 0x0107, 0x0107, 0x0000, 0x0113, 0x0616,
-    0x0000, 0x0000
+    0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d,
+    0x001d, 0x001d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0507, 0x0207,
+    0x0507, 0x0607, 0x010e, 0x020e, 0x060e, 0x060e, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000f,
+    0x000f, 0x000f, 0x050f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f,
+    0x000f, 0x000f, 0x000f, 0x050f, 0x010f, 0x0000, 0x0000, 0x000a,
+    0x000a, 0x000a, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000,
+    0x000a, 0x0113, 0x0513, 0x0113, 0x000a, 0x000a, 0x0507, 0x0107,
+    0x0507, 0x0507, 0x0607, 0x0307, 0x0307, 0x0507, 0x0507, 0x0307,
+    0x0107, 0x0307, 0x0307, 0x0107, 0x0507, 0x0513, 0x0012, 0x0513,
+    0x0012, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x0207, 0x0607, 0x0507, 0x0207, 0x0107, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0102, 0x0017, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x000a, 0x0006,
+    0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a,
+    0x000a, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x0107, 0x0107,
+    0x0507, 0x0107, 0x0107, 0x0607, 0x0107, 0x0107, 0x0000, 0x0113,
+    0x0616, 0x0000, 0x0000
 };
diff --git a/tools/make_unicode b/tools/make_unicode
index e691df662dd..60ca333a4f6 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -1087,7 +1087,7 @@ sub dump_indic($)
             }
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*#/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*#/)
         {
             my $type = $3;
             die "unknown indic $type" unless defined $indic_types{$type};
@@ -1110,20 +1110,20 @@ sub dump_indic($)
         next if /^\#/;  # skip comments
         next if /^\s*$/;  # skip empty lines
         next if /\x1a/;  # skip ^Z
-        if (/^\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z]+)\s*#/)
+        if (/^\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z_]+)\s*#/)
         {
             my $type = $2;
             die "unknown matra $type" unless defined $matra_types{$type};
-            $indic_table[hex $1] += $matra_types{$type} << 8;
+            $indic_table[hex $1] |= $matra_types{$type} << 8;
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*#/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*#/)
         {
             my $type = $3;
             die "unknown matra $type" unless defined $matra_types{$type};
             foreach my $i (hex $1 .. hex $2)
             {
-                $indic_table[$i] += $matra_types{$type} << 8;
+                $indic_table[$i] |= $matra_types{$type} << 8;
             }
             next;
         }
@@ -1166,7 +1166,7 @@ sub dump_linebreak($)
             $break_table[hex $1] = $break_types{$type};
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([0-9A-Z][0-9A-Z][0-9A-Z])+\s*/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([0-9A-Z][0-9A-Z][0-9A-Z])+\s*/)
         {
             my $type = $3;
             die "unknown breaktype $type" unless defined $break_types{$type};
@@ -1183,7 +1183,7 @@ sub dump_linebreak($)
             $break_table[hex $1] = $break_types{$type};
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([0-9A-Z][0-9A-Z])+\s*/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([0-9A-Z][0-9A-Z])+\s*/)
         {
             my $type = $3;
             die "unknown breaktype $type" unless defined $break_types{$type};
@@ -1397,7 +1397,7 @@ sub dump_scripts($)
             }
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z_]+)\s*/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z_]+)\s*/)
         {
             $type = $3;
             if (defined $scripts{$type})
@@ -1591,7 +1591,7 @@ sub dump_vertical($)
             }
             next;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*/)
+        elsif (/^\s*([0-9a-fA-F]+)\.\.\s*([0-9a-fA-F]+)\s*;\s*([A-Za-z_]+)\s*/)
         {
             my $type = $3;
             die "unknown vertical $type" unless defined $vertical_types{$type};