--- old/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2018-01-04 14:57:40.000000000 +0530 +++ new/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2018-01-04 14:57:40.000000000 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2018, 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 @@ -699,7 +699,8 @@ 0x09de, 0x09df, 0x09e2, 0x09e6, 0x09f2, 0x09f4, - 0x09fb, 0x0a03, + 0x09fb, 0x09fc, + 0x09fe, 0x0a03, 0x0a04, 0x0a05, 0x0a0b, 0x0a0f, 0x0a11, 0x0a13, @@ -769,7 +770,7 @@ 0x0c5b, 0x0c60, 0x0c62, 0x0c66, 0x0c70, 0x0c7f, - 0x0c80, 0x0c82, + 0x0c81, 0x0c82, 0x0c84, 0x0c85, 0x0c8d, 0x0c8e, 0x0c91, 0x0c92, @@ -791,10 +792,7 @@ 0x0d41, 0x0d46, 0x0d49, 0x0d4a, 0x0d4d, 0x0d4e, - 0x0d4f, 0x0d57, - 0x0d58, 0x0d5f, 0x0d62, 0x0d66, - 0x0d76, 0x0d79, 0x0d80, 0x0d82, 0x0d84, 0x0d85, 0x0d97, 0x0d9a, @@ -892,7 +890,8 @@ 0x17dd, 0x17e0, 0x17ea, 0x1810, 0x181a, 0x1820, - 0x1878, 0x1880, + 0x1878, 0x1884, + 0x1885, 0x1887, 0x18a9, 0x18aa, 0x18ab, 0x18b0, 0x18f6, 0x1900, @@ -934,13 +933,12 @@ 0x1c2c, 0x1c34, 0x1c36, 0x1c3b, 0x1c4a, 0x1c4d, - 0x1c80, 0x1cc0, 0x1cc8, 0x1cd3, 0x1cd4, 0x1ce1, 0x1ce2, 0x1ce9, 0x1ced, 0x1cee, 0x1cf4, 0x1cf5, - 0x1cf7, 0x1d00, + 0x1cf8, 0x1d00, 0x1dc0, 0x1e00, 0x1f16, 0x1f18, 0x1f1e, 0x1f20, @@ -1012,7 +1010,7 @@ 0x30a0, 0x30a1, 0x30fb, 0x30fc, 0x3100, 0x3105, - 0x312e, 0x3131, + 0x312f, 0x3131, 0x318f, 0x3190, 0x31bb, 0x31f0, 0x321d, 0x3220, @@ -1025,7 +1023,7 @@ 0x33de, 0x33e0, 0x33ff, 0x3400, 0x4db6, 0x4e00, - 0x9fd6, 0xa000, + 0x9feb, 0xa000, 0xa48d, 0xa4d0, 0xa60d, 0xa610, 0xa62c, 0xa640, @@ -1034,7 +1032,7 @@ 0xa6f0, 0xa6f2, 0xa6f8, 0xa722, 0xa788, 0xa789, - 0xa7ae, 0xa7b0, + 0xa7af, 0xa7b0, 0xa7b8, 0xa7f7, 0xa802, 0xa803, 0xa806, 0xa807, @@ -1114,24 +1112,27 @@ 0x10101, 0x10102, 0x10103, 0x10107, 0x10134, 0x10137, - 0x10140, 0x101d0, + 0x10140, 0x1018d, + 0x1018f, 0x101d0, 0x101fd, 0x10280, 0x1029d, 0x102a0, 0x102d1, 0x10300, - 0x10324, 0x10330, + 0x10324, 0x1032d, 0x1034b, 0x10350, 0x10376, 0x10380, 0x1039e, 0x1039f, 0x103c4, 0x103c8, 0x103d6, 0x10400, 0x1049e, 0x104a0, - 0x104aa, 0x10500, + 0x104aa, 0x104d3, + 0x104d4, 0x104d8, + 0x104fc, 0x10500, 0x10528, 0x10530, 0x10564, 0x1056f, 0x10570, 0x10600, 0x10737, 0x10740, 0x10756, 0x10760, - 0x10768, 0x10800, + 0x10768, 0x10800, 0x1091f, 0x10920, 0x10a01, 0x10a04, 0x10a05, 0x10a07, @@ -1186,7 +1187,13 @@ 0x1134e, 0x11350, 0x11351, 0x11357, 0x11358, 0x1135d, - 0x11364, 0x11480, + 0x11364, 0x11400, + 0x11438, 0x11440, + 0x11442, 0x11445, + 0x11446, 0x11447, + 0x1145a, 0x1145b, + 0x1145c, 0x1145d, + 0x1145e, 0x11480, 0x114b3, 0x114b9, 0x114ba, 0x114bb, 0x114bf, 0x114c1, @@ -1212,8 +1219,33 @@ 0x11727, 0x11730, 0x11740, 0x118a0, 0x118f3, 0x118ff, - 0x11900, 0x11ac0, - 0x11af9, 0x12000, + 0x11900, 0x11a00, + 0x11a01, 0x11a07, + 0x11a09, 0x11a0b, + 0x11a33, 0x11a3a, + 0x11a3b, 0x11a3f, + 0x11a47, 0x11a50, + 0x11a51, 0x11a57, + 0x11a59, 0x11a5c, + 0x11a84, 0x11a86, + 0x11a8a, 0x11a97, + 0x11a98, 0x11a9a, + 0x11a9d, 0x11a9e, + 0x11aa3, 0x11ac0, + 0x11af9, 0x11C00, + 0x11C09, 0x11c0a, + 0x11c30, 0x11c3e, + 0x11c46, 0x11c50, + 0x11c6d, 0x11c70, + 0x11c90, 0x11ca9, + 0x11caa, 0x11cb1, + 0x11cb2, 0x11cb4, + 0x11cb5, 0x11d00, + 0x11d07, 0x11d08, + 0x11d0a, 0x11d0b, + 0x11d31, 0x11d46, + 0x11d47, 0x11d50, + 0x11d5a, 0x12000, 0x1239a, 0x12400, 0x1246f, 0x12470, 0x12475, 0x12480, @@ -1234,8 +1266,12 @@ 0x16b90, 0x16f00, 0x16f45, 0x16f50, 0x16f7f, 0x16f93, - 0x16fa0, 0x1b000, - 0x1b002, 0x1bc00, + 0x16fa0, 0x16fe0, + 0x16fe2, 0x17000, + 0x187ed, 0x18800, + 0x18af3, 0x1b000, + 0x1b11f, 0x1b170, + 0x1b2fc, 0x1bc00, 0x1bc6b, 0x1bc70, 0x1bc7d, 0x1bc80, 0x1bc89, 0x1bc90, @@ -1281,19 +1317,21 @@ 0x1da84, 0x1da85, 0x1da8c, 0x1e800, 0x1e8d0, 0x1e8d7, + 0x1e944, 0x1e94b, 0x1eef0, 0x1eef2, 0x1f000, 0x1f110, 0x1f12f, 0x1f130, 0x1f16a, 0x1f170, - 0x1f19b, 0x1f1e6, + 0x1f1ad, 0x1f1e6, 0x1f203, 0x1f210, - 0x1f23b, 0x1f240, + 0x1f23c, 0x1f240, 0x1f249, 0x1f250, 0x1f252, 0x20000, 0x2a6d7, 0x2a700, 0x2b735, 0x2b740, 0x2b81e, 0x2b820, - 0x2cea2, 0x2f800, + 0x2cea2, 0x2ceb0, + 0x2ebe1, 0x2f800, 0x2fa1e, 0xf0000, 0xffffe, 0x100000, 0x10fffe, 0x10ffff // sentinel