src/java.desktop/share/classes/java/awt/font/NumericShaper.java

@@ -647,12 +647,10 @@
         0x03a2, 0x03a3,
         0x03f6, 0x03f7,
         0x0483, 0x048a,
         0x0530, 0x0531,
         0x0557, 0x0559,
-        0x0560, 0x0561,
-        0x0588, 0x0589,
         0x058a, 0x0590,
         0x0591, 0x05be,
         0x05bf, 0x05c0,
         0x05c1, 0x05c3,
         0x05c4, 0x05c6,

@@ -669,10 +667,11 @@
         0x0711, 0x0712,
         0x0730, 0x074b,
         0x07a6, 0x07b1,
         0x07eb, 0x07f4,
         0x07f6, 0x07fa,
+        0x07fd, 0x07fe, 
         0x0816, 0x081a,
         0x081b, 0x0824,
         0x0825, 0x0828,
         0x0829, 0x082e,
         0x0859, 0x085c,

@@ -711,11 +710,12 @@
         0x0a3a, 0x0a3e,
         0x0a41, 0x0a59,
         0x0a5d, 0x0a5e,
         0x0a5f, 0x0a66,
         0x0a70, 0x0a72,
-        0x0a75, 0x0a83,
+        0x0a75, 0x0a76,
+        0x0a73, 0x0a83,        
         0x0a84, 0x0a85,
         0x0a8e, 0x0a8f,
         0x0a92, 0x0a93,
         0x0aa9, 0x0aaa,
         0x0ab1, 0x0ab2,

@@ -769,11 +769,10 @@
         0x0c45, 0x0c58,
         0x0c5b, 0x0c60,
         0x0c62, 0x0c66,
         0x0c70, 0x0c7f,
         0x0c81, 0x0c82,
-        0x0c84, 0x0c85,
         0x0c8d, 0x0c8e,
         0x0c91, 0x0c92,
         0x0ca9, 0x0caa,
         0x0cb4, 0x0cb5,
         0x0cba, 0x0cbd,

@@ -888,11 +887,11 @@
         0x17c9, 0x17d4,
         0x17db, 0x17dc,
         0x17dd, 0x17e0,
         0x17ea, 0x1810,
         0x181a, 0x1820,
-        0x1878, 0x1884,
+        0x1879, 0x1884,
         0x1885, 0x1887,
         0x18a9, 0x18aa,
         0x18ab, 0x18b0,
         0x18f6, 0x1900,
         0x191f, 0x1923,

@@ -931,10 +930,12 @@
         0x1bef, 0x1bf2,
         0x1bf4, 0x1bfc,
         0x1c2c, 0x1c34,
         0x1c36, 0x1c3b,
         0x1c4a, 0x1c4d,
+        0x1c89, 0x1c90,
+        0x1cbb, 0x1cbd,
         0x1cc8, 0x1cd3,
         0x1cd4, 0x1ce1,
         0x1ce2, 0x1ce9,
         0x1ced, 0x1cee,
         0x1cf4, 0x1cf5,

@@ -1008,11 +1009,11 @@
         0x303d, 0x3041,
         0x3097, 0x309d,
         0x30a0, 0x30a1,
         0x30fb, 0x30fc,
         0x3100, 0x3105,
-        0x312f, 0x3131,
+        0x3130, 0x3131,
         0x318f, 0x3190,
         0x31bb, 0x31f0,
         0x321d, 0x3220,
         0x3250, 0x3260,
         0x327c, 0x327f,

@@ -1021,31 +1022,30 @@
         0x32ff, 0x3300,
         0x3377, 0x337b,
         0x33de, 0x33e0,
         0x33ff, 0x3400,
         0x4db6, 0x4e00,
-        0x9feb, 0xa000,
+        0x9ff0, 0xa000,
         0xa48d, 0xa4d0,
         0xa60d, 0xa610,
         0xa62c, 0xa640,
         0xa66f, 0xa680,
         0xa69e, 0xa6a0,
         0xa6f0, 0xa6f2,
         0xa6f8, 0xa722,
         0xa788, 0xa789,
-        0xa7af, 0xa7b0,
-        0xa7b8, 0xa7f7,
+        0xa7ba, 0xa7f7,
         0xa802, 0xa803,
         0xa806, 0xa807,
         0xa80b, 0xa80c,
         0xa825, 0xa827,
         0xa828, 0xa830,
         0xa838, 0xa840,
         0xa874, 0xa880,
         0xa8c4, 0xa8ce,
         0xa8da, 0xa8f2,
-        0xa8fe, 0xa900,
+        0xa8ff, 0xa900,
         0xa926, 0xa92e,
         0xa947, 0xa952,
         0xa954, 0xa95f,
         0xa97d, 0xa983,
         0xa9b3, 0xa9b4,

@@ -1139,27 +1139,30 @@
         0x10a0c, 0x10a10,
         0x10a38, 0x10a3b,
         0x10a3f, 0x10a40,
         0x10ae5, 0x10ae7,
         0x10b39, 0x10b40,
+        0x10d00, 0x10d40, 
         0x10e60, 0x10e7f,
