diff --git a/dlls/kernelbase/decompose.c b/dlls/kernelbase/decompose.c
index a6558917505..4312e562ee4 100644
--- a/dlls/kernelbase/decompose.c
+++ b/dlls/kernelbase/decompose.c
@@ -4,7 +4,7 @@
 
 #include "windef.h"
 
-const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
+const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
 {
     /* index */
     0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0100, 0x0160, 0x0100,
@@ -569,42 +569,42 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
     0x16ee, 0x16ef, 0x16f0, 0x16f1, 0x16f2, 0x16f3, 0x16f4, 0x16f5,
     /* offsets 0xfa60 .. 0xfa6f */
     0x16f6, 0x16f7, 0x16f8, 0x16f9, 0x16fa, 0x16fb, 0x16fc, 0x16fd,
-    0x16fe, 0x16ff, 0x1700, 0x1701, 0x1702, 0x1702, 0x1703, 0x1703,
+    0x16fe, 0x16ff, 0x1700, 0x1701, 0x1702, 0x1704, 0x1705, 0x1705,
     /* offsets 0xfa70 .. 0xfa7f */
-    0x1703, 0x1704, 0x1705, 0x1706, 0x1707, 0x1708, 0x1709, 0x170a,
-    0x170b, 0x170c, 0x170d, 0x170e, 0x170f, 0x1710, 0x1711, 0x1712,
+    0x1705, 0x1706, 0x1707, 0x1708, 0x1709, 0x170a, 0x170b, 0x170c,
+    0x170d, 0x170e, 0x170f, 0x1710, 0x1711, 0x1712, 0x1713, 0x1714,
     /* offsets 0xfa80 .. 0xfa8f */
-    0x1713, 0x1714, 0x1715, 0x1716, 0x1717, 0x1718, 0x1719, 0x171a,
-    0x171b, 0x171c, 0x171d, 0x171e, 0x171f, 0x1720, 0x1721, 0x1722,
+    0x1715, 0x1716, 0x1717, 0x1718, 0x1719, 0x171a, 0x171b, 0x171c,
+    0x171d, 0x171e, 0x171f, 0x1720, 0x1721, 0x1722, 0x1723, 0x1724,
     /* offsets 0xfa90 .. 0xfa9f */
-    0x1723, 0x1724, 0x1725, 0x1726, 0x1727, 0x1728, 0x1729, 0x172a,
-    0x172b, 0x172c, 0x172d, 0x172e, 0x172f, 0x1730, 0x1731, 0x1732,
+    0x1725, 0x1726, 0x1727, 0x1728, 0x1729, 0x172a, 0x172b, 0x172c,
+    0x172d, 0x172e, 0x172f, 0x1730, 0x1731, 0x1732, 0x1733, 0x1734,
     /* offsets 0xfaa0 .. 0xfaaf */
-    0x1733, 0x1734, 0x1735, 0x1736, 0x1737, 0x1738, 0x1739, 0x173a,
-    0x173b, 0x173c, 0x173d, 0x173e, 0x173f, 0x1740, 0x1741, 0x1742,
+    0x1735, 0x1736, 0x1737, 0x1738, 0x1739, 0x173a, 0x173b, 0x173c,
+    0x173d, 0x173e, 0x173f, 0x1740, 0x1741, 0x1742, 0x1743, 0x1744,
     /* offsets 0xfab0 .. 0xfabf */
-    0x1743, 0x1744, 0x1745, 0x1746, 0x1747, 0x1748, 0x1749, 0x174a,
-    0x174b, 0x174c, 0x174d, 0x174e, 0x174f, 0x1750, 0x1751, 0x1752,
+    0x1745, 0x1746, 0x1747, 0x1748, 0x1749, 0x174a, 0x174b, 0x174c,
+    0x174d, 0x174e, 0x174f, 0x1750, 0x1751, 0x1752, 0x1753, 0x1754,
     /* offsets 0xfac0 .. 0xfacf */
-    0x1753, 0x1754, 0x1755, 0x1756, 0x1757, 0x1758, 0x1759, 0x175a,
-    0x175b, 0x175c, 0x175d, 0x175e, 0x175f, 0x1760, 0x1761, 0x1762,
+    0x1755, 0x1756, 0x1757, 0x1758, 0x1759, 0x175a, 0x175b, 0x175c,
+    0x175d, 0x175e, 0x175f, 0x1760, 0x1761, 0x1762, 0x1763, 0x1764,
     /* offsets 0xfad0 .. 0xfadf */
-    0x1762, 0x1762, 0x1762, 0x1763, 0x1764, 0x1765, 0x1765, 0x1765,
-    0x1765, 0x1766, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767,
+    0x1766, 0x1768, 0x176a, 0x176b, 0x176c, 0x176d, 0x176f, 0x1771,
+    0x1773, 0x1774, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775,
     /* offsets 0xfb10 .. 0xfb1f */
-    0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767,
-    0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1769, 0x1769,
+    0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775,
+    0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1777, 0x1777,
     /* offsets 0xfb20 .. 0xfb2f */
-    0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b,
-    0x176b, 0x176b, 0x176b, 0x176d, 0x176f, 0x1772, 0x1775, 0x1777,
+    0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779,
+    0x1779, 0x1779, 0x1779, 0x177b, 0x177d, 0x1780, 0x1783, 0x1785,
     /* offsets 0xfb30 .. 0xfb3f */
-    0x1779, 0x177b, 0x177d, 0x177f, 0x1781, 0x1783, 0x1785, 0x1787,
-    0x1787, 0x1789, 0x178b, 0x178d, 0x178f, 0x1791, 0x1791, 0x1793,
+    0x1787, 0x1789, 0x178b, 0x178d, 0x178f, 0x1791, 0x1793, 0x1795,
+    0x1795, 0x1797, 0x1799, 0x179b, 0x179d, 0x179f, 0x179f, 0x17a1,
     /* offsets 0xfb40 .. 0xfb4f */
-    0x1793, 0x1795, 0x1797, 0x1797, 0x1799, 0x179b, 0x179b, 0x179d,
-    0x179f, 0x17a1, 0x17a3, 0x17a5, 0x17a7, 0x17a9, 0x17ab, 0x17ad,
+    0x17a1, 0x17a3, 0x17a5, 0x17a5, 0x17a7, 0x17a9, 0x17a9, 0x17ab,
+    0x17ad, 0x17af, 0x17b1, 0x17b3, 0x17b5, 0x17b7, 0x17b9, 0x17bb,
     /* offset sentinel */
-    0x17ad,
+    0x17bb,
     /* data */
     0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303,
     0x0041, 0x0308, 0x0041, 0x030a, 0x0043, 0x0327, 0x0045, 0x0300,
@@ -934,26 +934,28 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
     0x798e, 0x7a40, 0x7a81, 0x7bc0, 0x7df4, 0x7e09, 0x7e41, 0x7f72,
     0x8005, 0x81ed, 0x8279, 0x8279, 0x8457, 0x8910, 0x8996, 0x8b01,
     0x8b39, 0x8cd3, 0x8d08, 0x8fb6, 0x9038, 0x96e3, 0x97ff, 0x983b,
-    0x6075, 0x8218, 0x4e26, 0x51b5, 0x5168, 0x4f80, 0x5145, 0x5180,
-    0x52c7, 0x52fa, 0x559d, 0x5555, 0x5599, 0x55e2, 0x585a, 0x58b3,
-    0x5944, 0x5954, 0x5a62, 0x5b28, 0x5ed2, 0x5ed9, 0x5f69, 0x5fad,
-    0x60d8, 0x614e, 0x6108, 0x618e, 0x6160, 0x61f2, 0x6234, 0x63c4,
-    0x641c, 0x6452, 0x6556, 0x6674, 0x6717, 0x671b, 0x6756, 0x6b79,
-    0x6bba, 0x6d41, 0x6edb, 0x6ecb, 0x6f22, 0x701e, 0x716e, 0x77a7,
-    0x7235, 0x72af, 0x732a, 0x7471, 0x7506, 0x753b, 0x761d, 0x761f,
-    0x76ca, 0x76db, 0x76f4, 0x774a, 0x7740, 0x78cc, 0x7ab1, 0x7bc0,
-    0x7c7b, 0x7d5b, 0x7df4, 0x7f3e, 0x8005, 0x8352, 0x83ef, 0x8779,
-    0x8941, 0x8986, 0x8996, 0x8abf, 0x8af8, 0x8acb, 0x8b01, 0x8afe,
-    0x8aed, 0x8b39, 0x8b8a, 0x8d08, 0x8f38, 0x9072, 0x9199, 0x9276,
-    0x967c, 0x96e3, 0x9756, 0x97db, 0x97ff, 0x980b, 0x983b, 0x9b12,
-    0x9f9c, 0x3b9d, 0x4018, 0x4039, 0x9f43, 0x9f8e, 0x05d9, 0x05b4,
-    0x05f2, 0x05b7, 0x05e9, 0x05c1, 0x05e9, 0x05c2, 0x05e9, 0x05bc,
-    0x05c1, 0x05e9, 0x05bc, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8,
-    0x05d0, 0x05bc, 0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc,
-    0x05d4, 0x05bc, 0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x05d8, 0x05bc,
-    0x05d9, 0x05bc, 0x05da, 0x05bc, 0x05db, 0x05bc, 0x05dc, 0x05bc,
-    0x05de, 0x05bc, 0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x05e3, 0x05bc,
-    0x05e4, 0x05bc, 0x05e6, 0x05bc, 0x05e7, 0x05bc, 0x05e8, 0x05bc,
-    0x05e9, 0x05bc, 0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf,
-    0x05db, 0x05bf, 0x05e4, 0x05bf
+    0x6075, 0xd850, 0xdeee, 0x8218, 0x4e26, 0x51b5, 0x5168, 0x4f80,
+    0x5145, 0x5180, 0x52c7, 0x52fa, 0x559d, 0x5555, 0x5599, 0x55e2,
+    0x585a, 0x58b3, 0x5944, 0x5954, 0x5a62, 0x5b28, 0x5ed2, 0x5ed9,
+    0x5f69, 0x5fad, 0x60d8, 0x614e, 0x6108, 0x618e, 0x6160, 0x61f2,
+    0x6234, 0x63c4, 0x641c, 0x6452, 0x6556, 0x6674, 0x6717, 0x671b,
+    0x6756, 0x6b79, 0x6bba, 0x6d41, 0x6edb, 0x6ecb, 0x6f22, 0x701e,
+    0x716e, 0x77a7, 0x7235, 0x72af, 0x732a, 0x7471, 0x7506, 0x753b,
+    0x761d, 0x761f, 0x76ca, 0x76db, 0x76f4, 0x774a, 0x7740, 0x78cc,
+    0x7ab1, 0x7bc0, 0x7c7b, 0x7d5b, 0x7df4, 0x7f3e, 0x8005, 0x8352,
+    0x83ef, 0x8779, 0x8941, 0x8986, 0x8996, 0x8abf, 0x8af8, 0x8acb,
+    0x8b01, 0x8afe, 0x8aed, 0x8b39, 0x8b8a, 0x8d08, 0x8f38, 0x9072,
+    0x9199, 0x9276, 0x967c, 0x96e3, 0x9756, 0x97db, 0x97ff, 0x980b,
+    0x983b, 0x9b12, 0x9f9c, 0xd84a, 0xdc4a, 0xd84a, 0xdc44, 0xd84c,
+    0xdfd5, 0x3b9d, 0x4018, 0x4039, 0xd854, 0xde49, 0xd857, 0xdcd0,
+    0xd85f, 0xded3, 0x9f43, 0x9f8e, 0x05d9, 0x05b4, 0x05f2, 0x05b7,
+    0x05e9, 0x05c1, 0x05e9, 0x05c2, 0x05e9, 0x05bc, 0x05c1, 0x05e9,
+    0x05bc, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8, 0x05d0, 0x05bc,
+    0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc, 0x05d4, 0x05bc,
+    0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x05d8, 0x05bc, 0x05d9, 0x05bc,
+    0x05da, 0x05bc, 0x05db, 0x05bc, 0x05dc, 0x05bc, 0x05de, 0x05bc,
+    0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x05e3, 0x05bc, 0x05e4, 0x05bc,
+    0x05e6, 0x05bc, 0x05e7, 0x05bc, 0x05e8, 0x05bc, 0x05e9, 0x05bc,
+    0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf,
+    0x05e4, 0x05bf
 };
diff --git a/libs/port/decompose.c b/libs/port/decompose.c
index 394328fb5e7..5027a87bad5 100644
--- a/libs/port/decompose.c
+++ b/libs/port/decompose.c
@@ -4,7 +4,7 @@
 
 #include "windef.h"
 
-const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
+const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
 {
     /* index */
     0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0100, 0x0160, 0x0100,
@@ -569,42 +569,42 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
     0x16ee, 0x16ef, 0x16f0, 0x16f1, 0x16f2, 0x16f3, 0x16f4, 0x16f5,
     /* offsets 0xfa60 .. 0xfa6f */
     0x16f6, 0x16f7, 0x16f8, 0x16f9, 0x16fa, 0x16fb, 0x16fc, 0x16fd,
-    0x16fe, 0x16ff, 0x1700, 0x1701, 0x1702, 0x1702, 0x1703, 0x1703,
+    0x16fe, 0x16ff, 0x1700, 0x1701, 0x1702, 0x1704, 0x1705, 0x1705,
     /* offsets 0xfa70 .. 0xfa7f */
-    0x1703, 0x1704, 0x1705, 0x1706, 0x1707, 0x1708, 0x1709, 0x170a,
-    0x170b, 0x170c, 0x170d, 0x170e, 0x170f, 0x1710, 0x1711, 0x1712,
+    0x1705, 0x1706, 0x1707, 0x1708, 0x1709, 0x170a, 0x170b, 0x170c,
+    0x170d, 0x170e, 0x170f, 0x1710, 0x1711, 0x1712, 0x1713, 0x1714,
     /* offsets 0xfa80 .. 0xfa8f */
-    0x1713, 0x1714, 0x1715, 0x1716, 0x1717, 0x1718, 0x1719, 0x171a,
-    0x171b, 0x171c, 0x171d, 0x171e, 0x171f, 0x1720, 0x1721, 0x1722,
+    0x1715, 0x1716, 0x1717, 0x1718, 0x1719, 0x171a, 0x171b, 0x171c,
+    0x171d, 0x171e, 0x171f, 0x1720, 0x1721, 0x1722, 0x1723, 0x1724,
     /* offsets 0xfa90 .. 0xfa9f */
-    0x1723, 0x1724, 0x1725, 0x1726, 0x1727, 0x1728, 0x1729, 0x172a,
-    0x172b, 0x172c, 0x172d, 0x172e, 0x172f, 0x1730, 0x1731, 0x1732,
+    0x1725, 0x1726, 0x1727, 0x1728, 0x1729, 0x172a, 0x172b, 0x172c,
+    0x172d, 0x172e, 0x172f, 0x1730, 0x1731, 0x1732, 0x1733, 0x1734,
     /* offsets 0xfaa0 .. 0xfaaf */
-    0x1733, 0x1734, 0x1735, 0x1736, 0x1737, 0x1738, 0x1739, 0x173a,
-    0x173b, 0x173c, 0x173d, 0x173e, 0x173f, 0x1740, 0x1741, 0x1742,
+    0x1735, 0x1736, 0x1737, 0x1738, 0x1739, 0x173a, 0x173b, 0x173c,
+    0x173d, 0x173e, 0x173f, 0x1740, 0x1741, 0x1742, 0x1743, 0x1744,
     /* offsets 0xfab0 .. 0xfabf */
-    0x1743, 0x1744, 0x1745, 0x1746, 0x1747, 0x1748, 0x1749, 0x174a,
-    0x174b, 0x174c, 0x174d, 0x174e, 0x174f, 0x1750, 0x1751, 0x1752,
+    0x1745, 0x1746, 0x1747, 0x1748, 0x1749, 0x174a, 0x174b, 0x174c,
+    0x174d, 0x174e, 0x174f, 0x1750, 0x1751, 0x1752, 0x1753, 0x1754,
     /* offsets 0xfac0 .. 0xfacf */
-    0x1753, 0x1754, 0x1755, 0x1756, 0x1757, 0x1758, 0x1759, 0x175a,
-    0x175b, 0x175c, 0x175d, 0x175e, 0x175f, 0x1760, 0x1761, 0x1762,
+    0x1755, 0x1756, 0x1757, 0x1758, 0x1759, 0x175a, 0x175b, 0x175c,
+    0x175d, 0x175e, 0x175f, 0x1760, 0x1761, 0x1762, 0x1763, 0x1764,
     /* offsets 0xfad0 .. 0xfadf */
-    0x1762, 0x1762, 0x1762, 0x1763, 0x1764, 0x1765, 0x1765, 0x1765,
-    0x1765, 0x1766, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767,
+    0x1766, 0x1768, 0x176a, 0x176b, 0x176c, 0x176d, 0x176f, 0x1771,
+    0x1773, 0x1774, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775,
     /* offsets 0xfb10 .. 0xfb1f */
-    0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767,
-    0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1767, 0x1769, 0x1769,
+    0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775,
+    0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1775, 0x1777, 0x1777,
     /* offsets 0xfb20 .. 0xfb2f */
-    0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b, 0x176b,
-    0x176b, 0x176b, 0x176b, 0x176d, 0x176f, 0x1772, 0x1775, 0x1777,
+    0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779, 0x1779,
+    0x1779, 0x1779, 0x1779, 0x177b, 0x177d, 0x1780, 0x1783, 0x1785,
     /* offsets 0xfb30 .. 0xfb3f */
-    0x1779, 0x177b, 0x177d, 0x177f, 0x1781, 0x1783, 0x1785, 0x1787,
-    0x1787, 0x1789, 0x178b, 0x178d, 0x178f, 0x1791, 0x1791, 0x1793,
+    0x1787, 0x1789, 0x178b, 0x178d, 0x178f, 0x1791, 0x1793, 0x1795,
+    0x1795, 0x1797, 0x1799, 0x179b, 0x179d, 0x179f, 0x179f, 0x17a1,
     /* offsets 0xfb40 .. 0xfb4f */
-    0x1793, 0x1795, 0x1797, 0x1797, 0x1799, 0x179b, 0x179b, 0x179d,
-    0x179f, 0x17a1, 0x17a3, 0x17a5, 0x17a7, 0x17a9, 0x17ab, 0x17ad,
+    0x17a1, 0x17a3, 0x17a5, 0x17a5, 0x17a7, 0x17a9, 0x17a9, 0x17ab,
+    0x17ad, 0x17af, 0x17b1, 0x17b3, 0x17b5, 0x17b7, 0x17b9, 0x17bb,
     /* offset sentinel */
-    0x17ad,
+    0x17bb,
     /* data */
     0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303,
     0x0041, 0x0308, 0x0041, 0x030a, 0x0043, 0x0327, 0x0045, 0x0300,
@@ -934,31 +934,33 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6061] =
     0x798e, 0x7a40, 0x7a81, 0x7bc0, 0x7df4, 0x7e09, 0x7e41, 0x7f72,
     0x8005, 0x81ed, 0x8279, 0x8279, 0x8457, 0x8910, 0x8996, 0x8b01,
     0x8b39, 0x8cd3, 0x8d08, 0x8fb6, 0x9038, 0x96e3, 0x97ff, 0x983b,
