--- old/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2015-07-13 16:12:00.000000000 +0900 +++ new/jdk/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2015-07-13 16:12:00.000000000 +0900 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -318,7 +318,17 @@ /** * The Meetei Mayek range with the Meetei Mayek digits. */ - MEETEI_MAYEK ('\uabf0', '\uabc0', '\uac00'); + MEETEI_MAYEK ('\uabf0', '\uabc0', '\uac00'), + /** + * The Sinhala range with the Sinhala digits. + * @since 1.9 + */ + SINHALA ('\u0de6', '\u0d80', '\u0e00'), + /** + * The Myanmar Extended-B range with the Myanmar Tai Laing digits. + * @since 1.9 + */ + MYANMAR_TAI_LAING ('\ua9f0', '\ua9e0', '\uaa00'); private static int toRangeIndex(Range script) { int index = script.ordinal(); @@ -624,15 +634,25 @@ 0x02e5, 0x02ee, 0x02ef, 0x0370, 0x0374, 0x0376, - 0x037e, 0x0386, + 0x0378, 0x037a, + 0x037e, 0x037f, + 0x0380, 0x0386, 0x0387, 0x0388, + 0x038b, 0x038c, + 0x038d, 0x038e, + 0x03a2, 0x03a3, 0x03f6, 0x03f7, 0x0483, 0x048a, - 0x058a, 0x05be, + 0x0530, 0x0531, + 0x0557, 0x0559, + 0x0560, 0x0561, + 0x0588, 0x0589, + 0x058a, 0x0590, + 0x0591, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c3, 0x05c4, 0x05c6, - 0x05c7, 0x05d0, + 0x05c7, 0x05c8, 0x0600, 0x0608, 0x0609, 0x060b, 0x060c, 0x060d, @@ -643,15 +663,15 @@ 0x06e7, 0x06ee, 0x06f0, 0x06fa, 0x0711, 0x0712, - 0x0730, 0x074d, + 0x0730, 0x074b, 0x07a6, 0x07b1, 0x07eb, 0x07f4, 0x07f6, 0x07fa, 0x0816, 0x081a, 0x081b, 0x0824, 0x0825, 0x0828, - 0x0829, 0x0830, - 0x0859, 0x085e, + 0x0829, 0x082e, + 0x0859, 0x085c, 0x08e4, 0x0903, 0x093a, 0x093b, 0x093c, 0x093d, @@ -660,57 +680,161 @@ 0x0951, 0x0958, 0x0962, 0x0964, 0x0981, 0x0982, - 0x09bc, 0x09bd, + 0x0984, 0x0985, + 0x098d, 0x098f, + 0x0991, 0x0993, + 0x09a9, 0x09aa, + 0x09b1, 0x09b2, + 0x09b3, 0x09b6, + 0x09ba, 0x09bd, 0x09c1, 0x09c7, + 0x09c9, 0x09cb, 0x09cd, 0x09ce, + 0x09cf, 0x09d7, + 0x09d8, 0x09dc, + 0x09de, 0x09df, 0x09e2, 0x09e6, 0x09f2, 0x09f4, 0x09fb, 0x0a03, - 0x0a3c, 0x0a3e, + 0x0a04, 0x0a05, + 0x0a0b, 0x0a0f, + 0x0a11, 0x0a13, + 0x0a29, 0x0a2a, + 0x0a31, 0x0a32, + 0x0a34, 0x0a35, + 0x0a37, 0x0a38, + 0x0a3a, 0x0a3e, 0x0a41, 0x0a59, + 0x0a5d, 0x0a5e, + 0x0a5f, 0x0a66, 0x0a70, 0x0a72, 0x0a75, 0x0a83, - 0x0abc, 0x0abd, + 0x0a84, 0x0a85, + 0x0a8e, 0x0a8f, + 0x0a92, 0x0a93, + 0x0aa9, 0x0aaa, + 0x0ab1, 0x0ab2, + 0x0ab4, 0x0ab5, + 0x0aba, 0x0abd, 0x0ac1, 0x0ac9, + 0x0aca, 0x0acb, 0x0acd, 0x0ad0, + 0x0ad1, 0x0ae0, 0x0ae2, 0x0ae6, 0x0af1, 0x0b02, - 0x0b3c, 0x0b3d, + 0x0b04, 0x0b05, + 0x0b0d, 0x0b0f, + 0x0b11, 0x0b13, + 0x0b29, 0x0b2a, + 0x0b31, 0x0b32, + 0x0b34, 0x0b35, + 0x0b3a, 0x0b3d, 0x0b3f, 0x0b40, 0x0b41, 0x0b47, + 0x0b49, 0x0b4b, 0x0b4d, 0x0b57, + 0x0b58, 0x0b5c, + 0x0b5e, 0x0b5f, 0x0b62, 0x0b66, - 0x0b82, 0x0b83, + 0x0b78, 0x0b83, + 0x0b84, 0x0b85, + 0x0b8b, 0x0b8e, + 0x0b91, 0x0b92, + 0x0b96, 0x0b99, + 0x0b9b, 0x0b9c, + 0x0b9d, 0x0b9e, + 0x0ba0, 0x0ba3, + 0x0ba5, 0x0ba8, + 0x0bab, 0x0bae, + 0x0bba, 0x0bbe, 0x0bc0, 0x0bc1, + 0x0bc3, 0x0bc6, + 0x0bc9, 0x0bca, 0x0bcd, 0x0bd0, + 0x0bd1, 0x0bd7, + 0x0bd8, 0x0be6, 0x0bf3, 0x0c01, + 0x0c04, 0x0c05, + 0x0c0d, 0x0c0e, + 0x0c11, 0x0c12, + 0x0c29, 0x0c2a, + 0x0c3a, 0x0c3d, 0x0c3e, 0x0c41, - 0x0c46, 0x0c58, + 0x0c45, 0x0c58, + 0x0c5a, 0x0c60, 0x0c62, 0x0c66, - 0x0c78, 0x0c7f, - 0x0cbc, 0x0cbd, + 0x0c70, 0x0c7f, + 0x0c80, 0x0c82, + 0x0c84, 0x0c85, + 0x0c8d, 0x0c8e, + 0x0c91, 0x0c92, + 0x0ca9, 0x0caa, + 0x0cb4, 0x0cb5, + 0x0cba, 0x0cbd, + 0x0cc5, 0x0cc6, + 0x0cc9, 0x0cca, 0x0ccc, 0x0cd5, + 0x0cd7, 0x0cde, + 0x0cdf, 0x0ce0, 0x0ce2, 0x0ce6, + 0x0cf0, 0x0cf1, + 0x0cf3, 0x0d02, + 0x0d04, 0x0d05, + 0x0d0d, 0x0d0e, + 0x0d11, 0x0d12, + 0x0d3b, 0x0d3d, 0x0d41, 0x0d46, + 0x0d49, 0x0d4a, 0x0d4d, 0x0d4e, + 0x0d4f, 0x0d57, + 0x0d58, 0x0d60, 0x0d62, 0x0d66, - 0x0dca, 0x0dcf, + 0x0d76, 0x0d79, + 0x0d80, 0x0d82, + 0x0d84, 0x0d85, + 0x0d97, 0x0d9a, + 0x0db2, 0x0db3, + 0x0dbc, 0x0dbd, + 0x0dbe, 0x0dc0, + 0x0dc7, 0x0dcf, 0x0dd2, 0x0dd8, + 0x0de0, 0x0de6, + 0x0df0, 0x0df2, + 0x0df5, 0x0e01, 0x0e31, 0x0e32, 0x0e34, 0x0e40, 0x0e47, 0x0e4f, + 0x0e5c, 0x0e81, + 0x0e83, 0x0e84, + 0x0e85, 0x0e87, + 0x0e89, 0x0e8a, + 0x0e8b, 0x0e8d, + 0x0e8e, 0x0e94, + 0x0e98, 0x0e99, + 0x0ea0, 0x0ea1, + 0x0ea4, 0x0ea5, + 0x0ea6, 0x0ea7, + 0x0ea8, 0x0eaa, + 0x0eac, 0x0ead, 0x0eb1, 0x0eb2, 0x0eb4, 0x0ebd, - 0x0ec8, 0x0ed0, + 0x0ebe, 0x0ec0, + 0x0ec5, 0x0ec6, + 0x0ec7, 0x0ed0, + 0x0eda, 0x0edc, + 0x0ee0, 0x0f00, 0x0f18, 0x0f1a, 0x0f35, 0x0f36, 0x0f37, 0x0f38, 0x0f39, 0x0f3e, - 0x0f71, 0x0f7f, + 0x0f48, 0x0f49, + 0x0f6d, 0x0f7f, 0x0f80, 0x0f85, 0x0f86, 0x0f88, 0x0f8d, 0x0fbe, 0x0fc6, 0x0fc7, + 0x0fcd, 0x0fce, + 0x0fdb, 0x1000, 0x102d, 0x1031, 0x1032, 0x1038, 0x1039, 0x103b, @@ -722,66 +846,119 @@ 0x1085, 0x1087, 0x108d, 0x108e, 0x109d, 0x109e, - 0x135d, 0x1360, + 0x10c6, 0x10c7, + 0x10c8, 0x10cd, + 0x10ce, 0x10d0, + 0x1249, 0x124a, + 0x124e, 0x1250, + 0x1257, 0x1258, + 0x1259, 0x125a, + 0x125e, 0x1260, + 0x1289, 0x128a, + 0x128e, 0x1290, + 0x12b1, 0x12b2, + 0x12b6, 0x12b8, + 0x12bf, 0x12c0, + 0x12c1, 0x12c2, + 0x12c6, 0x12c8, + 0x12d7, 0x12d8, + 0x1311, 0x1312, + 0x1316, 0x1318, + 0x135b, 0x1360, + 0x137d, 0x1380, 0x1390, 0x13a0, - 0x1400, 0x1401, + 0x13f5, 0x1401, 0x1680, 0x1681, 0x169b, 0x16a0, + 0x16f9, 0x1700, + 0x170d, 0x170e, 0x1712, 0x1720, 0x1732, 0x1735, + 0x1737, 0x1740, 0x1752, 0x1760, - 0x1772, 0x1780, + 0x176d, 0x176e, + 0x1771, 0x1780, 0x17b4, 0x17b6, 0x17b7, 0x17be, 0x17c6, 0x17c7, 0x17c9, 0x17d4, 0x17db, 0x17dc, 0x17dd, 0x17e0, - 0x17f0, 0x1810, + 0x17ea, 0x1810, + 0x181a, 0x1820, + 0x1878, 0x1880, 0x18a9, 0x18aa, - 0x1920, 0x1923, + 0x18ab, 0x18b0, + 0x18f6, 0x1900, + 0x191f, 0x1923, 0x1927, 0x1929, + 0x192c, 0x1930, 0x1932, 0x1933, 0x1939, 0x1946, - 0x19de, 0x1a00, + 0x196e, 0x1970, + 0x1975, 0x1980, + 0x19ac, 0x19b0, + 0x19ca, 0x19d0, + 0x19db, 0x1a00, 0x1a17, 0x1a19, + 0x1a1b, 0x1a1e, 0x1a56, 0x1a57, 0x1a58, 0x1a61, 0x1a62, 0x1a63, 0x1a65, 0x1a6d, 0x1a73, 0x1a80, - 0x1b00, 0x1b04, + 0x1a8a, 0x1a90, + 0x1a9a, 0x1aa0, + 0x1aae, 0x1b04, 0x1b34, 0x1b35, 0x1b36, 0x1b3b, 0x1b3c, 0x1b3d, 0x1b42, 0x1b43, + 0x1b4c, 0x1b50, 0x1b6b, 0x1b74, - 0x1b80, 0x1b82, + 0x1b7d, 0x1b82, 0x1ba2, 0x1ba6, 0x1ba8, 0x1baa, - 0x1bab, 0x1bac, + 0x1bab, 0x1bae, 0x1be6, 0x1be7, 0x1be8, 0x1bea, 0x1bed, 0x1bee, 0x1bef, 0x1bf2, + 0x1bf4, 0x1bfc, 0x1c2c, 0x1c34, 0x1c36, 0x1c3b, - 0x1cd0, 0x1cd3, + 0x1c4a, 0x1c4d, + 0x1c80, 0x1cc0, + 0x1cc8, 0x1cd3, 0x1cd4, 0x1ce1, 0x1ce2, 0x1ce9, 0x1ced, 0x1cee, 0x1cf4, 0x1cf5, + 0x1cf7, 0x1d00, 0x1dc0, 0x1e00, + 0x1f16, 0x1f18, + 0x1f1e, 0x1f20, + 0x1f46, 0x1f48, + 0x1f4e, 0x1f50, + 0x1f58, 0x1f59, + 0x1f5a, 0x1f5b, + 0x1f5c, 0x1f5d, + 0x1f5e, 0x1f5f, + 0x1f7e, 0x1f80, + 0x1fb5, 0x1fb6, 0x1fbd, 0x1fbe, 0x1fbf, 0x1fc2, + 0x1fc5, 0x1fc6, 0x1fcd, 0x1fd0, - 0x1fdd, 0x1fe0, + 0x1fd4, 0x1fd6, + 0x1fdc, 0x1fe0, 0x1fed, 0x1ff2, + 0x1ff5, 0x1ff6, 0x1ffd, 0x200e, 0x2010, 0x2071, - 0x2074, 0x207f, + 0x2072, 0x207f, 0x2080, 0x2090, - 0x20a0, 0x2102, + 0x209d, 0x2102, 0x2103, 0x2107, 0x2108, 0x210a, 0x2114, 0x2115, @@ -801,35 +978,59 @@ 0x24ea, 0x26ac, 0x26ad, 0x2800, 0x2900, 0x2c00, + 0x2c2f, 0x2c30, + 0x2c5f, 0x2c60, 0x2ce5, 0x2ceb, 0x2cef, 0x2cf2, - 0x2cf9, 0x2d00, - 0x2d7f, 0x2d80, - 0x2de0, 0x3005, + 0x2cf4, 0x2d00, + 0x2d26, 0x2d27, + 0x2d28, 0x2d2d, + 0x2d2e, 0x2d30, + 0x2d68, 0x2d6f, + 0x2d71, 0x2d80, + 0x2d97, 0x2da0, + 0x2da7, 0x2da8, + 0x2daf, 0x2db0, + 0x2db7, 0x2db8, + 0x2dbf, 0x2dc0, + 0x2dc7, 0x2dc8, + 0x2dcf, 0x2dd0, + 0x2dd7, 0x2dd8, + 0x2ddf, 0x3005, 0x3008, 0x3021, - 0x302a, 0x3031, + 0x302a, 0x302e, + 0x3030, 0x3031, 0x3036, 0x3038, 0x303d, 0x3041, - 0x3099, 0x309d, + 0x3097, 0x309d, 0x30a0, 0x30a1, 0x30fb, 0x30fc, - 0x31c0, 0x31f0, + 0x3100, 0x3105, + 0x312e, 0x3131, + 0x318f, 0x3190, + 0x31bb, 0x31f0, 0x321d, 0x3220, 0x3250, 0x3260, 0x327c, 0x327f, 0x32b1, 0x32c0, 0x32cc, 0x32d0, + 0x32ff, 0x3300, 0x3377, 0x337b, 0x33de, 0x33e0, 0x33ff, 0x3400, - 0x4dc0, 0x4e00, - 0xa490, 0xa4d0, + 0x4db6, 0x4e00, + 0x9fcd, 0xa000, + 0xa48d, 0xa4d0, 0xa60d, 0xa610, + 0xa62c, 0xa640, 0xa66f, 0xa680, - 0xa69f, 0xa6a0, + 0xa69e, 0xa6a0, 0xa6f0, 0xa6f2, - 0xa700, 0xa722, + 0xa6f8, 0xa722, 0xa788, 0xa789, + 0xa78f, 0xa790, + 0xa7ae, 0xa7b0, + 0xa7b2, 0xa7f7, 0xa802, 0xa803, 0xa806, 0xa807, 0xa80b, 0xa80c, @@ -838,77 +1039,241 @@ 0xa838, 0xa840, 0xa874, 0xa880, 0xa8c4, 0xa8ce, - 0xa8e0, 0xa8f2, + 0xa8da, 0xa8f2, + 0xa8fc, 0xa900, 0xa926, 0xa92e, 0xa947, 0xa952, - 0xa980, 0xa983, + 0xa954, 0xa95f, + 0xa97d, 0xa983, 0xa9b3, 0xa9b4, 0xa9b6, 0xa9ba, 0xa9bc, 0xa9bd, + 0xa9ce, 0xa9cf, + 0xa9da, 0xa9de, + 0xa9e5, 0xa9e6, + 0xa9ff, 0xaa00, 0xaa29, 0xaa2f, 0xaa31, 0xaa33, 0xaa35, 0xaa40, 0xaa43, 0xaa44, 0xaa4c, 0xaa4d, + 0xaa4e, 0xaa50, + 0xaa5a, 0xaa5c, + 0xaa7c, 0xaa7d, 0xaab0, 0xaab1, 0xaab2, 0xaab5, 0xaab7, 0xaab9, 0xaabe, 0xaac0, 0xaac1, 0xaac2, + 0xaac3, 0xaadb, 0xaaec, 0xaaee, 0xaaf6, 0xab01, + 0xab07, 0xab09, + 0xab0f, 0xab11, + 0xab17, 0xab20, + 0xab27, 0xab28, + 0xab2f, 0xab30, + 0xab60, 0xab64, + 0xab66, 0xabc0, 0xabe5, 0xabe6, 0xabe8, 0xabe9, 0xabed, 0xabf0, + 0xabfa, 0xac00, + 0xd7a4, 0xd7b0, + 0xd7c7, 0xd7cb, + 0xd7fc, 0xe000, + 0xfa6e, 0xfa70, + 0xfada, 0xfb00, + 0xfb07, 0xfb13, + 0xfb18, 0xfb1d, 0xfb1e, 0xfb1f, 0xfb29, 0xfb2a, - 0xfd3e, 0xfd50, - 0xfdfd, 0xfe70, + 0xfd3e, 0xfd40, + 0xfdd0, 0xfdf0, + 0xfdfd, 0xfdfe, + 0xfe00, 0xfe70, 0xfeff, 0xff21, 0xff3b, 0xff41, 0xff5b, 0xff66, - 0xffe0, 0x10000, + 0xffbf, 0xffc2, + 0xffc8, 0xffca, + 0xffd0, 0xffd2, + 0xffd8, 0xffda, + 0xffdd, 0x10000, + 0x1000c, 0x1000d, + 0x10027, 0x10028, + 0x1003b, 0x1003c, + 0x1003e, 0x1003f, + 0x1004e, 0x10050, + 0x1005e, 0x10080, + 0x100fb, 0x10100, 0x10101, 0x10102, + 0x10103, 0x10107, + 0x10134, 0x10137, 0x10140, 0x101d0, 0x101fd, 0x10280, + 0x1029d, 0x102a0, + 0x102d1, 0x10300, + 0x10324, 0x10330, + 0x1034b, 0x10350, + 0x10376, 0x10380, + 0x1039e, 0x1039f, + 0x103c4, 0x103c8, + 0x103d6, 0x10400, + 0x1049e, 0x104a0, + 0x104aa, 0x10500, + 0x10528, 0x10530, + 0x10564, 0x1056f, + 0x10570, 0x10600, + 0x10737, 0x10740, + 0x10756, 0x10760, + 0x10768, 0x10800, 0x1091f, 0x10920, - 0x10a01, 0x10a10, - 0x10a38, 0x10a40, + 0x10a01, 0x10a04, + 0x10a05, 0x10a07, + 0x10a0c, 0x10a10, + 0x10a38, 0x10a3b, + 0x10a3f, 0x10a40, + 0x10ae5, 0x10ae7, 0x10b39, 0x10b40, - 0x10e60, 0x11000, + 0x10e60, 0x10e7f, 0x11001, 0x11002, 0x11038, 0x11047, - 0x11052, 0x11066, - 0x11080, 0x11082, + 0x1104e, 0x11066, + 0x11070, 0x11082, 0x110b3, 0x110b7, 0x110b9, 0x110bb, - 0x11100, 0x11103, + 0x110c2, 0x110d0, + 0x110e9, 0x110f0, + 0x110fa, 0x11103, 0x11127, 0x1112c, 0x1112d, 0x11136, - 0x11180, 0x11182, + 0x11144, 0x11150, + 0x11173, 0x11174, + 0x11177, 0x11182, 0x111b6, 0x111bf, + 0x111c9, 0x111cd, + 0x111ce, 0x111d0, + 0x111db, 0x111e1, + 0x111f5, 0x11200, + 0x11212, 0x11213, + 0x1122f, 0x11232, + 0x11234, 0x11235, + 0x11236, 0x11238, + 0x1123e, 0x112b0, + 0x112df, 0x112e0, + 0x112e3, 0x112f0, + 0x112fa, 0x11302, + 0x11304, 0x11305, + 0x1130d, 0x1130f, + 0x11311, 0x11313, + 0x11329, 0x1132a, + 0x11331, 0x11332, + 0x11334, 0x11335, + 0x1133a, 0x1133d, + 0x11340, 0x11341, + 0x11345, 0x11347, + 0x11349, 0x1134b, + 0x1134e, 0x11357, + 0x11358, 0x1135d, + 0x11364, 0x11480, + 0x114b3, 0x114b9, + 0x114ba, 0x114bb, + 0x114bf, 0x114c1, + 0x114c2, 0x114c4, + 0x114c8, 0x114d0, + 0x114da, 0x11580, + 0x115b2, 0x115b8, + 0x115bc, 0x115be, + 0x115bf, 0x115c1, + 0x115ca, 0x11600, + 0x11633, 0x1163b, + 0x1163d, 0x1163e, + 0x1163f, 0x11641, + 0x11645, 0x11650, + 0x1165a, 0x11680, 0x116ab, 0x116ac, 0x116ad, 0x116ae, 0x116b0, 0x116b6, 0x116b7, 0x116c0, - 0x16f8f, 0x16f93, + 0x116ca, 0x118a0, + 0x118f3, 0x118ff, + 0x11900, 0x11ac0, + 0x11af9, 0x12000, + 0x12399, 0x12400, + 0x1246f, 0x12470, + 0x12475, 0x13000, + 0x1342f, 0x16800, + 0x16a39, 0x16a40, + 0x16a5f, 0x16a60, + 0x16a6a, 0x16a6e, + 0x16a70, 0x16ad0, + 0x16aee, 0x16af5, + 0x16af6, 0x16b00, + 0x16b30, 0x16b37, + 0x16b46, 0x16b50, + 0x16b5a, 0x16b5b, + 0x16b62, 0x16b63, + 0x16b78, 0x16b7d, + 0x16b90, 0x16f00, + 0x16f45, 0x16f50, + 0x16f7f, 0x16f93, + 0x16fa0, 0x1b000, + 0x1b002, 0x1bc00, + 0x1bc6b, 0x1bc70, + 0x1bc7d, 0x1bc80, + 0x1bc89, 0x1bc90, + 0x1bc9a, 0x1bc9c, + 0x1bc9d, 0x1bc9f, + 0x1bca0, 0x1d000, + 0x1d0f6, 0x1d100, + 0x1d127, 0x1d129, 0x1d167, 0x1d16a, 0x1d173, 0x1d183, 0x1d185, 0x1d18c, 0x1d1aa, 0x1d1ae, - 0x1d200, 0x1d360, + 0x1d1de, 0x1d360, + 0x1d372, 0x1d400, + 0x1d455, 0x1d456, + 0x1d49d, 0x1d49e, + 0x1d4a0, 0x1d4a2, + 0x1d4a3, 0x1d4a5, + 0x1d4a7, 0x1d4a9, + 0x1d4ad, 0x1d4ae, + 0x1d4ba, 0x1d4bb, + 0x1d4bc, 0x1d4bd, + 0x1d4c4, 0x1d4c5, + 0x1d506, 0x1d507, + 0x1d50b, 0x1d50d, + 0x1d515, 0x1d516, + 0x1d51d, 0x1d51e, + 0x1d53a, 0x1d53b, + 0x1d53f, 0x1d540, + 0x1d545, 0x1d546, + 0x1d547, 0x1d54a, + 0x1d551, 0x1d552, + 0x1d6a6, 0x1d6a8, 0x1d6db, 0x1d6dc, 0x1d715, 0x1d716, 0x1d74f, 0x1d750, 0x1d789, 0x1d78a, 0x1d7c3, 0x1d7c4, - 0x1d7ce, 0x1ee00, - 0x1eef0, 0x1f110, + 0x1d7cc, 0x1e800, + 0x1e8d0, 0x1e8d7, + 0x1eef0, 0x1eef2, + 0x1f000, 0x1f110, + 0x1f12f, 0x1f130, 0x1f16a, 0x1f170, - 0x1f300, 0x1f48c, - 0x1f48d, 0x1f524, - 0x1f525, 0x20000, - 0xe0001, 0xf0000, + 0x1f19b, 0x1f1e6, + 0x1f203, 0x1f210, + 0x1f23b, 0x1f240, + 0x1f249, 0x1f250, + 0x1f252, 0x20000, + 0x2a6d7, 0x2a700, + 0x2b735, 0x2b740, + 0x2b81e, 0x2f800, + 0x2fa1e, 0xf0000, + 0xffffe, 0x100000, 0x10fffe, 0x10ffff // sentinel };