+        0x10f30, 0x10f70,
         0x11001, 0x11002,
         0x11038, 0x11047,
         0x1104e, 0x11066,
         0x11070, 0x11082,
         0x110b3, 0x110b7,
         0x110b9, 0x110bb,
-        0x110c2, 0x110d0,
+        0x110c2, 0x110cd,
+        0x110ce, 0x110d0,
         0x110e9, 0x110f0,
         0x110fa, 0x11103,
         0x11127, 0x1112c,
         0x1112d, 0x11136,
-        0x11144, 0x11150,
+        0x11147, 0x11150,
         0x11173, 0x11174,
         0x11177, 0x11182,
         0x111b6, 0x111bf,
-        0x111ca, 0x111cd,
+        0x111c9, 0x111cd,
         0x111ce, 0x111d0,
         0x111e0, 0x111e1,
         0x111f5, 0x11200,
         0x11212, 0x11213,
         0x1122f, 0x11232,

@@ -1212,14 +1215,16 @@
         0x116ab, 0x116ac,
         0x116ad, 0x116ae,
         0x116b0, 0x116b6,
         0x116b7, 0x116c0,
         0x116ca, 0x11700,
-        0x1171a, 0x11720,
+        0x1171b, 0x11720,
         0x11722, 0x11726,
         0x11727, 0x11730,
-        0x11740, 0x118a0,
+        0x1182f, 0x11838,
+        0x11839, 0x1183b,
+        0x1183c, 0x118a0,
         0x118f3, 0x118ff,
         0x11900, 0x11a00,
         0x11a01, 0x11a07,
         0x11a09, 0x11a0b,
         0x11a33, 0x11a3a,

@@ -1228,14 +1233,13 @@
         0x11a51, 0x11a57,
         0x11a59, 0x11a5c,
         0x11a84, 0x11a86,
         0x11a8a, 0x11a97,
         0x11a98, 0x11a9a,
-        0x11a9d, 0x11a9e,
         0x11aa3, 0x11ac0,
-        0x11af9, 0x11C00,
-        0x11C09, 0x11c0a,
+        0x11af9, 0x11c00,
+        0x11c09, 0x11c0a,
         0x11c30, 0x11c3e,
         0x11c46, 0x11c50,
         0x11c6d, 0x11c70,
         0x11c90, 0x11ca9,
         0x11caa, 0x11cb1,

@@ -1243,11 +1247,20 @@
         0x11cb5, 0x11d00,
         0x11d07, 0x11d08,
         0x11d0a, 0x11d0b,
         0x11d31, 0x11d46,
         0x11d47, 0x11d50,
-        0x11d5a, 0x12000,
+        0x11d5a, 0x11d60,
+        0x11d66, 0x11d67,
+        0x11d69, 0x11d6a,
+        0x11d8f, 0x11d93,
+        0x11d95, 0x11d96,
+        0x11d97, 0x11d98,
+        0x11d99, 0x11da0,
+        0x11daa, 0x11ee0,
+        0x11ef3, 0x11ef5,
+        0x11ef9, 0x12000,   
         0x1239a, 0x12400,
         0x1246f, 0x12470,
         0x12475, 0x12480,
         0x12544, 0x13000,
         0x1342f, 0x14400,

@@ -1261,16 +1274,17 @@
         0x16b30, 0x16b37,
         0x16b46, 0x16b50,
         0x16b5a, 0x16b5b,
         0x16b62, 0x16b63,
         0x16b78, 0x16b7d,
-        0x16b90, 0x16f00,
+        0x16b90, 0x16e40,
+        0x16e9b, 0x16f00,
         0x16f45, 0x16f50,
         0x16f7f, 0x16f93,
         0x16fa0, 0x16fe0,
         0x16fe2, 0x17000,
-        0x187ed, 0x18800,
+        0x187f2, 0x18800,
         0x18af3, 0x1b000,
         0x1b11f, 0x1b170,
         0x1b2fc, 0x1bc00,
         0x1bc6b, 0x1bc70,
         0x1bc7d, 0x1bc80,

@@ -1282,12 +1296,13 @@
         0x1d127, 0x1d129,
         0x1d167, 0x1d16a,
         0x1d173, 0x1d183,
         0x1d185, 0x1d18c,
         0x1d1aa, 0x1d1ae,
-        0x1d1e9, 0x1d360,
-        0x1d372, 0x1d400,
+        0x1d1e9, 0x1d2e0,
+        0x1d2f4, 0x1d360,
+        0x1d379, 0x1d400,
         0x1d455, 0x1d456,
         0x1d49d, 0x1d49e,
         0x1d4a0, 0x1d4a2,
         0x1d4a3, 0x1d4a5,
         0x1d4a7, 0x1d4a9,

@@ -1316,11 +1331,12 @@
         0x1da75, 0x1da76,
         0x1da84, 0x1da85,
         0x1da8c, 0x1e800,
         0x1e8d0, 0x1e8d7,
         0x1e944, 0x1e94b,
-        0x1eef0, 0x1eef2,
+        0x1ec70, 0x1ecc0,
+        0x1ee00, 0x1ef00,
         0x1f000, 0x1f110,
         0x1f12f, 0x1f130,
         0x1f16a, 0x1f170,
         0x1f1ad, 0x1f1e6,
         0x1f203, 0x1f210,