-    0x6075, 0x8218, 0x4e26, 0x51b5, 0x5168, 0x4f80, 0x5145, 0x5180,
-    0x52c7, 0x52fa, 0x559d, 0x5555, 0x5599, 0x55e2, 0x585a, 0x58b3,
-    0x5944, 0x5954, 0x5a62, 0x5b28, 0x5ed2, 0x5ed9, 0x5f69, 0x5fad,
-    0x60d8, 0x614e, 0x6108, 0x618e, 0x6160, 0x61f2, 0x6234, 0x63c4,
-    0x641c, 0x6452, 0x6556, 0x6674, 0x6717, 0x671b, 0x6756, 0x6b79,
-    0x6bba, 0x6d41, 0x6edb, 0x6ecb, 0x6f22, 0x701e, 0x716e, 0x77a7,
-    0x7235, 0x72af, 0x732a, 0x7471, 0x7506, 0x753b, 0x761d, 0x761f,
-    0x76ca, 0x76db, 0x76f4, 0x774a, 0x7740, 0x78cc, 0x7ab1, 0x7bc0,
-    0x7c7b, 0x7d5b, 0x7df4, 0x7f3e, 0x8005, 0x8352, 0x83ef, 0x8779,
-    0x8941, 0x8986, 0x8996, 0x8abf, 0x8af8, 0x8acb, 0x8b01, 0x8afe,
-    0x8aed, 0x8b39, 0x8b8a, 0x8d08, 0x8f38, 0x9072, 0x9199, 0x9276,
-    0x967c, 0x96e3, 0x9756, 0x97db, 0x97ff, 0x980b, 0x983b, 0x9b12,
-    0x9f9c, 0x3b9d, 0x4018, 0x4039, 0x9f43, 0x9f8e, 0x05d9, 0x05b4,
-    0x05f2, 0x05b7, 0x05e9, 0x05c1, 0x05e9, 0x05c2, 0x05e9, 0x05bc,
-    0x05c1, 0x05e9, 0x05bc, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8,
-    0x05d0, 0x05bc, 0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc,
-    0x05d4, 0x05bc, 0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x05d8, 0x05bc,
-    0x05d9, 0x05bc, 0x05da, 0x05bc, 0x05db, 0x05bc, 0x05dc, 0x05bc,
-    0x05de, 0x05bc, 0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x05e3, 0x05bc,
-    0x05e4, 0x05bc, 0x05e6, 0x05bc, 0x05e7, 0x05bc, 0x05e8, 0x05bc,
-    0x05e9, 0x05bc, 0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf,
-    0x05db, 0x05bf, 0x05e4, 0x05bf
+    0x6075, 0xd850, 0xdeee, 0x8218, 0x4e26, 0x51b5, 0x5168, 0x4f80,
+    0x5145, 0x5180, 0x52c7, 0x52fa, 0x559d, 0x5555, 0x5599, 0x55e2,
+    0x585a, 0x58b3, 0x5944, 0x5954, 0x5a62, 0x5b28, 0x5ed2, 0x5ed9,
+    0x5f69, 0x5fad, 0x60d8, 0x614e, 0x6108, 0x618e, 0x6160, 0x61f2,
+    0x6234, 0x63c4, 0x641c, 0x6452, 0x6556, 0x6674, 0x6717, 0x671b,
+    0x6756, 0x6b79, 0x6bba, 0x6d41, 0x6edb, 0x6ecb, 0x6f22, 0x701e,
+    0x716e, 0x77a7, 0x7235, 0x72af, 0x732a, 0x7471, 0x7506, 0x753b,
+    0x761d, 0x761f, 0x76ca, 0x76db, 0x76f4, 0x774a, 0x7740, 0x78cc,
+    0x7ab1, 0x7bc0, 0x7c7b, 0x7d5b, 0x7df4, 0x7f3e, 0x8005, 0x8352,
+    0x83ef, 0x8779, 0x8941, 0x8986, 0x8996, 0x8abf, 0x8af8, 0x8acb,
+    0x8b01, 0x8afe, 0x8aed, 0x8b39, 0x8b8a, 0x8d08, 0x8f38, 0x9072,
+    0x9199, 0x9276, 0x967c, 0x96e3, 0x9756, 0x97db, 0x97ff, 0x980b,
+    0x983b, 0x9b12, 0x9f9c, 0xd84a, 0xdc4a, 0xd84a, 0xdc44, 0xd84c,
+    0xdfd5, 0x3b9d, 0x4018, 0x4039, 0xd854, 0xde49, 0xd857, 0xdcd0,
+    0xd85f, 0xded3, 0x9f43, 0x9f8e, 0x05d9, 0x05b4, 0x05f2, 0x05b7,
+    0x05e9, 0x05c1, 0x05e9, 0x05c2, 0x05e9, 0x05bc, 0x05c1, 0x05e9,
+    0x05bc, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8, 0x05d0, 0x05bc,
+    0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc, 0x05d4, 0x05bc,
+    0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x05d8, 0x05bc, 0x05d9, 0x05bc,
+    0x05da, 0x05bc, 0x05db, 0x05bc, 0x05dc, 0x05bc, 0x05de, 0x05bc,
+    0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x05e3, 0x05bc, 0x05e4, 0x05bc,
+    0x05e6, 0x05bc, 0x05e7, 0x05bc, 0x05e8, 0x05bc, 0x05e9, 0x05bc,
+    0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf,
+    0x05e4, 0x05bf
 };
 
-const WCHAR DECLSPEC_HIDDEN nfkd_table[13479] =
+const WCHAR DECLSPEC_HIDDEN nfkd_table[13493] =
 {
     /* index */
     0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, 0x0100,
@@ -1919,249 +1921,249 @@ const WCHAR DECLSPEC_HIDDEN nfkd_table[13479] =
     0x2cf0, 0x2cf1, 0x2cf2, 0x2cf3, 0x2cf4, 0x2cf5, 0x2cf6, 0x2cf7,
     /* offsets 0xfa60 .. 0xfa6f */
     0x2cf8, 0x2cf9, 0x2cfa, 0x2cfb, 0x2cfc, 0x2cfd, 0x2cfe, 0x2cff,
-    0x2d00, 0x2d01, 0x2d02, 0x2d03, 0x2d04, 0x2d04, 0x2d05, 0x2d05,
+    0x2d00, 0x2d01, 0x2d02, 0x2d03, 0x2d04, 0x2d06, 0x2d07, 0x2d07,
     /* offsets 0xfa70 .. 0xfa7f */
-    0x2d05, 0x2d06, 0x2d07, 0x2d08, 0x2d09, 0x2d0a, 0x2d0b, 0x2d0c,
-    0x2d0d, 0x2d0e, 0x2d0f, 0x2d10, 0x2d11, 0x2d12, 0x2d13, 0x2d14,
+    0x2d07, 0x2d08, 0x2d09, 0x2d0a, 0x2d0b, 0x2d0c, 0x2d0d, 0x2d0e,
+    0x2d0f, 0x2d10, 0x2d11, 0x2d12, 0x2d13, 0x2d14, 0x2d15, 0x2d16,
     /* offsets 0xfa80 .. 0xfa8f */
-    0x2d15, 0x2d16, 0x2d17, 0x2d18, 0x2d19, 0x2d1a, 0x2d1b, 0x2d1c,
-    0x2d1d, 0x2d1e, 0x2d1f, 0x2d20, 0x2d21, 0x2d22, 0x2d23, 0x2d24,
+    0x2d17, 0x2d18, 0x2d19, 0x2d1a, 0x2d1b, 0x2d1c, 0x2d1d, 0x2d1e,
+    0x2d1f, 0x2d20, 0x2d21, 0x2d22, 0x2d23, 0x2d24, 0x2d25, 0x2d26,
     /* offsets 0xfa90 .. 0xfa9f */
-    0x2d25, 0x2d26, 0x2d27, 0x2d28, 0x2d29, 0x2d2a, 0x2d2b, 0x2d2c,
-    0x2d2d, 0x2d2e, 0x2d2f, 0x2d30, 0x2d31, 0x2d32, 0x2d33, 0x2d34,
+    0x2d27, 0x2d28, 0x2d29, 0x2d2a, 0x2d2b, 0x2d2c, 0x2d2d, 0x2d2e,
+    0x2d2f, 0x2d30, 0x2d31, 0x2d32, 0x2d33, 0x2d34, 0x2d35, 0x2d36,
     /* offsets 0xfaa0 .. 0xfaaf */
-    0x2d35, 0x2d36, 0x2d37, 0x2d38, 0x2d39, 0x2d3a, 0x2d3b, 0x2d3c,
-    0x2d3d, 0x2d3e, 0x2d3f, 0x2d40, 0x2d41, 0x2d42, 0x2d43, 0x2d44,
+    0x2d37, 0x2d38, 0x2d39, 0x2d3a, 0x2d3b, 0x2d3c, 0x2d3d, 0x2d3e,
+    0x2d3f, 0x2d40, 0x2d41, 0x2d42, 0x2d43, 0x2d44, 0x2d45, 0x2d46,
     /* offsets 0xfab0 .. 0xfabf */
-    0x2d45, 0x2d46, 0x2d47, 0x2d48, 0x2d49, 0x2d4a, 0x2d4b, 0x2d4c,
-    0x2d4d, 0x2d4e, 0x2d4f, 0x2d50, 0x2d51, 0x2d52, 0x2d53, 0x2d54,
+    0x2d47, 0x2d48, 0x2d49, 0x2d4a, 0x2d4b, 0x2d4c, 0x2d4d, 0x2d4e,
+    0x2d4f, 0x2d50, 0x2d51, 0x2d52, 0x2d53, 0x2d54, 0x2d55, 0x2d56,
     /* offsets 0xfac0 .. 0xfacf */
-    0x2d55, 0x2d56, 0x2d57, 0x2d58, 0x2d59, 0x2d5a, 0x2d5b, 0x2d5c,
-    0x2d5d, 0x2d5e, 0x2d5f, 0x2d60, 0x2d61, 0x2d62, 0x2d63, 0x2d64,
+    0x2d57, 0x2d58, 0x2d59, 0x2d5a, 0x2d5b, 0x2d5c, 0x2d5d, 0x2d5e,
+    0x2d5f, 0x2d60, 0x2d61, 0x2d62, 0x2d63, 0x2d64, 0x2d65, 0x2d66,
     /* offsets 0xfad0 .. 0xfadf */
-    0x2d64, 0x2d64, 0x2d64, 0x2d65, 0x2d66, 0x2d67, 0x2d67, 0x2d67,
-    0x2d67, 0x2d68, 0x2d69, 0x2d69, 0x2d69, 0x2d69, 0x2d69, 0x2d69,
+    0x2d68, 0x2d6a, 0x2d6c, 0x2d6d, 0x2d6e, 0x2d6f, 0x2d71, 0x2d73,
+    0x2d75, 0x2d76, 0x2d77, 0x2d77, 0x2d77, 0x2d77, 0x2d77, 0x2d77,
     /* offsets 0xfb00 .. 0xfb0f */
-    0x2d69, 0x2d6b, 0x2d6d, 0x2d6f, 0x2d72, 0x2d75, 0x2d77, 0x2d79,
-    0x2d79, 0x2d79, 0x2d79, 0x2d79, 0x2d79, 0x2d79, 0x2d79, 0x2d79,
+    0x2d77, 0x2d79, 0x2d7b, 0x2d7d, 0x2d80, 0x2d83, 0x2d85, 0x2d87,
+    0x2d87, 0x2d87, 0x2d87, 0x2d87, 0x2d87, 0x2d87, 0x2d87, 0x2d87,
     /* offsets 0xfb10 .. 0xfb1f */
-    0x2d79, 0x2d79, 0x2d79, 0x2d79, 0x2d7b, 0x2d7d, 0x2d7f, 0x2d81,
-    0x2d83, 0x2d83, 0x2d83, 0x2d83, 0x2d83, 0x2d83, 0x2d85, 0x2d85,
+    0x2d87, 0x2d87, 0x2d87, 0x2d87, 0x2d89, 0x2d8b, 0x2d8d, 0x2d8f,
+    0x2d91, 0x2d91, 0x2d91, 0x2d91, 0x2d91, 0x2d91, 0x2d93, 0x2d93,
     /* offsets 0xfb20 .. 0xfb2f */
-    0x2d87, 0x2d88, 0x2d89, 0x2d8a, 0x2d8b, 0x2d8c, 0x2d8d, 0x2d8e,
-    0x2d8f, 0x2d90, 0x2d91, 0x2d93, 0x2d95, 0x2d98, 0x2d9b, 0x2d9d,
+    0x2d95, 0x2d96, 0x2d97, 0x2d98, 0x2d99, 0x2d9a, 0x2d9b, 0x2d9c,
+    0x2d9d, 0x2d9e, 0x2d9f, 0x2da1, 0x2da3, 0x2da6, 0x2da9, 0x2dab,
     /* offsets 0xfb30 .. 0xfb3f */
-    0x2d9f, 0x2da1, 0x2da3, 0x2da5, 0x2da7, 0x2da9, 0x2dab, 0x2dad,
-    0x2dad, 0x2daf, 0x2db1, 0x2db3, 0x2db5, 0x2db7, 0x2db7, 0x2db9,
+    0x2dad, 0x2daf, 0x2db1, 0x2db3, 0x2db5, 0x2db7, 0x2db9, 0x2dbb,
+    0x2dbb, 0x2dbd, 0x2dbf, 0x2dc1, 0x2dc3, 0x2dc5, 0x2dc5, 0x2dc7,
     /* offsets 0xfb40 .. 0xfb4f */
-    0x2db9, 0x2dbb, 0x2dbd, 0x2dbd, 0x2dbf, 0x2dc1, 0x2dc1, 0x2dc3,
-    0x2dc5, 0x2dc7, 0x2dc9, 0x2dcb, 0x2dcd, 0x2dcf, 0x2dd1, 0x2dd3,
+    0x2dc7, 0x2dc9, 0x2dcb, 0x2dcb, 0x2dcd, 0x2dcf, 0x2dcf, 0x2dd1,
+    0x2dd3, 0x2dd5, 0x2dd7, 0x2dd9, 0x2ddb, 0x2ddd, 0x2ddf, 0x2de1,
     /* offsets 0xfb50 .. 0xfb5f */
-    0x2dd5, 0x2dd6, 0x2dd7, 0x2dd8, 0x2dd9, 0x2dda, 0x2ddb, 0x2ddc,
-    0x2ddd, 0x2dde, 0x2ddf, 0x2de0, 0x2de1, 0x2de2, 0x2de3, 0x2de4,
+    0x2de3, 0x2de4, 0x2de5, 0x2de6, 0x2de7, 0x2de8, 0x2de9, 0x2dea,
+    0x2deb, 0x2dec, 0x2ded, 0x2dee, 0x2def, 0x2df0, 0x2df1, 0x2df2,
     /* offsets 0xfb60 .. 0xfb6f */
-    0x2de5, 0x2de6, 0x2de7, 0x2de8, 0x2de9, 0x2dea, 0x2deb, 0x2dec,
-    0x2ded, 0x2dee, 0x2def, 0x2df0, 0x2df1, 0x2df2, 0x2df3, 0x2df4,
+    0x2df3, 0x2df4, 0x2df5, 0x2df6, 0x2df7, 0x2df8, 0x2df9, 0x2dfa,
+    0x2dfb, 0x2dfc, 0x2dfd, 0x2dfe, 0x2dff, 0x2e00, 0x2e01, 0x2e02,
     /* offsets 0xfb70 .. 0xfb7f */
-    0x2df5, 0x2df6, 0x2df7, 0x2df8, 0x2df9, 0x2dfa, 0x2dfb, 0x2dfc,
-    0x2dfd, 0x2dfe, 0x2dff, 0x2e00, 0x2e01, 0x2e02, 0x2e03, 0x2e04,
+    0x2e03, 0x2e04, 0x2e05, 0x2e06, 0x2e07, 0x2e08, 0x2e09, 0x2e0a,
+    0x2e0b, 0x2e0c, 0x2e0d, 0x2e0e, 0x2e0f, 0x2e10, 0x2e11, 0x2e12,
     /* offsets 0xfb80 .. 0xfb8f */
-    0x2e05, 0x2e06, 0x2e07, 0x2e08, 0x2e09, 0x2e0a, 0x2e0b, 0x2e0c,
-    0x2e0d, 0x2e0e, 0x2e0f, 0x2e10, 0x2e11, 0x2e12, 0x2e13, 0x2e14,
+    0x2e13, 0x2e14, 0x2e15, 0x2e16, 0x2e17, 0x2e18, 0x2e19, 0x2e1a,
+    0x2e1b, 0x2e1c, 0x2e1d, 0x2e1e, 0x2e1f, 0x2e20, 0x2e21, 0x2e22,
     /* offsets 0xfb90 .. 0xfb9f */
-    0x2e15, 0x2e16, 0x2e17, 0x2e18, 0x2e19, 0x2e1a, 0x2e1b, 0x2e1c,
-    0x2e1d, 0x2e1e, 0x2e1f, 0x2e20, 0x2e21, 0x2e22, 0x2e23, 0x2e24,
+    0x2e23, 0x2e24, 0x2e25, 0x2e26, 0x2e27, 0x2e28, 0x2e29, 0x2e2a,
+    0x2e2b, 0x2e2c, 0x2e2d, 0x2e2e, 0x2e2f, 0x2e30, 0x2e31, 0x2e32,
     /* offsets 0xfba0 .. 0xfbaf */
-    0x2e25, 0x2e26, 0x2e27, 0x2e28, 0x2e29, 0x2e2b, 0x2e2d, 0x2e2e,
-    0x2e2f, 0x2e30, 0x2e31, 0x2e32, 0x2e33, 0x2e34, 0x2e35, 0x2e36,
+    0x2e33, 0x2e34, 0x2e35, 0x2e36, 0x2e37, 0x2e39, 0x2e3b, 0x2e3c,
+    0x2e3d, 0x2e3e, 0x2e3f, 0x2e40, 0x2e41, 0x2e42, 0x2e43, 0x2e44,
     /* offsets 0xfbb0 .. 0xfbbf */
-    0x2e37, 0x2e39, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b,
-    0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b,
+    0x2e45, 0x2e47, 0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49,
+    0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e49,
     /* offsets 0xfbd0 .. 0xfbdf */
-    0x2e3b, 0x2e3b, 0x2e3b, 0x2e3b, 0x2e3c, 0x2e3d, 0x2e3e, 0x2e3f,
-    0x2e40, 0x2e41, 0x2e42, 0x2e43, 0x2e44, 0x2e45, 0x2e47, 0x2e48,
+    0x2e49, 0x2e49, 0x2e49, 0x2e49, 0x2e4a, 0x2e4b, 0x2e4c, 0x2e4d,
+    0x2e4e, 0x2e4f, 0x2e50, 0x2e51, 0x2e52, 0x2e53, 0x2e55, 0x2e56,
     /* offsets 0xfbe0 .. 0xfbef */
-    0x2e49, 0x2e4a, 0x2e4b, 0x2e4c, 0x2e4d, 0x2e4e, 0x2e4f, 0x2e50,
-    0x2e51, 0x2e52, 0x2e53, 0x2e56, 0x2e59, 0x2e5c, 0x2e5f, 0x2e62,
+    0x2e57, 0x2e58, 0x2e59, 0x2e5a, 0x2e5b, 0x2e5c, 0x2e5d, 0x2e5e,
+    0x2e5f, 0x2e60, 0x2e61, 0x2e64, 0x2e67, 0x2e6a, 0x2e6d, 0x2e70,
     /* offsets 0xfbf0 .. 0xfbff */
-    0x2e65, 0x2e68, 0x2e6b, 0x2e6e, 0x2e71, 0x2e74, 0x2e77, 0x2e7a,
-    0x2e7d, 0x2e80, 0x2e83, 0x2e86, 0x2e89, 0x2e8a, 0x2e8b, 0x2e8c,
+    0x2e73, 0x2e76, 0x2e79, 0x2e7c, 0x2e7f, 0x2e82, 0x2e85, 0x2e88,
+    0x2e8b, 0x2e8e, 0x2e91, 0x2e94, 0x2e97, 0x2e98, 0x2e99, 0x2e9a,
     /* offsets 0xfc00 .. 0xfc0f */
-    0x2e8d, 0x2e90, 0x2e93, 0x2e96, 0x2e99, 0x2e9c, 0x2e9e, 0x2ea0,
-    0x2ea2, 0x2ea4, 0x2ea6, 0x2ea8, 0x2eaa, 0x2eac, 0x2eae, 0x2eb0,
+    0x2e9b, 0x2e9e, 0x2ea1, 0x2ea4, 0x2ea7, 0x2eaa, 0x2eac, 0x2eae,
+    0x2eb0, 0x2eb2, 0x2eb4, 0x2eb6, 0x2eb8, 0x2eba, 0x2ebc, 0x2ebe,
     /* offsets 0xfc10 .. 0xfc1f */
-    0x2eb2, 0x2eb4, 0x2eb6, 0x2eb8, 0x2eba, 0x2ebc, 0x2ebe, 0x2ec0,
-    0x2ec2, 0x2ec4, 0x2ec6, 0x2ec8, 0x2eca, 0x2ecc, 0x2ece, 0x2ed0,
+    0x2ec0, 0x2ec2, 0x2ec4, 0x2ec6, 0x2ec8, 0x2eca, 0x2ecc, 0x2ece,
+    0x2ed0, 0x2ed2, 0x2ed4, 0x2ed6, 0x2ed8, 0x2eda, 0x2edc, 0x2ede,
     /* offsets 0xfc20 .. 0xfc2f */
-    0x2ed2, 0x2ed4, 0x2ed6, 0x2ed8, 0x2eda, 0x2edc, 0x2ede, 0x2ee0,
-    0x2ee2, 0x2ee4, 0x2ee6, 0x2ee8, 0x2eea, 0x2eec, 0x2eee, 0x2ef0,
+    0x2ee0, 0x2ee2, 0x2ee4, 0x2ee6, 0x2ee8, 0x2eea, 0x2eec, 0x2eee,
+    0x2ef0, 0x2ef2, 0x2ef4, 0x2ef6, 0x2ef8, 0x2efa, 0x2efc, 0x2efe,
     /* offsets 0xfc30 .. 0xfc3f */
-    0x2ef2, 0x2ef4, 0x2ef6, 0x2ef8, 0x2efa, 0x2efc, 0x2efe, 0x2f00,
-    0x2f02, 0x2f04, 0x2f06, 0x2f08, 0x2f0a, 0x2f0c, 0x2f0e, 0x2f10,
+    0x2f00, 0x2f02, 0x2f04, 0x2f06, 0x2f08, 0x2f0a, 0x2f0c, 0x2f0e,
+    0x2f10, 0x2f12, 0x2f14, 0x2f16, 0x2f18, 0x2f1a, 0x2f1c, 0x2f1e,
     /* offsets 0xfc40 .. 0xfc4f */
-    0x2f12, 0x2f14, 0x2f16, 0x2f18, 0x2f1a, 0x2f1c, 0x2f1e, 0x2f20,
-    0x2f22, 0x2f24, 0x2f26, 0x2f28, 0x2f2a, 0x2f2c, 0x2f2e, 0x2f30,
+    0x2f20, 0x2f22, 0x2f24, 0x2f26, 0x2f28, 0x2f2a, 0x2f2c, 0x2f2e,
+    0x2f30, 0x2f32, 0x2f34, 0x2f36, 0x2f38, 0x2f3a, 0x2f3c, 0x2f3e,
     /* offsets 0xfc50 .. 0xfc5f */
-    0x2f32, 0x2f34, 0x2f36, 0x2f38, 0x2f3a, 0x2f3c, 0x2f3e, 0x2f40,
-    0x2f42, 0x2f44, 0x2f46, 0x2f48, 0x2f4a, 0x2f4c, 0x2f4e, 0x2f51,
+    0x2f40, 0x2f42, 0x2f44, 0x2f46, 0x2f48, 0x2f4a, 0x2f4c, 0x2f4e,
+    0x2f50, 0x2f52, 0x2f54, 0x2f56, 0x2f58, 0x2f5a, 0x2f5c, 0x2f5f,
     /* offsets 0xfc60 .. 0xfc6f */
-    0x2f54, 0x2f57, 0x2f5a, 0x2f5d, 0x2f60, 0x2f63, 0x2f66, 0x2f69,
-    0x2f6c, 0x2f6f, 0x2f72, 0x2f74, 0x2f76, 0x2f78, 0x2f7a, 0x2f7c,
+    0x2f62, 0x2f65, 0x2f68, 0x2f6b, 0x2f6e, 0x2f71, 0x2f74, 0x2f77,
+    0x2f7a, 0x2f7d, 0x2f80, 0x2f82, 0x2f84, 0x2f86, 0x2f88, 0x2f8a,
     /* offsets 0xfc70 .. 0xfc7f */
-    0x2f7e, 0x2f80, 0x2f82, 0x2f84, 0x2f86, 0x2f88, 0x2f8a, 0x2f8c,
-    0x2f8e, 0x2f90, 0x2f92, 0x2f94, 0x2f96, 0x2f98, 0x2f9a, 0x2f9c,
+    0x2f8c, 0x2f8e, 0x2f90, 0x2f92, 0x2f94, 0x2f96, 0x2f98, 0x2f9a,
+    0x2f9c, 0x2f9e, 0x2fa0, 0x2fa2, 0x2fa4, 0x2fa6, 0x2fa8, 0x2faa,
     /* offsets 0xfc80 .. 0xfc8f */
-    0x2f9e, 0x2fa0, 0x2fa2, 0x2fa4, 0x2fa6, 0x2fa8, 0x2faa, 0x2fac,
-    0x2fae, 0x2fb0, 0x2fb2, 0x2fb4, 0x2fb6, 0x2fb8, 0x2fba, 0x2fbc,
+    0x2fac, 0x2fae, 0x2fb0, 0x2fb2, 0x2fb4, 0x2fb6, 0x2fb8, 0x2fba,
+    0x2fbc, 0x2fbe, 0x2fc0, 0x2fc2, 0x2fc4, 0x2fc6, 0x2fc8, 0x2fca,
     /* offsets 0xfc90 .. 0xfc9f */
-    0x2fbe, 0x2fc0, 0x2fc2, 0x2fc4, 0x2fc6, 0x2fc8, 0x2fca, 0x2fcc,
-    0x2fcf, 0x2fd2, 0x2fd5, 0x2fd8, 0x2fdb, 0x2fdd, 0x2fdf, 0x2fe1,
+    0x2fcc, 0x2fce, 0x2fd0, 0x2fd2, 0x2fd4, 0x2fd6, 0x2fd8, 0x2fda,
+    0x2fdd, 0x2fe0, 0x2fe3, 0x2fe6, 0x2fe9, 0x2feb, 0x2fed, 0x2fef,
     /* offsets 0xfca0 .. 0xfcaf */
-    0x2fe3, 0x2fe5, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1,
-    0x2ff3, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffb, 0x2ffd, 0x2fff, 0x3001,
+    0x2ff1, 0x2ff3, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffb, 0x2ffd, 0x2fff,
+    0x3001, 0x3003, 0x3005, 0x3007, 0x3009, 0x300b, 0x300d, 0x300f,
     /* offsets 0xfcb0 .. 0xfcbf */
-    0x3003, 0x3005, 0x3007, 0x3009, 0x300b, 0x300d, 0x300f, 0x3011,
-    0x3013, 0x3015, 0x3017, 0x3019, 0x301b, 0x301d, 0x301f, 0x3021,
+    0x3011, 0x3013, 0x3015, 0x3017, 0x3019, 0x301b, 0x301d, 0x301f,
+    0x3021, 0x3023, 0x3025, 0x3027, 0x3029, 0x302b, 0x302d, 0x302f,
     /* offsets 0xfcc0 .. 0xfccf */
-    0x3023, 0x3025, 0x3027, 0x3029, 0x302b, 0x302d, 0x302f, 0x3031,
-    0x3033, 0x3035, 0x3037, 0x3039, 0x303b, 0x303d, 0x303f, 0x3041,
+    0x3031, 0x3033, 0x3035, 0x3037, 0x3039, 0x303b, 0x303d, 0x303f,
+    0x3041, 0x3043, 0x3045, 0x3047, 0x3049, 0x304b, 0x304d, 0x304f,
     /* offsets 0xfcd0 .. 0xfcdf */
-    0x3043, 0x3045, 0x3047, 0x3049, 0x304b, 0x304d, 0x304f, 0x3051,
-    0x3053, 0x3055, 0x3057, 0x3059, 0x305b, 0x305d, 0x305f, 0x3061,
+    0x3051, 0x3053, 0x3055, 0x3057, 0x3059, 0x305b, 0x305d, 0x305f,
+    0x3061, 0x3063, 0x3065, 0x3067, 0x3069, 0x306b, 0x306d, 0x306f,
     /* offsets 0xfce0 .. 0xfcef */
-    0x3064, 0x3067, 0x3069, 0x306b, 0x306d, 0x306f, 0x3071, 0x3073,
-    0x3075, 0x3077, 0x3079, 0x307b, 0x307d, 0x307f, 0x3081, 0x3083,
+    0x3072, 0x3075, 0x3077, 0x3079, 0x307b, 0x307d, 0x307f, 0x3081,
+    0x3083, 0x3085, 0x3087, 0x3089, 0x308b, 0x308d, 0x308f, 0x3091,
     /* offsets 0xfcf0 .. 0xfcff */
-    0x3085, 0x3087, 0x3089, 0x308c, 0x308f, 0x3092, 0x3094, 0x3096,
-    0x3098, 0x309a, 0x309c, 0x309e, 0x30a0, 0x30a2, 0x30a4, 0x30a6,
+    0x3093, 0x3095, 0x3097, 0x309a, 0x309d, 0x30a0, 0x30a2, 0x30a4,
+    0x30a6, 0x30a8, 0x30aa, 0x30ac, 0x30ae, 0x30b0, 0x30b2, 0x30b4,
     /* offsets 0xfd00 .. 0xfd0f */
-    0x30a8, 0x30aa, 0x30ac, 0x30ae, 0x30b0, 0x30b2, 0x30b4, 0x30b6,
-    0x30b8, 0x30ba, 0x30bc, 0x30be, 0x30c0, 0x30c2, 0x30c4, 0x30c6,
+    0x30b6, 0x30b8, 0x30ba, 0x30bc, 0x30be, 0x30c0, 0x30c2, 0x30c4,
+    0x30c6, 0x30c8, 0x30ca, 0x30cc, 0x30ce, 0x30d0, 0x30d2, 0x30d4,
     /* offsets 0xfd10 .. 0xfd1f */
-    0x30c8, 0x30ca, 0x30cc, 0x30ce, 0x30d0, 0x30d2, 0x30d4, 0x30d6,
-    0x30d8, 0x30da, 0x30dc, 0x30de, 0x30e0, 0x30e2, 0x30e4, 0x30e6,
+    0x30d6, 0x30d8, 0x30da, 0x30dc, 0x30de, 0x30e0, 0x30e2, 0x30e4,
+    0x30e6, 0x30e8, 0x30ea, 0x30ec, 0x30ee, 0x30f0, 0x30f2, 0x30f4,
     /* offsets 0xfd20 .. 0xfd2f */
-    0x30e8, 0x30ea, 0x30ec, 0x30ee, 0x30f0, 0x30f2, 0x30f4, 0x30f6,
-    0x30f8, 0x30fa, 0x30fc, 0x30fe, 0x3100, 0x3102, 0x3104, 0x3106,
+    0x30f6, 0x30f8, 0x30fa, 0x30fc, 0x30fe, 0x3100, 0x3102, 0x3104,
+    0x3106, 0x3108, 0x310a, 0x310c, 0x310e, 0x3110, 0x3112, 0x3114,
     /* offsets 0xfd30 .. 0xfd3f */
-    0x3108, 0x310a, 0x310c, 0x310e, 0x3110, 0x3112, 0x3114, 0x3116,
-    0x3118, 0x311a, 0x311c, 0x311e, 0x3120, 0x3122, 0x3124, 0x3124,
+    0x3116, 0x3118, 0x311a, 0x311c, 0x311e, 0x3120, 0x3122, 0x3124,
+    0x3126, 0x3128, 0x312a, 0x312c, 0x312e, 0x3130, 0x3132, 0x3132,
     /* offsets 0xfd50 .. 0xfd5f */
-    0x3124, 0x3127, 0x312a, 0x312d, 0x3130, 0x3133, 0x3136, 0x3139,
-    0x313c, 0x313f, 0x3142, 0x3145, 0x3148, 0x314b, 0x314e, 0x3151,
+    0x3132, 0x3135, 0x3138, 0x313b, 0x313e, 0x3141, 0x3144, 0x3147,
+    0x314a, 0x314d, 0x3150, 0x3153, 0x3156, 0x3159, 0x315c, 0x315f,
     /* offsets 0xfd60 .. 0xfd6f */
-    0x3154, 0x3157, 0x315a, 0x315d, 0x3160, 0x3163, 0x3166, 0x3169,
-    0x316c, 0x316f, 0x3172, 0x3175, 0x3178, 0x317b, 0x317e, 0x3181,
+    0x3162, 0x3165, 0x3168, 0x316b, 0x316e, 0x3171, 0x3174, 0x3177,
+    0x317a, 0x317d, 0x3180, 0x3183, 0x3186, 0x3189, 0x318c, 0x318f,
     /* offsets 0xfd70 .. 0xfd7f */
-    0x3184, 0x3187, 0x318a, 0x318d, 0x3190, 0x3193, 0x3196, 0x3199,
-    0x319c, 0x319f, 0x31a2, 0x31a5, 0x31a8, 0x31ab, 0x31ae, 0x31b1,
+    0x3192, 0x3195, 0x3198, 0x319b, 0x319e, 0x31a1, 0x31a4, 0x31a7,
+    0x31aa, 0x31ad, 0x31b0, 0x31b3, 0x31b6, 0x31b9, 0x31bc, 0x31bf,
     /* offsets 0xfd80 .. 0xfd8f */
-    0x31b4, 0x31b7, 0x31ba, 0x31bd, 0x31c0, 0x31c3, 0x31c6, 0x31c9,
-    0x31cc, 0x31cf, 0x31d2, 0x31d5, 0x31d8, 0x31db, 0x31de, 0x31e1,
+    0x31c2, 0x31c5, 0x31c8, 0x31cb, 0x31ce, 0x31d1, 0x31d4, 0x31d7,
+    0x31da, 0x31dd, 0x31e0, 0x31e3, 0x31e6, 0x31e9, 0x31ec, 0x31ef,
     /* offsets 0xfd90 .. 0xfd9f */
-    0x31e4, 0x31e4, 0x31e4, 0x31e7, 0x31ea, 0x31ed, 0x31f0, 0x31f3,
-    0x31f6, 0x31f9, 0x31fc, 0x31ff, 0x3202, 0x3205, 0x3208, 0x320b,
+    0x31f2, 0x31f2, 0x31f2, 0x31f5, 0x31f8, 0x31fb, 0x31fe, 0x3201,
+    0x3204, 0x3207, 0x320a, 0x320d, 0x3210, 0x3213, 0x3216, 0x3219,
     /* offsets 0xfda0 .. 0xfdaf */
-    0x320e, 0x3211, 0x3214, 0x3217, 0x321a, 0x321d, 0x3220, 0x3223,
-    0x3226, 0x3229, 0x322c, 0x322f, 0x3232, 0x3235, 0x3238, 0x323b,
+    0x321c, 0x321f, 0x3222, 0x3225, 0x3228, 0x322b, 0x322e, 0x3231,
+    0x3234, 0x3237, 0x323a, 0x323d, 0x3240, 0x3243, 0x3246, 0x3249,
     /* offsets 0xfdb0 .. 0xfdbf */
-    0x323e, 0x3241, 0x3244, 0x3247, 0x324a, 0x324d, 0x3250, 0x3253,
-    0x3256, 0x3259, 0x325c, 0x325f, 0x3262, 0x3265, 0x3268, 0x326b,
+    0x324c, 0x324f, 0x3252, 0x3255, 0x3258, 0x325b, 0x325e, 0x3261,
+    0x3264, 0x3267, 0x326a, 0x326d, 0x3270, 0x3273, 0x3276, 0x3279,
     /* offsets 0xfdc0 .. 0xfdcf */
-    0x326e, 0x3271, 0x3274, 0x3277, 0x327a, 0x327d, 0x3280, 0x3283,
-    0x3286, 0x3286, 0x3286, 0x3286, 0x3286, 0x3286, 0x3286, 0x3286,
+    0x327c, 0x327f, 0x3282, 0x3285, 0x3288, 0x328b, 0x328e, 0x3291,
+    0x3294, 0x3294, 0x3294, 0x3294, 0x3294, 0x3294, 0x3294, 0x3294,
     /* offsets 0xfdf0 .. 0xfdff */
-    0x3286, 0x3289, 0x328c, 0x3290, 0x3294, 0x3298, 0x329c, 0x32a0,
-    0x32a4, 0x32a8, 0x32ab, 0x32bd, 0x32c5, 0x32c9, 0x32c9, 0x32c9,
+    0x3294, 0x3297, 0x329a, 0x329e, 0x32a2, 0x32a6, 0x32aa, 0x32ae,
+    0x32b2, 0x32b6, 0x32b9, 0x32cb, 0x32d3, 0x32d7, 0x32d7, 0x32d7,
     /* offsets 0xfe10 .. 0xfe1f */
-    0x32c9, 0x32ca, 0x32cb, 0x32cc, 0x32cd, 0x32ce, 0x32cf, 0x32d0,
-    0x32d1, 0x32d2, 0x32d5, 0x32d5, 0x32d5, 0x32d5, 0x32d5, 0x32d5,
+    0x32d7, 0x32d8, 0x32d9, 0x32da, 0x32db, 0x32dc, 0x32dd, 0x32de,
+    0x32df, 0x32e0, 0x32e3, 0x32e3, 0x32e3, 0x32e3, 0x32e3, 0x32e3,
     /* offsets 0xfe30 .. 0xfe3f */
-    0x32d5, 0x32d7, 0x32d8, 0x32d9, 0x32da, 0x32db, 0x32dc, 0x32dd,
-    0x32de, 0x32df, 0x32e0, 0x32e1, 0x32e2, 0x32e3, 0x32e4, 0x32e5,
+    0x32e3, 0x32e5, 0x32e6, 0x32e7, 0x32e8, 0x32e9, 0x32ea, 0x32eb,
+    0x32ec, 0x32ed, 0x32ee, 0x32ef, 0x32f0, 0x32f1, 0x32f2, 0x32f3,
     /* offsets 0xfe40 .. 0xfe4f */
-    0x32e6, 0x32e7, 0x32e8, 0x32e9, 0x32ea, 0x32eb, 0x32eb, 0x32eb,
-    0x32ec, 0x32ed, 0x32ef, 0x32f1, 0x32f3, 0x32f5, 0x32f6, 0x32f7,
+    0x32f4, 0x32f5, 0x32f6, 0x32f7, 0x32f8, 0x32f9, 0x32f9, 0x32f9,
+    0x32fa, 0x32fb, 0x32fd, 0x32ff, 0x3301, 0x3303, 0x3304, 0x3305,
     /* offsets 0xfe50 .. 0xfe5f */
-    0x32f8, 0x32f9, 0x32fa, 0x32fb, 0x32fb, 0x32fc, 0x32fd, 0x32fe,
-    0x32ff, 0x3300, 0x3301, 0x3302, 0x3303, 0x3304, 0x3305, 0x3306,
+    0x3306, 0x3307, 0x3308, 0x3309, 0x3309, 0x330a, 0x330b, 0x330c,
+    0x330d, 0x330e, 0x330f, 0x3310, 0x3311, 0x3312, 0x3313, 0x3314,
     /* offsets 0xfe60 .. 0xfe6f */
-    0x3307, 0x3308, 0x3309, 0x330a, 0x330b, 0x330c, 0x330d, 0x330e,
-    0x330e, 0x330f, 0x3310, 0x3311, 0x3312, 0x3312, 0x3312, 0x3312,
+    0x3315, 0x3316, 0x3317, 0x3318, 0x3319, 0x331a, 0x331b, 0x331c,
+    0x331c, 0x331d, 0x331e, 0x331f, 0x3320, 0x3320, 0x3320, 0x3320,
     /* offsets 0xfe70 .. 0xfe7f */
-    0x3312, 0x3314, 0x3316, 0x3318, 0x3318, 0x331a, 0x331a, 0x331c,
-    0x331e, 0x3320, 0x3322, 0x3324, 0x3326, 0x3328, 0x332a, 0x332c,
+    0x3320, 0x3322, 0x3324, 0x3326, 0x3326, 0x3328, 0x3328, 0x332a,
+    0x332c, 0x332e, 0x3330, 0x3332, 0x3334, 0x3336, 0x3338, 0x333a,
     /* offsets 0xfe80 .. 0xfe8f */
-    0x332e, 0x332f, 0x3331, 0x3333, 0x3335, 0x3337, 0x3339, 0x333b,
-    0x333d, 0x333f, 0x3341, 0x3343, 0x3345, 0x3347, 0x3348, 0x3349,
+    0x333c, 0x333d, 0x333f, 0x3341, 0x3343, 0x3345, 0x3347, 0x3349,
+    0x334b, 0x334d, 0x334f, 0x3351, 0x3353, 0x3355, 0x3356, 0x3357,
     /* offsets 0xfe90 .. 0xfe9f */
-    0x334a, 0x334b, 0x334c, 0x334d, 0x334e, 0x334f, 0x3350, 0x3351,
-    0x3352, 0x3353, 0x3354, 0x3355, 0x3356, 0x3357, 0x3358, 0x3359,
+    0x3358, 0x3359, 0x335a, 0x335b, 0x335c, 0x335d, 0x335e, 0x335f,
+    0x3360, 0x3361, 0x3362, 0x3363, 0x3364, 0x3365, 0x3366, 0x3367,
     /* offsets 0xfea0 .. 0xfeaf */
-    0x335a, 0x335b, 0x335c, 0x335d, 0x335e, 0x335f, 0x3360, 0x3361,
-    0x3362, 0x3363, 0x3364, 0x3365, 0x3366, 0x3367, 0x3368, 0x3369,
+    0x3368, 0x3369, 0x336a, 0x336b, 0x336c, 0x336d, 0x336e, 0x336f,
+    0x3370, 0x3371, 0x3372, 0x3373, 0x3374, 0x3375, 0x3376, 0x3377,
     /* offsets 0xfeb0 .. 0xfebf */
-    0x336a, 0x336b, 0x336c, 0x336d, 0x336e, 0x336f, 0x3370, 0x3371,
-    0x3372, 0x3373, 0x3374, 0x3375, 0x3376, 0x3377, 0x3378, 0x3379,
+    0x3378, 0x3379, 0x337a, 0x337b, 0x337c, 0x337d, 0x337e, 0x337f,
+    0x3380, 0x3381, 0x3382, 0x3383, 0x3384, 0x3385, 0x3386, 0x3387,
     /* offsets 0xfec0 .. 0xfecf */
-    0x337a, 0x337b, 0x337c, 0x337d, 0x337e, 0x337f, 0x3380, 0x3381,
-    0x3382, 0x3383, 0x3384, 0x3385, 0x3386, 0x3387, 0x3388, 0x3389,
+    0x3388, 0x3389, 0x338a, 0x338b, 0x338c, 0x338d, 0x338e, 0x338f,
+    0x3390, 0x3391, 0x3392, 0x3393, 0x3394, 0x3395, 0x3396, 0x3397,
     /* offsets 0xfed0 .. 0xfedf */
-    0x338a, 0x338b, 0x338c, 0x338d, 0x338e, 0x338f, 0x3390, 0x3391,
-    0x3392, 0x3393, 0x3394, 0x3395, 0x3396, 0x3397, 0x3398, 0x3399,
+    0x3398, 0x3399, 0x339a, 0x339b, 0x339c, 0x339d, 0x339e, 0x339f,
+    0x33a0, 0x33a1, 0x33a2, 0x33a3, 0x33a4, 0x33a5, 0x33a6, 0x33a7,
     /* offsets 0xfee0 .. 0xfeef */
-    0x339a, 0x339b, 0x339c, 0x339d, 0x339e, 0x339f, 0x33a0, 0x33a1,
-    0x33a2, 0x33a3, 0x33a4, 0x33a5, 0x33a6, 0x33a7, 0x33a8, 0x33a9,
+    0x33a8, 0x33a9, 0x33aa, 0x33ab, 0x33ac, 0x33ad, 0x33ae, 0x33af,
+    0x33b0, 0x33b1, 0x33b2, 0x33b3, 0x33b4, 0x33b5, 0x33b6, 0x33b7,
     /* offsets 0xfef0 .. 0xfeff */
-    0x33aa, 0x33ab, 0x33ac, 0x33ad, 0x33ae, 0x33af, 0x33b2, 0x33b5,
-    0x33b8, 0x33bb, 0x33be, 0x33c1, 0x33c3, 0x33c5, 0x33c5, 0x33c5,
+    0x33b8, 0x33b9, 0x33ba, 0x33bb, 0x33bc, 0x33bd, 0x33c0, 0x33c3,
+    0x33c6, 0x33c9, 0x33cc, 0x33cf, 0x33d1, 0x33d3, 0x33d3, 0x33d3,
     /* offsets 0xff00 .. 0xff0f */
-    0x33c5, 0x33c5, 0x33c6, 0x33c7, 0x33c8, 0x33c9, 0x33ca, 0x33cb,
-    0x33cc, 0x33cd, 0x33ce, 0x33cf, 0x33d0, 0x33d1, 0x33d2, 0x33d3,
+    0x33d3, 0x33d3, 0x33d4, 0x33d5, 0x33d6, 0x33d7, 0x33d8, 0x33d9,
+    0x33da, 0x33db, 0x33dc, 0x33dd, 0x33de, 0x33df, 0x33e0, 0x33e1,
     /* offsets 0xff10 .. 0xff1f */
-    0x33d4, 0x33d5, 0x33d6, 0x33d7, 0x33d8, 0x33d9, 0x33da, 0x33db,
-    0x33dc, 0x33dd, 0x33de, 0x33df, 0x33e0, 0x33e1, 0x33e2, 0x33e3,
+    0x33e2, 0x33e3, 0x33e4, 0x33e5, 0x33e6, 0x33e7, 0x33e8, 0x33e9,
+    0x33ea, 0x33eb, 0x33ec, 0x33ed, 0x33ee, 0x33ef, 0x33f0, 0x33f1,
     /* offsets 0xff20 .. 0xff2f */
-    0x33e4, 0x33e5, 0x33e6, 0x33e7, 0x33e8, 0x33e9, 0x33ea, 0x33eb,
-    0x33ec, 0x33ed, 0x33ee, 0x33ef, 0x33f0, 0x33f1, 0x33f2, 0x33f3,
+    0x33f2, 0x33f3, 0x33f4, 0x33f5, 0x33f6, 0x33f7, 0x33f8, 0x33f9,
+    0x33fa, 0x33fb, 0x33fc, 0x33fd, 0x33fe, 0x33ff, 0x3400, 0x3401,
     /* offsets 0xff30 .. 0xff3f */
-    0x33f4, 0x33f5, 0x33f6, 0x33f7, 0x33f8, 0x33f9, 0x33fa, 0x33fb,
-    0x33fc, 0x33fd, 0x33fe, 0x33ff, 0x3400, 0x3401, 0x3402, 0x3403,
+    0x3402, 0x3403, 0x3404, 0x3405, 0x3406, 0x3407, 0x3408, 0x3409,
+    0x340a, 0x340b, 0x340c, 0x340d, 0x340e, 0x340f, 0x3410, 0x3411,
     /* offsets 0xff40 .. 0xff4f */
-    0x3404, 0x3405, 0x3406, 0x3407, 0x3408, 0x3409, 0x340a, 0x340b,
-    0x340c, 0x340d, 0x340e, 0x340f, 0x3410, 0x3411, 0x3412, 0x3413,
+    0x3412, 0x3413, 0x3414, 0x3415, 0x3416, 0x3417, 0x3418, 0x3419,
+    0x341a, 0x341b, 0x341c, 0x341d, 0x341e, 0x341f, 0x3420, 0x3421,
     /* offsets 0xff50 .. 0xff5f */
-    0x3414, 0x3415, 0x3416, 0x3417, 0x3418, 0x3419, 0x341a, 0x341b,
-    0x341c, 0x341d, 0x341e, 0x341f, 0x3420, 0x3421, 0x3422, 0x3423,
+    0x3422, 0x3423, 0x3424, 0x3425, 0x3426, 0x3427, 0x3428, 0x3429,
+    0x342a, 0x342b, 0x342c, 0x342d, 0x342e, 0x342f, 0x3430, 0x3431,
     /* offsets 0xff60 .. 0xff6f */
-    0x3424, 0x3425, 0x3426, 0x3427, 0x3428, 0x3429, 0x342a, 0x342b,
-    0x342c, 0x342d, 0x342e, 0x342f, 0x3430, 0x3431, 0x3432, 0x3433,
+    0x3432, 0x3433, 0x3434, 0x3435, 0x3436, 0x3437, 0x3438, 0x3439,
+    0x343a, 0x343b, 0x343c, 0x343d, 0x343e, 0x343f, 0x3440, 0x3441,
     /* offsets 0xff70 .. 0xff7f */
-    0x3434, 0x3435, 0x3436, 0x3437, 0x3438, 0x3439, 0x343a, 0x343b,
-    0x343c, 0x343d, 0x343e, 0x343f, 0x3440, 0x3441, 0x3442, 0x3443,
+    0x3442, 0x3443, 0x3444, 0x3445, 0x3446, 0x3447, 0x3448, 0x3449,
+    0x344a, 0x344b, 0x344c, 0x344d, 0x344e, 0x344f, 0x3450, 0x3451,
     /* offsets 0xff80 .. 0xff8f */
-    0x3444, 0x3445, 0x3446, 0x3447, 0x3448, 0x3449, 0x344a, 0x344b,
-    0x344c, 0x344d, 0x344e, 0x344f, 0x3450, 0x3451, 0x3452, 0x3453,
+    0x3452, 0x3453, 0x3454, 0x3455, 0x3456, 0x3457, 0x3458, 0x3459,
+    0x345a, 0x345b, 0x345c, 0x345d, 0x345e, 0x345f, 0x3460, 0x3461,
     /* offsets 0xff90 .. 0xff9f */
-    0x3454, 0x3455, 0x3456, 0x3457, 0x3458, 0x3459, 0x345a, 0x345b,
-    0x345c, 0x345d, 0x345e, 0x345f, 0x3460, 0x3461, 0x3462, 0x3463,
+    0x3462, 0x3463, 0x3464, 0x3465, 0x3466, 0x3467, 0x3468, 0x3469,
+    0x346a, 0x346b, 0x346c, 0x346d, 0x346e, 0x346f, 0x3470, 0x3471,
     /* offsets 0xffa0 .. 0xffaf */
-    0x3464, 0x3465, 0x3466, 0x3467, 0x3468, 0x3469, 0x346a, 0x346b,
-    0x346c, 0x346d, 0x346e, 0x346f, 0x3470, 0x3471, 0x3472, 0x3473,
+    0x3472, 0x3473, 0x3474, 0x3475, 0x3476, 0x3477, 0x3478, 0x3479,
+    0x347a, 0x347b, 0x347c, 0x347d, 0x347e, 0x347f, 0x3480, 0x3481,
     /* offsets 0xffb0 .. 0xffbf */
-    0x3474, 0x3475, 0x3476, 0x3477, 0x3478, 0x3479, 0x347a, 0x347b,
-    0x347c, 0x347d, 0x347e, 0x347f, 0x3480, 0x3481, 0x3482, 0x3483,
+    0x3482, 0x3483, 0x3484, 0x3485, 0x3486, 0x3487, 0x3488, 0x3489,
+    0x348a, 0x348b, 0x348c, 0x348d, 0x348e, 0x348f, 0x3490, 0x3491,
     /* offsets 0xffc0 .. 0xffcf */
-    0x3483, 0x3483, 0x3483, 0x3484, 0x3485, 0x3486, 0x3487, 0x3488,
-    0x3489, 0x3489, 0x3489, 0x348a, 0x348b, 0x348c, 0x348d, 0x348e,
+    0x3491, 0x3491, 0x3491, 0x3492, 0x3493, 0x3494, 0x3495, 0x3496,
+    0x3497, 0x3497, 0x3497, 0x3498, 0x3499, 0x349a, 0x349b, 0x349c,
     /* offsets 0xffd0 .. 0xffdf */
-    0x348f, 0x348f, 0x348f, 0x3490, 0x3491, 0x3492, 0x3493, 0x3494,
-    0x3495, 0x3495, 0x3495, 0x3496, 0x3497, 0x3498, 0x3498, 0x3498,
+    0x349d, 0x349d, 0x349d, 0x349e, 0x349f, 0x34a0, 0x34a1, 0x34a2,
+    0x34a3, 0x34a3, 0x34a3, 0x34a4, 0x34a5, 0x34a6, 0x34a6, 0x34a6,
     /* offsets 0xffe0 .. 0xffef */
-    0x3498, 0x3499, 0x349a, 0x349b, 0x349d, 0x349e, 0x349f, 0x34a0,
-    0x34a0, 0x34a1, 0x34a2, 0x34a3, 0x34a4, 0x34a5, 0x34a6, 0x34a7,
+    0x34a6, 0x34a7, 0x34a8, 0x34a9, 0x34ab, 0x34ac, 0x34ad, 0x34ae,
+    0x34ae, 0x34af, 0x34b0, 0x34b1, 0x34b2, 0x34b3, 0x34b4, 0x34b5,
     /* offset sentinel */
-    0x34a7,
+    0x34b5,
     /* data */
     0x0020, 0x0020, 0x0308, 0x0061, 0x0020, 0x0304, 0x0032, 0x0033,
     0x0020, 0x0301, 0x03bc, 0x0020, 0x0327, 0x0031, 0x006f, 0x0031,
@@ -2793,249 +2795,251 @@ const WCHAR DECLSPEC_HIDDEN nfkd_table[13479] =
     0x795d, 0x798d, 0x798e, 0x7a40, 0x7a81, 0x7bc0, 0x7df4, 0x7e09,
     0x7e41, 0x7f72, 0x8005, 0x81ed, 0x8279, 0x8279, 0x8457, 0x8910,
     0x8996, 0x8b01, 0x8b39, 0x8cd3, 0x8d08, 0x8fb6, 0x9038, 0x96e3,
-    0x97ff, 0x983b, 0x6075, 0x8218, 0x4e26, 0x51b5, 0x5168, 0x4f80,
-    0x5145, 0x5180, 0x52c7, 0x52fa, 0x559d, 0x5555, 0x5599, 0x55e2,
-    0x585a, 0x58b3, 0x5944, 0x5954, 0x5a62, 0x5b28, 0x5ed2, 0x5ed9,
-    0x5f69, 0x5fad, 0x60d8, 0x614e, 0x6108, 0x618e, 0x6160, 0x61f2,
-    0x6234, 0x63c4, 0x641c, 0x6452, 0x6556, 0x6674, 0x6717, 0x671b,
-    0x6756, 0x6b79, 0x6bba, 0x6d41, 0x6edb, 0x6ecb, 0x6f22, 0x701e,
-    0x716e, 0x77a7, 0x7235, 0x72af, 0x732a, 0x7471, 0x7506, 0x753b,
-    0x761d, 0x761f, 0x76ca, 0x76db, 0x76f4, 0x774a, 0x7740, 0x78cc,
-    0x7ab1, 0x7bc0, 0x7c7b, 0x7d5b, 0x7df4, 0x7f3e, 0x8005, 0x8352,
-    0x83ef, 0x8779, 0x8941, 0x8986, 0x8996, 0x8abf, 0x8af8, 0x8acb,
-    0x8b01, 0x8afe, 0x8aed, 0x8b39, 0x8b8a, 0x8d08, 0x8f38, 0x9072,
-    0x9199, 0x9276, 0x967c, 0x96e3, 0x9756, 0x97db, 0x97ff, 0x980b,
-    0x983b, 0x9b12, 0x9f9c, 0x3b9d, 0x4018, 0x4039, 0x9f43, 0x9f8e,
-    0x0066, 0x0066, 0x0066, 0x0069, 0x0066, 0x006c, 0x0066, 0x0066,
-    0x0069, 0x0066, 0x0066, 0x006c, 0x0073, 0x0074, 0x0073, 0x0074,
-    0x0574, 0x0576, 0x0574, 0x0565, 0x0574, 0x056b, 0x057e, 0x0576,
-    0x0574, 0x056d, 0x05d9, 0x05b4, 0x05f2, 0x05b7, 0x05e2, 0x05d0,
-    0x05d3, 0x05d4, 0x05db, 0x05dc, 0x05dd, 0x05e8, 0x05ea, 0x002b,
-    0x05e9, 0x05c1, 0x05e9, 0x05c2, 0x05e9, 0x05bc, 0x05c1, 0x05e9,
-    0x05bc, 0x05c2, 0x05d0, 0x05b7, 0x05d0, 0x05b8, 0x05d0, 0x05bc,
-    0x05d1, 0x05bc, 0x05d2, 0x05bc, 0x05d3, 0x05bc, 0x05d4, 0x05bc,
-    0x05d5, 0x05bc, 0x05d6, 0x05bc, 0x05d8, 0x05bc, 0x05d9, 0x05bc,
-    0x05da, 0x05bc, 0x05db, 0x05bc, 0x05dc, 0x05bc, 0x05de, 0x05bc,
-    0x05e0, 0x05bc, 0x05e1, 0x05bc, 0x05e3, 0x05bc, 0x05e4, 0x05bc,
-    0x05e6, 0x05bc, 0x05e7, 0x05bc, 0x05e8, 0x05bc, 0x05e9, 0x05bc,
-    0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf,
-    0x05e4, 0x05bf, 0x05d0, 0x05dc, 0x0671, 0x0671, 0x067b, 0x067b,
-    0x067b, 0x067b, 0x067e, 0x067e, 0x067e, 0x067e, 0x0680, 0x0680,
-    0x0680, 0x0680, 0x067a, 0x067a, 0x067a, 0x067a, 0x067f, 0x067f,
-    0x067f, 0x067f, 0x0679, 0x0679, 0x0679, 0x0679, 0x06a4, 0x06a4,
-    0x06a4, 0x06a4, 0x06a6, 0x06a6, 0x06a6, 0x06a6, 0x0684, 0x0684,
-    0x0684, 0x0684, 0x0683, 0x0683, 0x0683, 0x0683, 0x0686, 0x0686,
-    0x0686, 0x0686, 0x0687, 0x0687, 0x0687, 0x0687, 0x068d, 0x068d,
-    0x068c, 0x068c, 0x068e, 0x068e, 0x0688, 0x0688, 0x0698, 0x0698,
-    0x0691, 0x0691, 0x06a9, 0x06a9, 0x06a9, 0x06a9, 0x06af, 0x06af,
-    0x06af, 0x06af, 0x06b3, 0x06b3, 0x06b3, 0x06b3, 0x06b1, 0x06b1,
-    0x06b1, 0x06b1, 0x06ba, 0x06ba, 0x06bb, 0x06bb, 0x06bb, 0x06bb,
-    0x06d5, 0x0654, 0x06d5, 0x0654, 0x06c1, 0x06c1, 0x06c1, 0x06c1,
-    0x06be, 0x06be, 0x06be, 0x06be, 0x06d2, 0x06d2, 0x06d2, 0x0654,
-    0x06d2, 0x0654, 0x06ad, 0x06ad, 0x06ad, 0x06ad, 0x06c7, 0x06c7,
-    0x06c6, 0x06c6, 0x06c8, 0x06c8, 0x06c7, 0x0674, 0x06cb, 0x06cb,
-    0x06c5, 0x06c5, 0x06c9, 0x06c9, 0x06d0, 0x06d0, 0x06d0, 0x06d0,
-    0x0649, 0x0649, 0x064a, 0x0654, 0x0627, 0x064a, 0x0654, 0x0627,
-    0x064a, 0x0654, 0x06d5, 0x064a, 0x0654, 0x06d5, 0x064a, 0x0654,
-    0x0648, 0x064a, 0x0654, 0x0648, 0x064a, 0x0654, 0x06c7, 0x064a,
-    0x0654, 0x06c7, 0x064a, 0x0654, 0x06c6, 0x064a, 0x0654, 0x06c6,
-    0x064a, 0x0654, 0x06c8, 0x064a, 0x0654, 0x06c8, 0x064a, 0x0654,
-    0x06d0, 0x064a, 0x0654, 0x06d0, 0x064a, 0x0654, 0x06d0, 0x064a,
-    0x0654, 0x0649, 0x064a, 0x0654, 0x0649, 0x064a, 0x0654, 0x0649,
-    0x06cc, 0x06cc, 0x06cc, 0x06cc, 0x064a, 0x0654, 0x062c, 0x064a,
-    0x0654, 0x062d, 0x064a, 0x0654, 0x0645, 0x064a, 0x0654, 0x0649,
-    0x064a, 0x0654, 0x064a, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628,
-    0x062e, 0x0628, 0x0645, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a,
-    0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, 0x0645, 0x062a,
-    0x0649, 0x062a, 0x064a, 0x062b, 0x062c, 0x062b, 0x0645, 0x062b,
-    0x0649, 0x062b, 0x064a, 0x062c, 0x062d, 0x062c, 0x0645, 0x062d,
-    0x062c, 0x062d, 0x0645, 0x062e, 0x062c, 0x062e, 0x062d, 0x062e,
-    0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633,
-    0x0645, 0x0635, 0x062d, 0x0635, 0x0645, 0x0636, 0x062c, 0x0636,
-    0x062d, 0x0636, 0x062e, 0x0636, 0x0645, 0x0637, 0x062d, 0x0637,
-    0x0645, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a,
-    0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641,
-    0x062e, 0x0641, 0x0645, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642,
-    0x062d, 0x0642, 0x0645, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643,
-    0x0627, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643,
-    0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644,
-    0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, 0x0645, 0x0644,
-    0x0649, 0x0644, 0x064a, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645,
-    0x062e, 0x0645, 0x0645, 0x0645, 0x0649, 0x0645, 0x064a, 0x0646,
-    0x062c, 0x0646, 0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646,
-    0x0649, 0x0646, 0x064a, 0x0647, 0x062c, 0x0647, 0x0645, 0x0647,
-    0x0649, 0x0647, 0x064a, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a,
-    0x062e, 0x064a, 0x0645, 0x064a, 0x0649, 0x064a, 0x064a, 0x0630,
-    0x0670, 0x0631, 0x0670, 0x0649, 0x0670, 0x0020, 0x064c, 0x0651,
-    0x0020, 0x064d, 0x0651, 0x0020, 0x064e, 0x0651, 0x0020, 0x064f,
-    0x0651, 0x0020, 0x0650, 0x0651, 0x0020, 0x0651, 0x0670, 0x064a,
-    0x0654, 0x0631, 0x064a, 0x0654, 0x0632, 0x064a, 0x0654, 0x0645,
-    0x064a, 0x0654, 0x0646, 0x064a, 0x0654, 0x0649, 0x064a, 0x0654,
-    0x064a, 0x0628, 0x0631, 0x0628, 0x0632, 0x0628, 0x0645, 0x0628,
-    0x0646, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, 0x0631, 0x062a,
-    0x0632, 0x062a, 0x0645, 0x062a, 0x0646, 0x062a, 0x0649, 0x062a,
-    0x064a, 0x062b, 0x0631, 0x062b, 0x0632, 0x062b, 0x0645, 0x062b,
-    0x0646, 0x062b, 0x0649, 0x062b, 0x064a, 0x0641, 0x0649, 0x0641,
-    0x064a, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, 0x0627, 0x0643,
-    0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644,
-    0x0645, 0x0644, 0x0649, 0x0644, 0x064a, 0x0645, 0x0627, 0x0645,
-    0x0645, 0x0646, 0x0631, 0x0646, 0x0632, 0x0646, 0x0645, 0x0646,
-    0x0646, 0x0646, 0x0649, 0x0646, 0x064a, 0x0649, 0x0670, 0x064a,
-    0x0631, 0x064a, 0x0632, 0x064a, 0x0645, 0x064a, 0x0646, 0x064a,
-    0x0649, 0x064a, 0x064a, 0x064a, 0x0654, 0x062c, 0x064a, 0x0654,
-    0x062d, 0x064a, 0x0654, 0x062e, 0x064a, 0x0654, 0x0645, 0x064a,
-    0x0654, 0x0647, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628, 0x062e,
-    0x0628, 0x0645, 0x0628, 0x0647, 0x062a, 0x062c, 0x062a, 0x062d,
-    0x062a, 0x062e, 0x062a, 0x0645, 0x062a, 0x0647, 0x062b, 0x0645,
-    0x062c, 0x062d, 0x062c, 0x0645, 0x062d, 0x062c, 0x062d, 0x0645,
-    0x062e, 0x062c, 0x062e, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d,
-    0x0633, 0x062e, 0x0633, 0x0645, 0x0635, 0x062d, 0x0635, 0x062e,
-    0x0635, 0x0645, 0x0636, 0x062c, 0x0636, 0x062d, 0x0636, 0x062e,
-    0x0636, 0x0645, 0x0637, 0x062d, 0x0638, 0x0645, 0x0639, 0x062c,
-    0x0639, 0x0645, 0x063a, 0x062c, 0x063a, 0x0645, 0x0641, 0x062c,
-    0x0641, 0x062d, 0x0641, 0x062e, 0x0641, 0x0645, 0x0642, 0x062d,
-    0x0642, 0x0645, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e,
-    0x0643, 0x0644, 0x0643, 0x0645, 0x0644, 0x062c, 0x0644, 0x062d,
-    0x0644, 0x062e, 0x0644, 0x0645, 0x0644, 0x0647, 0x0645, 0x062c,
-    0x0645, 0x062d, 0x0645, 0x062e, 0x0645, 0x0645, 0x0646, 0x062c,
-    0x0646, 0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646, 0x0647,
-    0x0647, 0x062c, 0x0647, 0x0645, 0x0647, 0x0670, 0x064a, 0x062c,
-    0x064a, 0x062d, 0x064a, 0x062e, 0x064a, 0x0645, 0x064a, 0x0647,
-    0x064a, 0x0654, 0x0645, 0x064a, 0x0654, 0x0647, 0x0628, 0x0645,
-    0x0628, 0x0647, 0x062a, 0x0645, 0x062a, 0x0647, 0x062b, 0x0645,
-    0x062b, 0x0647, 0x0633, 0x0645, 0x0633, 0x0647, 0x0634, 0x0645,
-    0x0634, 0x0647, 0x0643, 0x0644, 0x0643, 0x0645, 0x0644, 0x0645,
-    0x0646, 0x0645, 0x0646, 0x0647, 0x064a, 0x0645, 0x064a, 0x0647,
-    0x0640, 0x064e, 0x0651, 0x0640, 0x064f, 0x0651, 0x0640, 0x0650,
-    0x0651, 0x0637, 0x0649, 0x0637, 0x064a, 0x0639, 0x0649, 0x0639,
-    0x064a, 0x063a, 0x0649, 0x063a, 0x064a, 0x0633, 0x0649, 0x0633,
-    0x064a, 0x0634, 0x0649, 0x0634, 0x064a, 0x062d, 0x0649, 0x062d,
-    0x064a, 0x062c, 0x0649, 0x062c, 0x064a, 0x062e, 0x0649, 0x062e,
-    0x064a, 0x0635, 0x0649, 0x0635, 0x064a, 0x0636, 0x0649, 0x0636,
-    0x064a, 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634,
-    0x0645, 0x0634, 0x0631, 0x0633, 0x0631, 0x0635, 0x0631, 0x0636,
-    0x0631, 0x0637, 0x0649, 0x0637, 0x064a, 0x0639, 0x0649, 0x0639,
-    0x064a, 0x063a, 0x0649, 0x063a, 0x064a, 0x0633, 0x0649, 0x0633,
-    0x064a, 0x0634, 0x0649, 0x0634, 0x064a, 0x062d, 0x0649, 0x062d,
-    0x064a, 0x062c, 0x0649, 0x062c, 0x064a, 0x062e, 0x0649, 0x062e,
-    0x064a, 0x0635, 0x0649, 0x0635, 0x064a, 0x0636, 0x0649, 0x0636,
-    0x064a, 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634,
-    0x0645, 0x0634, 0x0631, 0x0633, 0x0631, 0x0635, 0x0631, 0x0636,
-    0x0631, 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634,
-    0x0645, 0x0633, 0x0647, 0x0634, 0x0647, 0x0637, 0x0645, 0x0633,
-    0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0634, 0x062c, 0x0634,
-    0x062d, 0x0634, 0x062e, 0x0637, 0x0645, 0x0638, 0x0645, 0x0627,
-    0x064b, 0x0627, 0x064b, 0x062a, 0x062c, 0x0645, 0x062a, 0x062d,
-    0x062c, 0x062a, 0x062d, 0x062c, 0x062a, 0x062d, 0x0645, 0x062a,
-    0x062e, 0x0645, 0x062a, 0x0645, 0x062c, 0x062a, 0x0645, 0x062d,
-    0x062a, 0x0645, 0x062e, 0x062c, 0x0645, 0x062d, 0x062c, 0x0645,
-    0x062d, 0x062d, 0x0645, 0x064a, 0x062d, 0x0645, 0x0649, 0x0633,
-    0x062d, 0x062c, 0x0633, 0x062c, 0x062d, 0x0633, 0x062c, 0x0649,
-    0x0633, 0x0645, 0x062d, 0x0633, 0x0645, 0x062d, 0x0633, 0x0645,
-    0x062c, 0x0633, 0x0645, 0x0645, 0x0633, 0x0645, 0x0645, 0x0635,
-    0x062d, 0x062d, 0x0635, 0x062d, 0x062d, 0x0635, 0x0645, 0x0645,
-    0x0634, 0x062d, 0x0645, 0x0634, 0x062d, 0x0645, 0x0634, 0x062c,
-    0x064a, 0x0634, 0x0645, 0x062e, 0x0634, 0x0645, 0x062e, 0x0634,
-    0x0645, 0x0645, 0x0634, 0x0645, 0x0645, 0x0636, 0x062d, 0x0649,
-    0x0636, 0x062e, 0x0645, 0x0636, 0x062e, 0x0645, 0x0637, 0x0645,
-    0x062d, 0x0637, 0x0645, 0x062d, 0x0637, 0x0645, 0x0645, 0x0637,
-    0x0645, 0x064a, 0x0639, 0x062c, 0x0645, 0x0639, 0x0645, 0x0645,
-    0x0639, 0x0645, 0x0645, 0x0639, 0x0645, 0x0649, 0x063a, 0x0645,
-    0x0645, 0x063a, 0x0645, 0x064a, 0x063a, 0x0645, 0x0649, 0x0641,
-    0x062e, 0x0645, 0x0641, 0x062e, 0x0645, 0x0642, 0x0645, 0x062d,
-    0x0642, 0x0645, 0x0645, 0x0644, 0x062d, 0x0645, 0x0644, 0x062d,
-    0x064a, 0x0644, 0x062d, 0x0649, 0x0644, 0x062c, 0x062c, 0x0644,
-    0x062c, 0x062c, 0x0644, 0x062e, 0x0645, 0x0644, 0x062e, 0x0645,
-    0x0644, 0x0645, 0x062d, 0x0644, 0x0645, 0x062d, 0x0645, 0x062d,
-    0x062c, 0x0645, 0x062d, 0x0645, 0x0645, 0x062d, 0x064a, 0x0645,
-    0x062c, 0x062d, 0x0645, 0x062c, 0x0645, 0x0645, 0x062e, 0x062c,
-    0x0645, 0x062e, 0x0645, 0x0645, 0x062c, 0x062e, 0x0647, 0x0645,
-    0x062c, 0x0647, 0x0645, 0x0645, 0x0646, 0x062d, 0x0645, 0x0646,
-    0x062d, 0x0649, 0x0646, 0x062c, 0x0645, 0x0646, 0x062c, 0x0645,
-    0x0646, 0x062c, 0x0649, 0x0646, 0x0645, 0x064a, 0x0646, 0x0645,
-    0x0649, 0x064a, 0x0645, 0x0645, 0x064a, 0x0645, 0x0645, 0x0628,
-    0x062e, 0x064a, 0x062a, 0x062c, 0x064a, 0x062a, 0x062c, 0x0649,
-    0x062a, 0x062e, 0x064a, 0x062a, 0x062e, 0x0649, 0x062a, 0x0645,
-    0x064a, 0x062a, 0x0645, 0x0649, 0x062c, 0x0645, 0x064a, 0x062c,
-    0x062d, 0x0649, 0x062c, 0x0645, 0x0649, 0x0633, 0x062e, 0x0649,
-    0x0635, 0x062d, 0x064a, 0x0634, 0x062d, 0x064a, 0x0636, 0x062d,
-    0x064a, 0x0644, 0x062c, 0x064a, 0x0644, 0x0645, 0x064a, 0x064a,
-    0x062d, 0x064a, 0x064a, 0x062c, 0x064a, 0x064a, 0x0645, 0x064a,
-    0x0645, 0x0645, 0x064a, 0x0642, 0x0645, 0x064a, 0x0646, 0x062d,
-    0x064a, 0x0642, 0x0645, 0x062d, 0x0644, 0x062d, 0x0645, 0x0639,
-    0x0645, 0x064a, 0x0643, 0x0645, 0x064a, 0x0646, 0x062c, 0x062d,
-    0x0645, 0x062e, 0x064a, 0x0644, 0x062c, 0x0645, 0x0643, 0x0645,
-    0x0645, 0x0644, 0x062c, 0x0645, 0x0646, 0x062c, 0x062d, 0x062c,
-    0x062d, 0x064a, 0x062d, 0x062c, 0x064a, 0x0645, 0x062c, 0x064a,
-    0x0641, 0x0645, 0x064a, 0x0628, 0x062d, 0x064a, 0x0643, 0x0645,
-    0x0645, 0x0639, 0x062c, 0x0645, 0x0635, 0x0645, 0x0645, 0x0633,
-    0x062e, 0x064a, 0x0646, 0x062c, 0x064a, 0x0635, 0x0644, 0x06d2,
-    0x0642, 0x0644, 0x06d2, 0x0627, 0x0644, 0x0644, 0x0647, 0x0627,
-    0x0643, 0x0628, 0x0631, 0x0645, 0x062d, 0x0645, 0x062f, 0x0635,
-    0x0644, 0x0639, 0x0645, 0x0631, 0x0633, 0x0648, 0x0644, 0x0639,
-    0x0644, 0x064a, 0x0647, 0x0648, 0x0633, 0x0644, 0x0645, 0x0635,
-    0x0644, 0x0649, 0x0635, 0x0644, 0x0649, 0x0020, 0x0627, 0x0644,
-    0x0644, 0x0647, 0x0020, 0x0639, 0x0644, 0x064a, 0x0647, 0x0020,
-    0x0648, 0x0633, 0x0644, 0x0645, 0x062c, 0x0644, 0x0020, 0x062c,
-    0x0644, 0x0627, 0x0644, 0x0647, 0x0631, 0x06cc, 0x0627, 0x0644,
-    0x002c, 0x3001, 0x3002, 0x003a, 0x003b, 0x0021, 0x003f, 0x3016,
-    0x3017, 0x002e, 0x002e, 0x002e, 0x002e, 0x002e, 0x2014, 0x2013,
-    0x005f, 0x005f, 0x0028, 0x0029, 0x007b, 0x007d, 0x3014, 0x3015,
-    0x3010, 0x3011, 0x300a, 0x300b, 0x3008, 0x3009, 0x300c, 0x300d,
-    0x300e, 0x300f, 0x005b, 0x005d, 0x0020, 0x0305, 0x0020, 0x0305,
-    0x0020, 0x0305, 0x0020, 0x0305, 0x005f, 0x005f, 0x005f, 0x002c,
-    0x3001, 0x002e, 0x003b, 0x003a, 0x003f, 0x0021, 0x2014, 0x0028,
-    0x0029, 0x007b, 0x007d, 0x3014, 0x3015, 0x0023, 0x0026, 0x002a,
-    0x002b, 0x002d, 0x003c, 0x003e, 0x003d, 0x005c, 0x0024, 0x0025,
-    0x0040, 0x0020, 0x064b, 0x0640, 0x064b, 0x0020, 0x064c, 0x0020,
-    0x064d, 0x0020, 0x064e, 0x0640, 0x064e, 0x0020, 0x064f, 0x0640,
-    0x064f, 0x0020, 0x0650, 0x0640, 0x0650, 0x0020, 0x0651, 0x0640,
-    0x0651, 0x0020, 0x0652, 0x0640, 0x0652, 0x0621, 0x0627, 0x0653,
-    0x0627, 0x0653, 0x0627, 0x0654, 0x0627, 0x0654, 0x0648, 0x0654,
-    0x0648, 0x0654, 0x0627, 0x0655, 0x0627, 0x0655, 0x064a, 0x0654,
-    0x064a, 0x0654, 0x064a, 0x0654, 0x064a, 0x0654, 0x0627, 0x0627,
-    0x0628, 0x0628, 0x0628, 0x0628, 0x0629, 0x0629, 0x062a, 0x062a,
-    0x062a, 0x062a, 0x062b, 0x062b, 0x062b, 0x062b, 0x062c, 0x062c,
-    0x062c, 0x062c, 0x062d, 0x062d, 0x062d, 0x062d, 0x062e, 0x062e,
-    0x062e, 0x062e, 0x062f, 0x062f, 0x0630, 0x0630, 0x0631, 0x0631,
-    0x0632, 0x0632, 0x0633, 0x0633, 0x0633, 0x0633, 0x0634, 0x0634,
-    0x0634, 0x0634, 0x0635, 0x0635, 0x0635, 0x0635, 0x0636, 0x0636,
-    0x0636, 0x0636, 0x0637, 0x0637, 0x0637, 0x0637, 0x0638, 0x0638,
-    0x0638, 0x0638, 0x0639, 0x0639, 0x0639, 0x0639, 0x063a, 0x063a,
-    0x063a, 0x063a, 0x0641, 0x0641, 0x0641, 0x0641, 0x0642, 0x0642,
-    0x0642, 0x0642, 0x0643, 0x0643, 0x0643, 0x0643, 0x0644, 0x0644,
-    0x0644, 0x0644, 0x0645, 0x0645, 0x0645, 0x0645, 0x0646, 0x0646,
-    0x0646, 0x0646, 0x0647, 0x0647, 0x0647, 0x0647, 0x0648, 0x0648,
-    0x0649, 0x0649, 0x064a, 0x064a, 0x064a, 0x064a, 0x0644, 0x0627,
-    0x0653, 0x0644, 0x0627, 0x0653, 0x0644, 0x0627, 0x0654, 0x0644,
-    0x0627, 0x0654, 0x0644, 0x0627, 0x0655, 0x0644, 0x0627, 0x0655,
-    0x0644, 0x0627, 0x0644, 0x0627, 0x0021, 0x0022, 0x0023, 0x0024,
-    0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c,
-    0x002d, 0x002e, 0x002f, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034,
-    0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c,
-    0x003d, 0x003e, 0x003f, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044,
-    0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c,
-    0x004d, 0x004e, 0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054,
-    0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c,
-    0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064,
-    0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c,
-    0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074,
-    0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c,
-    0x007d, 0x007e, 0x2985, 0x2986, 0x3002, 0x300c, 0x300d, 0x3001,
-    0x30fb, 0x30f2, 0x30a1, 0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3,
-    0x30e5, 0x30e7, 0x30c3, 0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8,
-    0x30aa, 0x30ab, 0x30ad, 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7,
-    0x30b9, 0x30bb, 0x30bd, 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8,
-    0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5,
-    0x30d8, 0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4,
-    0x30e6, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef,
-    0x30f3, 0x3099, 0x309a, 0x1160, 0x1100, 0x1101, 0x11aa, 0x1102,
-    0x11ac, 0x11ad, 0x1103, 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2,
-    0x11b3, 0x11b4, 0x11b5, 0x111a, 0x1106, 0x1107, 0x1108, 0x1121,
-    0x1109, 0x110a, 0x110b, 0x110c, 0x110d, 0x110e, 0x110f, 0x1110,
-    0x1111, 0x1112, 0x1161, 0x1162, 0x1163, 0x1164, 0x1165, 0x1166,
-    0x1167, 0x1168, 0x1169, 0x116a, 0x116b, 0x116c, 0x116d, 0x116e,
-    0x116f, 0x1170, 0x1171, 0x1172, 0x1173, 0x1174, 0x1175, 0x00a2,
-    0x00a3, 0x00ac, 0x0020, 0x0304, 0x00a6, 0x00a5, 0x20a9, 0x2502,
-    0x2190, 0x2191, 0x2192, 0x2193, 0x25a0, 0x25cb
+    0x97ff, 0x983b, 0x6075, 0xd850, 0xdeee, 0x8218, 0x4e26, 0x51b5,
+    0x5168, 0x4f80, 0x5145, 0x5180, 0x52c7, 0x52fa, 0x559d, 0x5555,
+    0x5599, 0x55e2, 0x585a, 0x58b3, 0x5944, 0x5954, 0x5a62, 0x5b28,
+    0x5ed2, 0x5ed9, 0x5f69, 0x5fad, 0x60d8, 0x614e, 0x6108, 0x618e,
+    0x6160, 0x61f2, 0x6234, 0x63c4, 0x641c, 0x6452, 0x6556, 0x6674,
+    0x6717, 0x671b, 0x6756, 0x6b79, 0x6bba, 0x6d41, 0x6edb, 0x6ecb,
+    0x6f22, 0x701e, 0x716e, 0x77a7, 0x7235, 0x72af, 0x732a, 0x7471,
+    0x7506, 0x753b, 0x761d, 0x761f, 0x76ca, 0x76db, 0x76f4, 0x774a,
+    0x7740, 0x78cc, 0x7ab1, 0x7bc0, 0x7c7b, 0x7d5b, 0x7df4, 0x7f3e,
+    0x8005, 0x8352, 0x83ef, 0x8779, 0x8941, 0x8986, 0x8996, 0x8abf,
+    0x8af8, 0x8acb, 0x8b01, 0x8afe, 0x8aed, 0x8b39, 0x8b8a, 0x8d08,
+    0x8f38, 0x9072, 0x9199, 0x9276, 0x967c, 0x96e3, 0x9756, 0x97db,
+    0x97ff, 0x980b, 0x983b, 0x9b12, 0x9f9c, 0xd84a, 0xdc4a, 0xd84a,
+    0xdc44, 0xd84c, 0xdfd5, 0x3b9d, 0x4018, 0x4039, 0xd854, 0xde49,
+    0xd857, 0xdcd0, 0xd85f, 0xded3, 0x9f43, 0x9f8e, 0x0066, 0x0066,
+    0x0066, 0x0069, 0x0066, 0x006c, 0x0066, 0x0066, 0x0069, 0x0066,
+    0x0066, 0x006c, 0x0073, 0x0074, 0x0073, 0x0074, 0x0574, 0x0576,
+    0x0574, 0x0565, 0x0574, 0x056b, 0x057e, 0x0576, 0x0574, 0x056d,
+    0x05d9, 0x05b4, 0x05f2, 0x05b7, 0x05e2, 0x05d0, 0x05d3, 0x05d4,
+    0x05db, 0x05dc, 0x05dd, 0x05e8, 0x05ea, 0x002b, 0x05e9, 0x05c1,
+    0x05e9, 0x05c2, 0x05e9, 0x05bc, 0x05c1, 0x05e9, 0x05bc, 0x05c2,
+    0x05d0, 0x05b7, 0x05d0, 0x05b8, 0x05d0, 0x05bc, 0x05d1, 0x05bc,
+    0x05d2, 0x05bc, 0x05d3, 0x05bc, 0x05d4, 0x05bc, 0x05d5, 0x05bc,
+    0x05d6, 0x05bc, 0x05d8, 0x05bc, 0x05d9, 0x05bc, 0x05da, 0x05bc,
+    0x05db, 0x05bc, 0x05dc, 0x05bc, 0x05de, 0x05bc, 0x05e0, 0x05bc,
+    0x05e1, 0x05bc, 0x05e3, 0x05bc, 0x05e4, 0x05bc, 0x05e6, 0x05bc,
+    0x05e7, 0x05bc, 0x05e8, 0x05bc, 0x05e9, 0x05bc, 0x05ea, 0x05bc,
+    0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf,
+    0x05d0, 0x05dc, 0x0671, 0x0671, 0x067b, 0x067b, 0x067b, 0x067b,
+    0x067e, 0x067e, 0x067e, 0x067e, 0x0680, 0x0680, 0x0680, 0x0680,
+    0x067a, 0x067a, 0x067a, 0x067a, 0x067f, 0x067f, 0x067f, 0x067f,
+    0x0679, 0x0679, 0x0679, 0x0679, 0x06a4, 0x06a4, 0x06a4, 0x06a4,
+    0x06a6, 0x06a6, 0x06a6, 0x06a6, 0x0684, 0x0684, 0x0684, 0x0684,
+    0x0683, 0x0683, 0x0683, 0x0683, 0x0686, 0x0686, 0x0686, 0x0686,
+    0x0687, 0x0687, 0x0687, 0x0687, 0x068d, 0x068d, 0x068c, 0x068c,
+    0x068e, 0x068e, 0x0688, 0x0688, 0x0698, 0x0698, 0x0691, 0x0691,
+    0x06a9, 0x06a9, 0x06a9, 0x06a9, 0x06af, 0x06af, 0x06af, 0x06af,
+    0x06b3, 0x06b3, 0x06b3, 0x06b3, 0x06b1, 0x06b1, 0x06b1, 0x06b1,
+    0x06ba, 0x06ba, 0x06bb, 0x06bb, 0x06bb, 0x06bb, 0x06d5, 0x0654,
+    0x06d5, 0x0654, 0x06c1, 0x06c1, 0x06c1, 0x06c1, 0x06be, 0x06be,
+    0x06be, 0x06be, 0x06d2, 0x06d2, 0x06d2, 0x0654, 0x06d2, 0x0654,
+    0x06ad, 0x06ad, 0x06ad, 0x06ad, 0x06c7, 0x06c7, 0x06c6, 0x06c6,
+    0x06c8, 0x06c8, 0x06c7, 0x0674, 0x06cb, 0x06cb, 0x06c5, 0x06c5,
+    0x06c9, 0x06c9, 0x06d0, 0x06d0, 0x06d0, 0x06d0, 0x0649, 0x0649,
+    0x064a, 0x0654, 0x0627, 0x064a, 0x0654, 0x0627, 0x064a, 0x0654,
+    0x06d5, 0x064a, 0x0654, 0x06d5, 0x064a, 0x0654, 0x0648, 0x064a,
+    0x0654, 0x0648, 0x064a, 0x0654, 0x06c7, 0x064a, 0x0654, 0x06c7,
+    0x064a, 0x0654, 0x06c6, 0x064a, 0x0654, 0x06c6, 0x064a, 0x0654,
+    0x06c8, 0x064a, 0x0654, 0x06c8, 0x064a, 0x0654, 0x06d0, 0x064a,
+    0x0654, 0x06d0, 0x064a, 0x0654, 0x06d0, 0x064a, 0x0654, 0x0649,
+    0x064a, 0x0654, 0x0649, 0x064a, 0x0654, 0x0649, 0x06cc, 0x06cc,
+    0x06cc, 0x06cc, 0x064a, 0x0654, 0x062c, 0x064a, 0x0654, 0x062d,
+    0x064a, 0x0654, 0x0645, 0x064a, 0x0654, 0x0649, 0x064a, 0x0654,
+    0x064a, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628, 0x062e, 0x0628,
+    0x0645, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, 0x062c, 0x062a,
+    0x062d, 0x062a, 0x062e, 0x062a, 0x0645, 0x062a, 0x0649, 0x062a,
+    0x064a, 0x062b, 0x062c, 0x062b, 0x0645, 0x062b, 0x0649, 0x062b,
+    0x064a, 0x062c, 0x062d, 0x062c, 0x0645, 0x062d, 0x062c, 0x062d,
+    0x0645, 0x062e, 0x062c, 0x062e, 0x062d, 0x062e, 0x0645, 0x0633,
+    0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633, 0x0645, 0x0635,
+    0x062d, 0x0635, 0x0645, 0x0636, 0x062c, 0x0636, 0x062d, 0x0636,
+    0x062e, 0x0636, 0x0645, 0x0637, 0x062d, 0x0637, 0x0645, 0x0638,
+    0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a, 0x062c, 0x063a,
+    0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641, 0x062e, 0x0641,
+    0x0645, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642, 0x062d, 0x0642,
+    0x0645, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, 0x0627, 0x0643,
+    0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, 0x0644, 0x0643,
+    0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644, 0x062c, 0x0644,
+    0x062d, 0x0644, 0x062e, 0x0644, 0x0645, 0x0644, 0x0649, 0x0644,
+    0x064a, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645, 0x062e, 0x0645,
+    0x0645, 0x0645, 0x0649, 0x0645, 0x064a, 0x0646, 0x062c, 0x0646,
+    0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646, 0x0649, 0x0646,
+    0x064a, 0x0647, 0x062c, 0x0647, 0x0645, 0x0647, 0x0649, 0x0647,
+    0x064a, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a, 0x062e, 0x064a,
+    0x0645, 0x064a, 0x0649, 0x064a, 0x064a, 0x0630, 0x0670, 0x0631,
+    0x0670, 0x0649, 0x0670, 0x0020, 0x064c, 0x0651, 0x0020, 0x064d,
+    0x0651, 0x0020, 0x064e, 0x0651, 0x0020, 0x064f, 0x0651, 0x0020,
+    0x0650, 0x0651, 0x0020, 0x0651, 0x0670, 0x064a, 0x0654, 0x0631,
+    0x064a, 0x0654, 0x0632, 0x064a, 0x0654, 0x0645, 0x064a, 0x0654,
+    0x0646, 0x064a, 0x0654, 0x0649, 0x064a, 0x0654, 0x064a, 0x0628,
+    0x0631, 0x0628, 0x0632, 0x0628, 0x0645, 0x0628, 0x0646, 0x0628,
+    0x0649, 0x0628, 0x064a, 0x062a, 0x0631, 0x062a, 0x0632, 0x062a,
+    0x0645, 0x062a, 0x0646, 0x062a, 0x0649, 0x062a, 0x064a, 0x062b,
+    0x0631, 0x062b, 0x0632, 0x062b, 0x0645, 0x062b, 0x0646, 0x062b,
+    0x0649, 0x062b, 0x064a, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642,
+    0x0649, 0x0642, 0x064a, 0x0643, 0x0627, 0x0643, 0x0644, 0x0643,
+    0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644, 0x0645, 0x0644,
+    0x0649, 0x0644, 0x064a, 0x0645, 0x0627, 0x0645, 0x0645, 0x0646,
+    0x0631, 0x0646, 0x0632, 0x0646, 0x0645, 0x0646, 0x0646, 0x0646,
+    0x0649, 0x0646, 0x064a, 0x0649, 0x0670, 0x064a, 0x0631, 0x064a,
+    0x0632, 0x064a, 0x0645, 0x064a, 0x0646, 0x064a, 0x0649, 0x064a,
+    0x064a, 0x064a, 0x0654, 0x062c, 0x064a, 0x0654, 0x062d, 0x064a,
+    0x0654, 0x062e, 0x064a, 0x0654, 0x0645, 0x064a, 0x0654, 0x0647,
+    0x0628, 0x062c, 0x0628, 0x062d, 0x0628, 0x062e, 0x0628, 0x0645,
+    0x0628, 0x0647, 0x062a, 0x062c, 0x062a, 0x062d, 0x062a, 0x062e,
+    0x062a, 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062c, 0x062d,
+    0x062c, 0x0645, 0x062d, 0x062c, 0x062d, 0x0645, 0x062e, 0x062c,
+    0x062e, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e,
+    0x0633, 0x0645, 0x0635, 0x062d, 0x0635, 0x062e, 0x0635, 0x0645,
+    0x0636, 0x062c, 0x0636, 0x062d, 0x0636, 0x062e, 0x0636, 0x0645,
+    0x0637, 0x062d, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645,
+    0x063a, 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d,
+    0x0641, 0x062e, 0x0641, 0x0645, 0x0642, 0x062d, 0x0642, 0x0645,
+    0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, 0x0644,
+    0x0643, 0x0645, 0x0644, 0x062c, 0x0644, 0x062d, 0x0644, 0x062e,
+    0x0644, 0x0645, 0x0644, 0x0647, 0x0645, 0x062c, 0x0645, 0x062d,
+    0x0645, 0x062e, 0x0645, 0x0645, 0x0646, 0x062c, 0x0646, 0x062d,
+    0x0646, 0x062e, 0x0646, 0x0645, 0x0646, 0x0647, 0x0647, 0x062c,
+    0x0647, 0x0645, 0x0647, 0x0670, 0x064a, 0x062c, 0x064a, 0x062d,
+    0x064a, 0x062e, 0x064a, 0x0645, 0x064a, 0x0647, 0x064a, 0x0654,
+    0x0645, 0x064a, 0x0654, 0x0647, 0x0628, 0x0645, 0x0628, 0x0647,
+    0x062a, 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062b, 0x0647,
+    0x0633, 0x0645, 0x0633, 0x0647, 0x0634, 0x0645, 0x0634, 0x0647,
+    0x0643, 0x0644, 0x0643, 0x0645, 0x0644, 0x0645, 0x0646, 0x0645,
+    0x0646, 0x0647, 0x064a, 0x0645, 0x064a, 0x0647, 0x0640, 0x064e,
+    0x0651, 0x0640, 0x064f, 0x0651, 0x0640, 0x0650, 0x0651, 0x0637,
+    0x0649, 0x0637, 0x064a, 0x0639, 0x0649, 0x0639, 0x064a, 0x063a,
+    0x0649, 0x063a, 0x064a, 0x0633, 0x0649, 0x0633, 0x064a, 0x0634,
+    0x0649, 0x0634, 0x064a, 0x062d, 0x0649, 0x062d, 0x064a, 0x062c,
+    0x0649, 0x062c, 0x064a, 0x062e, 0x0649, 0x062e, 0x064a, 0x0635,
+    0x0649, 0x0635, 0x064a, 0x0636, 0x0649, 0x0636, 0x064a, 0x0634,
+    0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0634,
+    0x0631, 0x0633, 0x0631, 0x0635, 0x0631, 0x0636, 0x0631, 0x0637,
+    0x0649, 0x0637, 0x064a, 0x0639, 0x0649, 0x0639, 0x064a, 0x063a,
+    0x0649, 0x063a, 0x064a, 0x0633, 0x0649, 0x0633, 0x064a, 0x0634,
+    0x0649, 0x0634, 0x064a, 0x062d, 0x0649, 0x062d, 0x064a, 0x062c,
+    0x0649, 0x062c, 0x064a, 0x062e, 0x0649, 0x062e, 0x064a, 0x0635,
+    0x0649, 0x0635, 0x064a, 0x0636, 0x0649, 0x0636, 0x064a, 0x0634,
+    0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0634,
+    0x0631, 0x0633, 0x0631, 0x0635, 0x0631, 0x0636, 0x0631, 0x0634,
+    0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0634, 0x0645, 0x0633,
+    0x0647, 0x0634, 0x0647, 0x0637, 0x0645, 0x0633, 0x062c, 0x0633,
+    0x062d, 0x0633, 0x062e, 0x0634, 0x062c, 0x0634, 0x062d, 0x0634,
+    0x062e, 0x0637, 0x0645, 0x0638, 0x0645, 0x0627, 0x064b, 0x0627,
+    0x064b, 0x062a, 0x062c, 0x0645, 0x062a, 0x062d, 0x062c, 0x062a,
+    0x062d, 0x062c, 0x062a, 0x062d, 0x0645, 0x062a, 0x062e, 0x0645,
+    0x062a, 0x0645, 0x062c, 0x062a, 0x0645, 0x062d, 0x062a, 0x0645,
+    0x062e, 0x062c, 0x0645, 0x062d, 0x062c, 0x0645, 0x062d, 0x062d,
+    0x0645, 0x064a, 0x062d, 0x0645, 0x0649, 0x0633, 0x062d, 0x062c,
+    0x0633, 0x062c, 0x062d, 0x0633, 0x062c, 0x0649, 0x0633, 0x0645,
+    0x062d, 0x0633, 0x0645, 0x062d, 0x0633, 0x0645, 0x062c, 0x0633,
+    0x0645, 0x0645, 0x0633, 0x0645, 0x0645, 0x0635, 0x062d, 0x062d,
+    0x0635, 0x062d, 0x062d, 0x0635, 0x0645, 0x0645, 0x0634, 0x062d,
+    0x0645, 0x0634, 0x062d, 0x0645, 0x0634, 0x062c, 0x064a, 0x0634,
+    0x0645, 0x062e, 0x0634, 0x0645, 0x062e, 0x0634, 0x0645, 0x0645,
+    0x0634, 0x0645, 0x0645, 0x0636, 0x062d, 0x0649, 0x0636, 0x062e,
+    0x0645, 0x0636, 0x062e, 0x0645, 0x0637, 0x0645, 0x062d, 0x0637,
+    0x0645, 0x062d, 0x0637, 0x0645, 0x0645, 0x0637, 0x0645, 0x064a,
+    0x0639, 0x062c, 0x0645, 0x0639, 0x0645, 0x0645, 0x0639, 0x0645,
+    0x0645, 0x0639, 0x0645, 0x0649, 0x063a, 0x0645, 0x0645, 0x063a,
+    0x0645, 0x064a, 0x063a, 0x0645, 0x0649, 0x0641, 0x062e, 0x0645,
+    0x0641, 0x062e, 0x0645, 0x0642, 0x0645, 0x062d, 0x0642, 0x0645,
+    0x0645, 0x0644, 0x062d, 0x0645, 0x0644, 0x062d, 0x064a, 0x0644,
+    0x062d, 0x0649, 0x0644, 0x062c, 0x062c, 0x0644, 0x062c, 0x062c,
+    0x0644, 0x062e, 0x0645, 0x0644, 0x062e, 0x0645, 0x0644, 0x0645,
+    0x062d, 0x0644, 0x0645, 0x062d, 0x0645, 0x062d, 0x062c, 0x0645,
+    0x062d, 0x0645, 0x0645, 0x062d, 0x064a, 0x0645, 0x062c, 0x062d,
+    0x0645, 0x062c, 0x0645, 0x0645, 0x062e, 0x062c, 0x0645, 0x062e,
+    0x0645, 0x0645, 0x062c, 0x062e, 0x0647, 0x0645, 0x062c, 0x0647,
+    0x0645, 0x0645, 0x0646, 0x062d, 0x0645, 0x0646, 0x062d, 0x0649,
+    0x0646, 0x062c, 0x0645, 0x0646, 0x062c, 0x0645, 0x0646, 0x062c,
+    0x0649, 0x0646, 0x0645, 0x064a, 0x0646, 0x0645, 0x0649, 0x064a,
+    0x0645, 0x0645, 0x064a, 0x0645, 0x0645, 0x0628, 0x062e, 0x064a,
+    0x062a, 0x062c, 0x064a, 0x062a, 0x062c, 0x0649, 0x062a, 0x062e,
+    0x064a, 0x062a, 0x062e, 0x0649, 0x062a, 0x0645, 0x064a, 0x062a,
+    0x0645, 0x0649, 0x062c, 0x0645, 0x064a, 0x062c, 0x062d, 0x0649,
+    0x062c, 0x0645, 0x0649, 0x0633, 0x062e, 0x0649, 0x0635, 0x062d,
+    0x064a, 0x0634, 0x062d, 0x064a, 0x0636, 0x062d, 0x064a, 0x0644,
+    0x062c, 0x064a, 0x0644, 0x0645, 0x064a, 0x064a, 0x062d, 0x064a,
+    0x064a, 0x062c, 0x064a, 0x064a, 0x0645, 0x064a, 0x0645, 0x0645,
+    0x064a, 0x0642, 0x0645, 0x064a, 0x0646, 0x062d, 0x064a, 0x0642,
+    0x0645, 0x062d, 0x0644, 0x062d, 0x0645, 0x0639, 0x0645, 0x064a,
+    0x0643, 0x0645, 0x064a, 0x0646, 0x062c, 0x062d, 0x0645, 0x062e,
+    0x064a, 0x0644, 0x062c, 0x0645, 0x0643, 0x0645, 0x0645, 0x0644,
+    0x062c, 0x0645, 0x0646, 0x062c, 0x062d, 0x062c, 0x062d, 0x064a,
+    0x062d, 0x062c, 0x064a, 0x0645, 0x062c, 0x064a, 0x0641, 0x0645,
+    0x064a, 0x0628, 0x062d, 0x064a, 0x0643, 0x0645, 0x0645, 0x0639,
+    0x062c, 0x0645, 0x0635, 0x0645, 0x0645, 0x0633, 0x062e, 0x064a,
+    0x0646, 0x062c, 0x064a, 0x0635, 0x0644, 0x06d2, 0x0642, 0x0644,
+    0x06d2, 0x0627, 0x0644, 0x0644, 0x0647, 0x0627, 0x0643, 0x0628,
+    0x0631, 0x0645, 0x062d, 0x0645, 0x062f, 0x0635, 0x0644, 0x0639,
+    0x0645, 0x0631, 0x0633, 0x0648, 0x0644, 0x0639, 0x0644, 0x064a,
+    0x0647, 0x0648, 0x0633, 0x0644, 0x0645, 0x0635, 0x0644, 0x0649,
+    0x0635, 0x0644, 0x0649, 0x0020, 0x0627, 0x0644, 0x0644, 0x0647,
+    0x0020, 0x0639, 0x0644, 0x064a, 0x0647, 0x0020, 0x0648, 0x0633,
+    0x0644, 0x0645, 0x062c, 0x0644, 0x0020, 0x062c, 0x0644, 0x0627,
+    0x0644, 0x0647, 0x0631, 0x06cc, 0x0627, 0x0644, 0x002c, 0x3001,
+    0x3002, 0x003a, 0x003b, 0x0021, 0x003f, 0x3016, 0x3017, 0x002e,
+    0x002e, 0x002e, 0x002e, 0x002e, 0x2014, 0x2013, 0x005f, 0x005f,
+    0x0028, 0x0029, 0x007b, 0x007d, 0x3014, 0x3015, 0x3010, 0x3011,
+    0x300a, 0x300b, 0x3008, 0x3009, 0x300c, 0x300d, 0x300e, 0x300f,
+    0x005b, 0x005d, 0x0020, 0x0305, 0x0020, 0x0305, 0x0020, 0x0305,
+    0x0020, 0x0305, 0x005f, 0x005f, 0x005f, 0x002c, 0x3001, 0x002e,
+    0x003b, 0x003a, 0x003f, 0x0021, 0x2014, 0x0028, 0x0029, 0x007b,
+    0x007d, 0x3014, 0x3015, 0x0023, 0x0026, 0x002a, 0x002b, 0x002d,
+    0x003c, 0x003e, 0x003d, 0x005c, 0x0024, 0x0025, 0x0040, 0x0020,
+    0x064b, 0x0640, 0x064b, 0x0020, 0x064c, 0x0020, 0x064d, 0x0020,
+    0x064e, 0x0640, 0x064e, 0x0020, 0x064f, 0x0640, 0x064f, 0x0020,
+    0x0650, 0x0640, 0x0650, 0x0020, 0x0651, 0x0640, 0x0651, 0x0020,
+    0x0652, 0x0640, 0x0652, 0x0621, 0x0627, 0x0653, 0x0627, 0x0653,
+    0x0627, 0x0654, 0x0627, 0x0654, 0x0648, 0x0654, 0x0648, 0x0654,
+    0x0627, 0x0655, 0x0627, 0x0655, 0x064a, 0x0654, 0x064a, 0x0654,
+    0x064a, 0x0654, 0x064a, 0x0654, 0x0627, 0x0627, 0x0628, 0x0628,
+    0x0628, 0x0628, 0x0629, 0x0629, 0x062a, 0x062a, 0x062a, 0x062a,
+    0x062b, 0x062b, 0x062b, 0x062b, 0x062c, 0x062c, 0x062c, 0x062c,
+    0x062d, 0x062d, 0x062d, 0x062d, 0x062e, 0x062e, 0x062e, 0x062e,
+    0x062f, 0x062f, 0x0630, 0x0630, 0x0631, 0x0631, 0x0632, 0x0632,
+    0x0633, 0x0633, 0x0633, 0x0633, 0x0634, 0x0634, 0x0634, 0x0634,
+    0x0635, 0x0635, 0x0635, 0x0635, 0x0636, 0x0636, 0x0636, 0x0636,
+    0x0637, 0x0637, 0x0637, 0x0637, 0x0638, 0x0638, 0x0638, 0x0638,
+    0x0639, 0x0639, 0x0639, 0x0639, 0x063a, 0x063a, 0x063a, 0x063a,
+    0x0641, 0x0641, 0x0641, 0x0641, 0x0642, 0x0642, 0x0642, 0x0642,
+    0x0643, 0x0643, 0x0643, 0x0643, 0x0644, 0x0644, 0x0644, 0x0644,
+    0x0645, 0x0645, 0x0645, 0x0645, 0x0646, 0x0646, 0x0646, 0x0646,
+    0x0647, 0x0647, 0x0647, 0x0647, 0x0648, 0x0648, 0x0649, 0x0649,
+    0x064a, 0x064a, 0x064a, 0x064a, 0x0644, 0x0627, 0x0653, 0x0644,
+    0x0627, 0x0653, 0x0644, 0x0627, 0x0654, 0x0644, 0x0627, 0x0654,
+    0x0644, 0x0627, 0x0655, 0x0644, 0x0627, 0x0655, 0x0644, 0x0627,
+    0x0644, 0x0627, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026,
+    0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e,
+    0x002f, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036,
+    0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e,
+    0x003f, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046,
+    0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e,
+    0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056,
+    0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e,
+    0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066,
+    0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e,
+    0x006f, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076,
+    0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e,
+    0x2985, 0x2986, 0x3002, 0x300c, 0x300d, 0x3001, 0x30fb, 0x30f2,
+    0x30a1, 0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7,
+    0x30c3, 0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab,
+    0x30ad, 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb,
+    0x30bd, 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb,
+    0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db,
+    0x30de, 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8,
+    0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x3099,
+    0x309a, 0x1160, 0x1100, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad,
+    0x1103, 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4,
+    0x11b5, 0x111a, 0x1106, 0x1107, 0x1108, 0x1121, 0x1109, 0x110a,
+    0x110b, 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112,
+    0x1161, 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168,
+    0x1169, 0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170,
+    0x1171, 0x1172, 0x1173, 0x1174, 0x1175, 0x00a2, 0x00a3, 0x00ac,
+    0x0020, 0x0304, 0x00a6, 0x00a5, 0x20a9, 0x2502, 0x2190, 0x2191,
+    0x2192, 0x2193, 0x25a0, 0x25cb
 };
diff --git a/tools/make_unicode b/tools/make_unicode
index 76526ac6966..c500e68ee9f 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -428,6 +428,14 @@ my %joining_forms =
    "medial" => []
 );
 
+sub get_utf16($)
+{
+    my $ch = shift;
+    return $ch if ($ch < 0x10000);
+    $ch -= 0x10000;
+    return ( 0xd800 | ($ch >> 10), 0xdc00 | ($ch & 0x3ff) );
+}
+
 ################################################################
 # fetch a unicode.org file and open it
 sub open_data_file($$)
@@ -453,7 +461,7 @@ sub get_decomposition($$)
     my ($char, $table) = @_;
     my @ret;
 
-    return $char unless defined ${$table}[$char];
+    return get_utf16($char) unless defined ${$table}[$char];
     foreach my $ch (@{${$table}[$char]})
     {
         push @ret, get_decomposition( $ch, $table );
@@ -614,10 +622,7 @@ sub load_data($)
             elsif ($decomp =~ /^([0-9a-fA-F]+)$/)
             {
                 # Single char decomposition
-                if (hex $1 < 65536)
-                {
-                    $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ];
-                }
+                $decomp_table[$src] = $decomp_compat_table[$src] = [ hex $1 ];
 
                 if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))
                 {