From 453ec04bfa52578c9b2ff137b4fbad4d4dcd9422 Mon Sep 17 00:00:00 2001 From: James Ring Date: Tue, 29 Aug 2023 13:21:16 -0700 Subject: [PATCH] Updated Unicode tables to Unicode 10 --- build.gradle | 4 +- java/com/google/re2j/Unicode.java | 2 +- java/com/google/re2j/UnicodeTables.java | 2163 ++++++++++++++++----- javatests/com/google/re2j/ParserTest.java | 4 +- unicode/build.gradle | 2 +- 5 files changed, 1639 insertions(+), 536 deletions(-) diff --git a/build.gradle b/build.gradle index 7c23235b..c1e91269 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,8 @@ wrapper { gradleVersion '5.2' } -sourceCompatibility = 1.6 -targetCompatibility = 1.6 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 repositories { mavenCentral() diff --git a/java/com/google/re2j/Unicode.java b/java/com/google/re2j/Unicode.java index c30bd23b..0415fcd5 100644 --- a/java/com/google/re2j/Unicode.java +++ b/java/com/google/re2j/Unicode.java @@ -28,7 +28,7 @@ class Unicode { // Minimum and maximum runes involved in folding. // Checked during test. static final int MIN_FOLD = 0x0041; - static final int MAX_FOLD = 0x1044f; + static final int MAX_FOLD = 0x1E943; // is32 uses binary search to test whether rune is in the specified // slice of 32-bit ranges. diff --git a/java/com/google/re2j/UnicodeTables.java b/java/com/google/re2j/UnicodeTables.java index 8bd827fb..8cabce19 100644 --- a/java/com/google/re2j/UnicodeTables.java +++ b/java/com/google/re2j/UnicodeTables.java @@ -1,10 +1,10 @@ /* - * Copyright (c) 2020 The Go Authors. All rights reserved. + * Copyright (c) 2023 The Go Authors. All rights reserved. * * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ -// Generated at 2020-06-09T16:20:06.352Z by Java 1.8.0_181 using Unicode version 6.0.0.0. +// Generated at 2023-08-29T20:58:39.441939Z by Java 11.0.18 using Unicode version 10.0.0.0. // Do not change this file, your edits will be lost. Instead change UnicodeTablesGenerator.java. package com.google.re2j; @@ -91,18 +91,12 @@ final class UnicodeTables { static final int[][] Inherited = make_Inherited(); - static final int[][] Bamum = make_Bamum(); - static final int[][] Arabic = make_Arabic(); - static final int[][] Lisu = make_Lisu(); - static final int[][] Armenian = make_Armenian(); static final int[][] Bengali = make_Bengali(); - static final int[][] Old_South_Arabian = make_Old_South_Arabian(); - static final int[][] Bopomofo = make_Bopomofo(); static final int[][] Cherokee = make_Cherokee(); @@ -225,22 +219,34 @@ final class UnicodeTables { static final int[][] Egyptian_Hieroglyphs = make_Egyptian_Hieroglyphs(); + static final int[][] Pahawh_Hmong = make_Pahawh_Hmong(); + + static final int[][] Old_Hungarian = make_Old_Hungarian(); + static final int[][] Javanese = make_Javanese(); static final int[][] Kayah_Li = make_Kayah_Li(); static final int[][] Lepcha = make_Lepcha(); + static final int[][] Linear_A = make_Linear_A(); + static final int[][] Mandaic = make_Mandaic(); + static final int[][] Meroitic_Hieroglyphs = make_Meroitic_Hieroglyphs(); + static final int[][] Nko = make_Nko(); static final int[][] Old_Turkic = make_Old_Turkic(); + static final int[][] Old_Permic = make_Old_Permic(); + static final int[][] Phags_Pa = make_Phags_Pa(); static final int[][] Phoenician = make_Phoenician(); + static final int[][] Miao = make_Miao(); + static final int[][] Vai = make_Vai(); static final int[][] Cuneiform = make_Cuneiform(); @@ -261,6 +267,8 @@ final class UnicodeTables { static final int[][] Saurashtra = make_Saurashtra(); + static final int[][] SignWriting = make_SignWriting(); + static final int[][] Sundanese = make_Sundanese(); static final int[][] Meetei_Mayek = make_Meetei_Mayek(); @@ -269,16 +277,100 @@ final class UnicodeTables { static final int[][] Avestan = make_Avestan(); + static final int[][] Chakma = make_Chakma(); + static final int[][] Kaithi = make_Kaithi(); + static final int[][] Manichaean = make_Manichaean(); + static final int[][] Inscriptional_Pahlavi = make_Inscriptional_Pahlavi(); + static final int[][] Psalter_Pahlavi = make_Psalter_Pahlavi(); + static final int[][] Inscriptional_Parthian = make_Inscriptional_Parthian(); static final int[][] Samaritan = make_Samaritan(); static final int[][] Tai_Viet = make_Tai_Viet(); + static final int[][] Bamum = make_Bamum(); + + static final int[][] Lisu = make_Lisu(); + + static final int[][] Old_South_Arabian = make_Old_South_Arabian(); + + static final int[][] Bassa_Vah = make_Bassa_Vah(); + + static final int[][] Duployan = make_Duployan(); + + static final int[][] Elbasan = make_Elbasan(); + + static final int[][] Grantha = make_Grantha(); + + static final int[][] Mende_Kikakui = make_Mende_Kikakui(); + + static final int[][] Meroitic_Cursive = make_Meroitic_Cursive(); + + static final int[][] Old_North_Arabian = make_Old_North_Arabian(); + + static final int[][] Nabataean = make_Nabataean(); + + static final int[][] Palmyrene = make_Palmyrene(); + + static final int[][] Khudawadi = make_Khudawadi(); + + static final int[][] Warang_Citi = make_Warang_Citi(); + + static final int[][] Mro = make_Mro(); + + static final int[][] Nushu = make_Nushu(); + + static final int[][] Sharada = make_Sharada(); + + static final int[][] Sora_Sompeng = make_Sora_Sompeng(); + + static final int[][] Takri = make_Takri(); + + static final int[][] Tangut = make_Tangut(); + + static final int[][] Anatolian_Hieroglyphs = make_Anatolian_Hieroglyphs(); + + static final int[][] Khojki = make_Khojki(); + + static final int[][] Tirhuta = make_Tirhuta(); + + static final int[][] Caucasian_Albanian = make_Caucasian_Albanian(); + + static final int[][] Mahajani = make_Mahajani(); + + static final int[][] Ahom = make_Ahom(); + + static final int[][] Hatran = make_Hatran(); + + static final int[][] Modi = make_Modi(); + + static final int[][] Multani = make_Multani(); + + static final int[][] Pau_Cin_Hau = make_Pau_Cin_Hau(); + + static final int[][] Siddham = make_Siddham(); + + static final int[][] Adlam = make_Adlam(); + + static final int[][] Bhaiksuki = make_Bhaiksuki(); + + static final int[][] Marchen = make_Marchen(); + + static final int[][] Newa = make_Newa(); + + static final int[][] Osage = make_Osage(); + + static final int[][] Masaram_Gondi = make_Masaram_Gondi(); + + static final int[][] Soyombo = make_Soyombo(); + + static final int[][] Zanabazar_Square = make_Zanabazar_Square(); + static final int[][] Upper = Lu; static final Map CATEGORIES = Categories(); @@ -304,7 +396,7 @@ final class UnicodeTables { static final Map FOLD_CATEGORIES = FoldCategory(); static { - CASE_ORBIT = new char[8492]; + CASE_ORBIT = new char[42572]; CASE_ORBIT[0x4b] = 0x6b; CASE_ORBIT[0x53] = 0x73; CASE_ORBIT[0x6b] = 0x212a; @@ -360,6 +452,29 @@ final class UnicodeTables { CASE_ORBIT[0x3f1] = 0x3a1; CASE_ORBIT[0x3f4] = 0x398; CASE_ORBIT[0x3f5] = 0x395; + CASE_ORBIT[0x412] = 0x432; + CASE_ORBIT[0x414] = 0x434; + CASE_ORBIT[0x41e] = 0x43e; + CASE_ORBIT[0x421] = 0x441; + CASE_ORBIT[0x422] = 0x442; + CASE_ORBIT[0x42a] = 0x44a; + CASE_ORBIT[0x432] = 0x1c80; + CASE_ORBIT[0x434] = 0x1c81; + CASE_ORBIT[0x43e] = 0x1c82; + CASE_ORBIT[0x441] = 0x1c83; + CASE_ORBIT[0x442] = 0x1c84; + CASE_ORBIT[0x44a] = 0x1c86; + CASE_ORBIT[0x462] = 0x463; + CASE_ORBIT[0x463] = 0x1c87; + CASE_ORBIT[0x1c80] = 0x412; + CASE_ORBIT[0x1c81] = 0x414; + CASE_ORBIT[0x1c82] = 0x41e; + CASE_ORBIT[0x1c83] = 0x421; + CASE_ORBIT[0x1c84] = 0x1c85; + CASE_ORBIT[0x1c85] = 0x422; + CASE_ORBIT[0x1c86] = 0x42a; + CASE_ORBIT[0x1c87] = 0x462; + CASE_ORBIT[0x1c88] = 0xa64a; CASE_ORBIT[0x1e60] = 0x1e61; CASE_ORBIT[0x1e61] = 0x1e9b; CASE_ORBIT[0x1e9b] = 0x1e60; @@ -368,6 +483,8 @@ final class UnicodeTables { CASE_ORBIT[0x2126] = 0x3a9; CASE_ORBIT[0x212a] = 0x4b; CASE_ORBIT[0x212b] = 0xc5; + CASE_ORBIT[0xa64a] = 0xa64b; + CASE_ORBIT[0xa64b] = 0x1c88; } private UnicodeTables() {} @@ -409,8 +526,9 @@ private static int[][] make_Lu() { {0x0244, 0x0246, 1}, {0x0248, 0x024E, 2}, {0x0370, 0x0372, 2}, - {0x0376, 0x0386, 16}, - {0x0388, 0x038A, 1}, + {0x0376, 0x037F, 9}, + {0x0386, 0x0388, 2}, + {0x0389, 0x038A, 1}, {0x038C, 0x038E, 2}, {0x038F, 0x0391, 2}, {0x0392, 0x03A1, 1}, @@ -424,9 +542,11 @@ private static int[][] make_Lu() { {0x0460, 0x0480, 2}, {0x048A, 0x04C0, 2}, {0x04C1, 0x04CD, 2}, - {0x04D0, 0x0526, 2}, + {0x04D0, 0x052E, 2}, {0x0531, 0x0556, 1}, {0x10A0, 0x10C5, 1}, + {0x10C7, 0x10CD, 6}, + {0x13A0, 0x13F5, 1}, {0x1E00, 0x1E94, 2}, {0x1E9E, 0x1EFE, 2}, {0x1F08, 0x1F0F, 1}, @@ -460,17 +580,24 @@ private static int[][] make_Lu() { {0x2C7E, 0x2C80, 1}, {0x2C82, 0x2CE2, 2}, {0x2CEB, 0x2CED, 2}, - {0xA640, 0xA66C, 2}, - {0xA680, 0xA696, 2}, + {0x2CF2, 0xA640, 31054}, + {0xA642, 0xA66C, 2}, + {0xA680, 0xA69A, 2}, {0xA722, 0xA72E, 2}, {0xA732, 0xA76E, 2}, {0xA779, 0xA77D, 2}, {0xA77E, 0xA786, 2}, {0xA78B, 0xA78D, 2}, - {0xA790, 0xA7A0, 16}, - {0xA7A2, 0xA7A8, 2}, - {0xFF21, 0xFF3A, 1}, + {0xA790, 0xA792, 2}, + {0xA796, 0xA7AA, 2}, + {0xA7AB, 0xA7AE, 1}, + {0xA7B0, 0xA7B4, 1}, + {0xA7B6, 0xFF21, 22379}, + {0xFF22, 0xFF3A, 1}, {0x10400, 0x10427, 1}, + {0x104B0, 0x104D3, 1}, + {0x10C80, 0x10CB2, 1}, + {0x118A0, 0x118BF, 1}, {0x1D400, 0x1D419, 1}, {0x1D434, 0x1D44D, 1}, {0x1D468, 0x1D481, 1}, @@ -500,15 +627,15 @@ private static int[][] make_Lu() { {0x1D71C, 0x1D734, 1}, {0x1D756, 0x1D76E, 1}, {0x1D790, 0x1D7A8, 1}, - {0x1D7CA, 0x1D7CA, 1} + {0x1D7CA, 0x1E900, 4406}, + {0x1E901, 0x1E921, 1} }; } private static int[][] make_Ll() { return new int[][] { {0x0061, 0x007A, 1}, - {0x00AA, 0x00B5, 11}, - {0x00BA, 0x00DF, 37}, + {0x00B5, 0x00DF, 42}, {0x00E0, 0x00F6, 1}, {0x00F8, 0x00FF, 1}, {0x0101, 0x0137, 2}, @@ -556,10 +683,12 @@ private static int[][] make_Ll() { {0x0461, 0x0481, 2}, {0x048B, 0x04BF, 2}, {0x04C2, 0x04CE, 2}, - {0x04CF, 0x0527, 2}, + {0x04CF, 0x052F, 2}, {0x0561, 0x0587, 1}, + {0x13F8, 0x13FD, 1}, + {0x1C80, 0x1C88, 1}, {0x1D00, 0x1D2B, 1}, - {0x1D62, 0x1D77, 1}, + {0x1D6B, 0x1D77, 1}, {0x1D79, 0x1D9A, 1}, {0x1E01, 0x1E95, 2}, {0x1E96, 0x1E9D, 1}, @@ -596,13 +725,14 @@ private static int[][] make_Ll() { {0x2C66, 0x2C6C, 2}, {0x2C71, 0x2C73, 2}, {0x2C74, 0x2C76, 2}, - {0x2C77, 0x2C7C, 1}, + {0x2C77, 0x2C7B, 1}, {0x2C81, 0x2CE3, 2}, {0x2CE4, 0x2CEC, 8}, - {0x2CEE, 0x2D00, 18}, - {0x2D01, 0x2D25, 1}, + {0x2CEE, 0x2CF3, 5}, + {0x2D00, 0x2D25, 1}, + {0x2D27, 0x2D2D, 6}, {0xA641, 0xA66D, 2}, - {0xA681, 0xA697, 2}, + {0xA681, 0xA69B, 2}, {0xA723, 0xA72F, 2}, {0xA730, 0xA731, 1}, {0xA733, 0xA771, 2}, @@ -610,13 +740,21 @@ private static int[][] make_Ll() { {0xA77A, 0xA77C, 2}, {0xA77F, 0xA787, 2}, {0xA78C, 0xA78E, 2}, - {0xA791, 0xA7A1, 16}, - {0xA7A3, 0xA7A9, 2}, - {0xA7FA, 0xFB00, 21254}, - {0xFB01, 0xFB06, 1}, + {0xA791, 0xA793, 2}, + {0xA794, 0xA795, 1}, + {0xA797, 0xA7A9, 2}, + {0xA7B5, 0xA7B7, 2}, + {0xA7FA, 0xAB30, 822}, + {0xAB31, 0xAB5A, 1}, + {0xAB60, 0xAB65, 1}, + {0xAB70, 0xABBF, 1}, + {0xFB00, 0xFB06, 1}, {0xFB13, 0xFB17, 1}, {0xFF41, 0xFF5A, 1}, {0x10428, 0x1044F, 1}, + {0x104D8, 0x104FB, 1}, + {0x10CC0, 0x10CF2, 1}, + {0x118C0, 0x118DF, 1}, {0x1D41A, 0x1D433, 1}, {0x1D44E, 0x1D454, 1}, {0x1D456, 0x1D467, 1}, @@ -644,7 +782,8 @@ private static int[][] make_Ll() { {0x1D78A, 0x1D78F, 1}, {0x1D7AA, 0x1D7C2, 1}, {0x1D7C4, 0x1D7C9, 1}, - {0x1D7CB, 0x1D7CB, 1} + {0x1D7CB, 0x1E922, 4439}, + {0x1E923, 0x1E943, 1} }; } @@ -677,30 +816,40 @@ private static int[][] make_Lm() { {0x17D7, 0x1843, 108}, {0x1AA7, 0x1C78, 465}, {0x1C79, 0x1C7D, 1}, - {0x1D2C, 0x1D61, 1}, + {0x1D2C, 0x1D6A, 1}, {0x1D78, 0x1D9B, 35}, {0x1D9C, 0x1DBF, 1}, {0x2071, 0x207F, 14}, {0x2090, 0x209C, 1}, - {0x2C7D, 0x2D6F, 242}, - {0x2E2F, 0x3005, 470}, - {0x3031, 0x3035, 1}, + {0x2C7C, 0x2C7D, 1}, + {0x2D6F, 0x2E2F, 192}, + {0x3005, 0x3031, 44}, + {0x3032, 0x3035, 1}, {0x303B, 0x309D, 98}, {0x309E, 0x30FC, 94}, {0x30FD, 0x30FE, 1}, {0xA015, 0xA4F8, 1251}, {0xA4F9, 0xA4FD, 1}, {0xA60C, 0xA67F, 115}, + {0xA69C, 0xA69D, 1}, {0xA717, 0xA71F, 1}, {0xA770, 0xA788, 24}, - {0xA9CF, 0xAA70, 161}, - {0xAADD, 0xFF70, 21651}, - {0xFF9E, 0xFF9F, 1} + {0xA7F8, 0xA7F9, 1}, + {0xA9CF, 0xA9E6, 23}, + {0xAA70, 0xAADD, 109}, + {0xAAF3, 0xAAF4, 1}, + {0xAB5C, 0xAB5F, 1}, + {0xFF70, 0xFF9E, 46}, + {0xFF9F, 0x16B40, 27553}, + {0x16B41, 0x16B43, 1}, + {0x16F93, 0x16F9F, 1}, + {0x16FE0, 0x16FE1, 1} }; } private static int[][] make_Lo() { return new int[][] { + {0x00AA, 0x00BA, 16}, {0x01BB, 0x01C0, 5}, {0x01C1, 0x01C3, 1}, {0x0294, 0x05D0, 828}, @@ -720,11 +869,13 @@ private static int[][] make_Lo() { {0x07CB, 0x07EA, 1}, {0x0800, 0x0815, 1}, {0x0840, 0x0858, 1}, + {0x0860, 0x086A, 1}, + {0x08A0, 0x08B4, 1}, + {0x08B6, 0x08BD, 1}, {0x0904, 0x0939, 1}, {0x093D, 0x0950, 19}, {0x0958, 0x0961, 1}, - {0x0972, 0x0977, 1}, - {0x0979, 0x097F, 1}, + {0x0972, 0x0980, 1}, {0x0985, 0x098C, 1}, {0x098F, 0x0990, 1}, {0x0993, 0x09A8, 1}, @@ -735,7 +886,8 @@ private static int[][] make_Lo() { {0x09DC, 0x09DD, 1}, {0x09DF, 0x09E1, 1}, {0x09F0, 0x09F1, 1}, - {0x0A05, 0x0A0A, 1}, + {0x09FC, 0x0A05, 9}, + {0x0A06, 0x0A0A, 1}, {0x0A0F, 0x0A10, 1}, {0x0A13, 0x0A28, 1}, {0x0A2A, 0x0A30, 1}, @@ -753,7 +905,8 @@ private static int[][] make_Lo() { {0x0AB5, 0x0AB9, 1}, {0x0ABD, 0x0AD0, 19}, {0x0AE0, 0x0AE1, 1}, - {0x0B05, 0x0B0C, 1}, + {0x0AF9, 0x0B05, 12}, + {0x0B06, 0x0B0C, 1}, {0x0B0F, 0x0B10, 1}, {0x0B13, 0x0B28, 1}, {0x0B2A, 0x0B30, 1}, @@ -776,11 +929,11 @@ private static int[][] make_Lo() { {0x0C06, 0x0C0C, 1}, {0x0C0E, 0x0C10, 1}, {0x0C12, 0x0C28, 1}, - {0x0C2A, 0x0C33, 1}, - {0x0C35, 0x0C39, 1}, + {0x0C2A, 0x0C39, 1}, {0x0C3D, 0x0C58, 27}, - {0x0C59, 0x0C60, 7}, - {0x0C61, 0x0C85, 36}, + {0x0C59, 0x0C5A, 1}, + {0x0C60, 0x0C61, 1}, + {0x0C80, 0x0C85, 5}, {0x0C86, 0x0C8C, 1}, {0x0C8E, 0x0C90, 1}, {0x0C92, 0x0CA8, 1}, @@ -793,7 +946,8 @@ private static int[][] make_Lo() { {0x0D0E, 0x0D10, 1}, {0x0D12, 0x0D3A, 1}, {0x0D3D, 0x0D4E, 17}, - {0x0D60, 0x0D61, 1}, + {0x0D54, 0x0D56, 1}, + {0x0D5F, 0x0D61, 1}, {0x0D7A, 0x0D7F, 1}, {0x0D85, 0x0D96, 1}, {0x0D9A, 0x0DB1, 1}, @@ -816,7 +970,7 @@ private static int[][] make_Lo() { {0x0EB2, 0x0EB3, 1}, {0x0EBD, 0x0EC0, 3}, {0x0EC1, 0x0EC4, 1}, - {0x0EDC, 0x0EDD, 1}, + {0x0EDC, 0x0EDF, 1}, {0x0F00, 0x0F40, 64}, {0x0F41, 0x0F47, 1}, {0x0F49, 0x0F6C, 1}, @@ -831,7 +985,7 @@ private static int[][] make_Lo() { {0x1075, 0x1081, 1}, {0x108E, 0x10D0, 66}, {0x10D1, 0x10FA, 1}, - {0x1100, 0x1248, 1}, + {0x10FD, 0x1248, 1}, {0x124A, 0x124D, 1}, {0x1250, 0x1256, 1}, {0x1258, 0x125A, 2}, @@ -848,11 +1002,11 @@ private static int[][] make_Lo() { {0x1312, 0x1315, 1}, {0x1318, 0x135A, 1}, {0x1380, 0x138F, 1}, - {0x13A0, 0x13F4, 1}, {0x1401, 0x166C, 1}, {0x166F, 0x167F, 1}, {0x1681, 0x169A, 1}, {0x16A0, 0x16EA, 1}, + {0x16F1, 0x16F8, 1}, {0x1700, 0x170C, 1}, {0x170E, 0x1711, 1}, {0x1720, 0x1731, 1}, @@ -863,28 +1017,30 @@ private static int[][] make_Lo() { {0x17DC, 0x1820, 68}, {0x1821, 0x1842, 1}, {0x1844, 0x1877, 1}, - {0x1880, 0x18A8, 1}, + {0x1880, 0x1884, 1}, + {0x1887, 0x18A8, 1}, {0x18AA, 0x18B0, 6}, {0x18B1, 0x18F5, 1}, - {0x1900, 0x191C, 1}, + {0x1900, 0x191E, 1}, {0x1950, 0x196D, 1}, {0x1970, 0x1974, 1}, {0x1980, 0x19AB, 1}, - {0x19C1, 0x19C7, 1}, + {0x19B0, 0x19C9, 1}, {0x1A00, 0x1A16, 1}, {0x1A20, 0x1A54, 1}, {0x1B05, 0x1B33, 1}, {0x1B45, 0x1B4B, 1}, {0x1B83, 0x1BA0, 1}, {0x1BAE, 0x1BAF, 1}, - {0x1BC0, 0x1BE5, 1}, + {0x1BBA, 0x1BE5, 1}, {0x1C00, 0x1C23, 1}, {0x1C4D, 0x1C4F, 1}, {0x1C5A, 0x1C77, 1}, {0x1CE9, 0x1CEC, 1}, {0x1CEE, 0x1CF1, 1}, + {0x1CF5, 0x1CF6, 1}, {0x2135, 0x2138, 1}, - {0x2D30, 0x2D65, 1}, + {0x2D30, 0x2D67, 1}, {0x2D80, 0x2D96, 1}, {0x2DA0, 0x2DA6, 1}, {0x2DA8, 0x2DAE, 1}, @@ -899,12 +1055,12 @@ private static int[][] make_Lo() { {0x309F, 0x30A1, 2}, {0x30A2, 0x30FA, 1}, {0x30FF, 0x3105, 6}, - {0x3106, 0x312D, 1}, + {0x3106, 0x312E, 1}, {0x3131, 0x318E, 1}, {0x31A0, 0x31BA, 1}, {0x31F0, 0x31FF, 1}, {0x3400, 0x4DB5, 1}, - {0x4E00, 0x9FCB, 1}, + {0x4E00, 0x9FEA, 1}, {0xA000, 0xA014, 1}, {0xA016, 0xA48C, 1}, {0xA4D0, 0xA4F7, 1}, @@ -913,6 +1069,7 @@ private static int[][] make_Lo() { {0xA62A, 0xA62B, 1}, {0xA66E, 0xA6A0, 50}, {0xA6A1, 0xA6E5, 1}, + {0xA78F, 0xA7F7, 104}, {0xA7FB, 0xA801, 1}, {0xA803, 0xA805, 1}, {0xA807, 0xA80A, 1}, @@ -920,24 +1077,29 @@ private static int[][] make_Lo() { {0xA840, 0xA873, 1}, {0xA882, 0xA8B3, 1}, {0xA8F2, 0xA8F7, 1}, - {0xA8FB, 0xA90A, 15}, - {0xA90B, 0xA925, 1}, + {0xA8FB, 0xA8FD, 2}, + {0xA90A, 0xA925, 1}, {0xA930, 0xA946, 1}, {0xA960, 0xA97C, 1}, {0xA984, 0xA9B2, 1}, + {0xA9E0, 0xA9E4, 1}, + {0xA9E7, 0xA9EF, 1}, + {0xA9FA, 0xA9FE, 1}, {0xAA00, 0xAA28, 1}, {0xAA40, 0xAA42, 1}, {0xAA44, 0xAA4B, 1}, {0xAA60, 0xAA6F, 1}, {0xAA71, 0xAA76, 1}, - {0xAA7A, 0xAA80, 6}, - {0xAA81, 0xAAAF, 1}, + {0xAA7A, 0xAA7E, 4}, + {0xAA7F, 0xAAAF, 1}, {0xAAB1, 0xAAB5, 4}, {0xAAB6, 0xAAB9, 3}, {0xAABA, 0xAABD, 1}, {0xAAC0, 0xAAC2, 2}, {0xAADB, 0xAADC, 1}, - {0xAB01, 0xAB06, 1}, + {0xAAE0, 0xAAEA, 1}, + {0xAAF2, 0xAB01, 15}, + {0xAB02, 0xAB06, 1}, {0xAB09, 0xAB0E, 1}, {0xAB11, 0xAB16, 1}, {0xAB20, 0xAB26, 1}, @@ -946,8 +1108,7 @@ private static int[][] make_Lo() { {0xAC00, 0xD7A3, 1}, {0xD7B0, 0xD7C6, 1}, {0xD7CB, 0xD7FB, 1}, - {0xF900, 0xFA2D, 1}, - {0xFA30, 0xFA6D, 1}, + {0xF900, 0xFA6D, 1}, {0xFA70, 0xFAD9, 1}, {0xFB1D, 0xFB1F, 2}, {0xFB20, 0xFB28, 1}, @@ -979,39 +1140,146 @@ private static int[][] make_Lo() { {0x10080, 0x100FA, 1}, {0x10280, 0x1029C, 1}, {0x102A0, 0x102D0, 1}, - {0x10300, 0x1031E, 1}, - {0x10330, 0x10340, 1}, + {0x10300, 0x1031F, 1}, + {0x1032D, 0x10340, 1}, {0x10342, 0x10349, 1}, + {0x10350, 0x10375, 1}, {0x10380, 0x1039D, 1}, {0x103A0, 0x103C3, 1}, {0x103C8, 0x103CF, 1}, {0x10450, 0x1049D, 1}, + {0x10500, 0x10527, 1}, + {0x10530, 0x10563, 1}, + {0x10600, 0x10736, 1}, + {0x10740, 0x10755, 1}, + {0x10760, 0x10767, 1}, {0x10800, 0x10805, 1}, {0x10808, 0x1080A, 2}, {0x1080B, 0x10835, 1}, {0x10837, 0x10838, 1}, {0x1083C, 0x1083F, 3}, {0x10840, 0x10855, 1}, + {0x10860, 0x10876, 1}, + {0x10880, 0x1089E, 1}, + {0x108E0, 0x108F2, 1}, + {0x108F4, 0x108F5, 1}, {0x10900, 0x10915, 1}, {0x10920, 0x10939, 1}, + {0x10980, 0x109B7, 1}, + {0x109BE, 0x109BF, 1}, {0x10A00, 0x10A10, 16}, {0x10A11, 0x10A13, 1}, {0x10A15, 0x10A17, 1}, {0x10A19, 0x10A33, 1}, {0x10A60, 0x10A7C, 1}, + {0x10A80, 0x10A9C, 1}, + {0x10AC0, 0x10AC7, 1}, + {0x10AC9, 0x10AE4, 1}, {0x10B00, 0x10B35, 1}, {0x10B40, 0x10B55, 1}, {0x10B60, 0x10B72, 1}, + {0x10B80, 0x10B91, 1}, {0x10C00, 0x10C48, 1}, {0x11003, 0x11037, 1}, {0x11083, 0x110AF, 1}, - {0x12000, 0x1236E, 1}, + {0x110D0, 0x110E8, 1}, + {0x11103, 0x11126, 1}, + {0x11150, 0x11172, 1}, + {0x11176, 0x11183, 13}, + {0x11184, 0x111B2, 1}, + {0x111C1, 0x111C4, 1}, + {0x111DA, 0x111DC, 2}, + {0x11200, 0x11211, 1}, + {0x11213, 0x1122B, 1}, + {0x11280, 0x11286, 1}, + {0x11288, 0x1128A, 2}, + {0x1128B, 0x1128D, 1}, + {0x1128F, 0x1129D, 1}, + {0x1129F, 0x112A8, 1}, + {0x112B0, 0x112DE, 1}, + {0x11305, 0x1130C, 1}, + {0x1130F, 0x11310, 1}, + {0x11313, 0x11328, 1}, + {0x1132A, 0x11330, 1}, + {0x11332, 0x11333, 1}, + {0x11335, 0x11339, 1}, + {0x1133D, 0x11350, 19}, + {0x1135D, 0x11361, 1}, + {0x11400, 0x11434, 1}, + {0x11447, 0x1144A, 1}, + {0x11480, 0x114AF, 1}, + {0x114C4, 0x114C5, 1}, + {0x114C7, 0x11580, 185}, + {0x11581, 0x115AE, 1}, + {0x115D8, 0x115DB, 1}, + {0x11600, 0x1162F, 1}, + {0x11644, 0x11680, 60}, + {0x11681, 0x116AA, 1}, + {0x11700, 0x11719, 1}, + {0x118FF, 0x11A00, 257}, + {0x11A0B, 0x11A32, 1}, + {0x11A3A, 0x11A50, 22}, + {0x11A5C, 0x11A83, 1}, + {0x11A86, 0x11A89, 1}, + {0x11AC0, 0x11AF8, 1}, + {0x11C00, 0x11C08, 1}, + {0x11C0A, 0x11C2E, 1}, + {0x11C40, 0x11C72, 50}, + {0x11C73, 0x11C8F, 1}, + {0x11D00, 0x11D06, 1}, + {0x11D08, 0x11D09, 1}, + {0x11D0B, 0x11D30, 1}, + {0x11D46, 0x12000, 698}, + {0x12001, 0x12399, 1}, + {0x12480, 0x12543, 1}, {0x13000, 0x1342E, 1}, + {0x14400, 0x14646, 1}, {0x16800, 0x16A38, 1}, - {0x1B000, 0x1B001, 1}, + {0x16A40, 0x16A5E, 1}, + {0x16AD0, 0x16AED, 1}, + {0x16B00, 0x16B2F, 1}, + {0x16B63, 0x16B77, 1}, + {0x16B7D, 0x16B8F, 1}, + {0x16F00, 0x16F44, 1}, + {0x16F50, 0x17000, 176}, + {0x17001, 0x187EC, 1}, + {0x18800, 0x18AF2, 1}, + {0x1B000, 0x1B11E, 1}, + {0x1B170, 0x1B2FB, 1}, + {0x1BC00, 0x1BC6A, 1}, + {0x1BC70, 0x1BC7C, 1}, + {0x1BC80, 0x1BC88, 1}, + {0x1BC90, 0x1BC99, 1}, + {0x1E800, 0x1E8C4, 1}, + {0x1EE00, 0x1EE03, 1}, + {0x1EE05, 0x1EE1F, 1}, + {0x1EE21, 0x1EE22, 1}, + {0x1EE24, 0x1EE27, 3}, + {0x1EE29, 0x1EE32, 1}, + {0x1EE34, 0x1EE37, 1}, + {0x1EE39, 0x1EE3B, 2}, + {0x1EE42, 0x1EE47, 5}, + {0x1EE49, 0x1EE4D, 2}, + {0x1EE4E, 0x1EE4F, 1}, + {0x1EE51, 0x1EE52, 1}, + {0x1EE54, 0x1EE57, 3}, + {0x1EE59, 0x1EE61, 2}, + {0x1EE62, 0x1EE64, 2}, + {0x1EE67, 0x1EE6A, 1}, + {0x1EE6C, 0x1EE72, 1}, + {0x1EE74, 0x1EE77, 1}, + {0x1EE79, 0x1EE7C, 1}, + {0x1EE7E, 0x1EE80, 2}, + {0x1EE81, 0x1EE89, 1}, + {0x1EE8B, 0x1EE9B, 1}, + {0x1EEA1, 0x1EEA3, 1}, + {0x1EEA5, 0x1EEA9, 1}, + {0x1EEAB, 0x1EEBB, 1}, {0x20000, 0x2A6D6, 1}, {0x2A700, 0x2B734, 1}, {0x2B740, 0x2B81D, 1}, + {0x2B820, 0x2CEA1, 1}, + {0x2CEB0, 0x2EBE0, 1}, {0x2F800, 0x2FA1D, 1} }; } @@ -1040,7 +1308,8 @@ private static int[][] make_Mn() { {0x0825, 0x0827, 1}, {0x0829, 0x082D, 1}, {0x0859, 0x085B, 1}, - {0x0900, 0x0902, 1}, + {0x08D4, 0x08E1, 1}, + {0x08E3, 0x0902, 1}, {0x093A, 0x093C, 2}, {0x0941, 0x0948, 1}, {0x094D, 0x0951, 4}, @@ -1061,23 +1330,27 @@ private static int[][] make_Mn() { {0x0AC2, 0x0AC5, 1}, {0x0AC7, 0x0AC8, 1}, {0x0ACD, 0x0AE2, 21}, - {0x0AE3, 0x0B01, 30}, - {0x0B3C, 0x0B3F, 3}, - {0x0B41, 0x0B44, 1}, + {0x0AE3, 0x0AFA, 23}, + {0x0AFB, 0x0AFF, 1}, + {0x0B01, 0x0B3C, 59}, + {0x0B3F, 0x0B41, 2}, + {0x0B42, 0x0B44, 1}, {0x0B4D, 0x0B56, 9}, {0x0B62, 0x0B63, 1}, {0x0B82, 0x0BC0, 62}, - {0x0BCD, 0x0C3E, 113}, - {0x0C3F, 0x0C40, 1}, + {0x0BCD, 0x0C00, 51}, + {0x0C3E, 0x0C40, 1}, {0x0C46, 0x0C48, 1}, {0x0C4A, 0x0C4D, 1}, {0x0C55, 0x0C56, 1}, {0x0C62, 0x0C63, 1}, - {0x0CBC, 0x0CBF, 3}, - {0x0CC6, 0x0CCC, 6}, - {0x0CCD, 0x0CE2, 21}, - {0x0CE3, 0x0D41, 94}, - {0x0D42, 0x0D44, 1}, + {0x0C81, 0x0CBC, 59}, + {0x0CBF, 0x0CC6, 7}, + {0x0CCC, 0x0CCD, 1}, + {0x0CE2, 0x0CE3, 1}, + {0x0D00, 0x0D01, 1}, + {0x0D3B, 0x0D3C, 1}, + {0x0D41, 0x0D44, 1}, {0x0D4D, 0x0D62, 21}, {0x0D63, 0x0DCA, 103}, {0x0DD2, 0x0DD4, 1}, @@ -1111,24 +1384,27 @@ private static int[][] make_Mn() { {0x1732, 0x1734, 1}, {0x1752, 0x1753, 1}, {0x1772, 0x1773, 1}, + {0x17B4, 0x17B5, 1}, {0x17B7, 0x17BD, 1}, {0x17C6, 0x17C9, 3}, {0x17CA, 0x17D3, 1}, {0x17DD, 0x180B, 46}, {0x180C, 0x180D, 1}, + {0x1885, 0x1886, 1}, {0x18A9, 0x1920, 119}, {0x1921, 0x1922, 1}, {0x1927, 0x1928, 1}, {0x1932, 0x1939, 7}, {0x193A, 0x193B, 1}, {0x1A17, 0x1A18, 1}, - {0x1A56, 0x1A58, 2}, - {0x1A59, 0x1A5E, 1}, + {0x1A1B, 0x1A56, 59}, + {0x1A58, 0x1A5E, 1}, {0x1A60, 0x1A62, 2}, {0x1A65, 0x1A6C, 1}, {0x1A73, 0x1A7C, 1}, - {0x1A7F, 0x1B00, 129}, - {0x1B01, 0x1B03, 1}, + {0x1A7F, 0x1AB0, 49}, + {0x1AB1, 0x1ABD, 1}, + {0x1B00, 0x1B03, 1}, {0x1B34, 0x1B36, 2}, {0x1B37, 0x1B3A, 1}, {0x1B3C, 0x1B42, 6}, @@ -1136,6 +1412,7 @@ private static int[][] make_Mn() { {0x1B80, 0x1B81, 1}, {0x1BA2, 0x1BA5, 1}, {0x1BA8, 0x1BA9, 1}, + {0x1BAB, 0x1BAD, 1}, {0x1BE6, 0x1BE8, 2}, {0x1BE9, 0x1BED, 4}, {0x1BEF, 0x1BF1, 1}, @@ -1144,65 +1421,148 @@ private static int[][] make_Mn() { {0x1CD0, 0x1CD2, 1}, {0x1CD4, 0x1CE0, 1}, {0x1CE2, 0x1CE8, 1}, - {0x1CED, 0x1DC0, 211}, - {0x1DC1, 0x1DE6, 1}, - {0x1DFC, 0x1DFF, 1}, + {0x1CED, 0x1CF4, 7}, + {0x1CF8, 0x1CF9, 1}, + {0x1DC0, 0x1DF9, 1}, + {0x1DFB, 0x1DFF, 1}, {0x20D0, 0x20DC, 1}, {0x20E1, 0x20E5, 4}, {0x20E6, 0x20F0, 1}, {0x2CEF, 0x2CF1, 1}, {0x2D7F, 0x2DE0, 97}, {0x2DE1, 0x2DFF, 1}, - {0x302A, 0x302F, 1}, + {0x302A, 0x302D, 1}, {0x3099, 0x309A, 1}, - {0xA66F, 0xA67C, 13}, - {0xA67D, 0xA6F0, 115}, - {0xA6F1, 0xA802, 273}, - {0xA806, 0xA80B, 5}, - {0xA825, 0xA826, 1}, - {0xA8C4, 0xA8E0, 28}, + {0xA66F, 0xA674, 5}, + {0xA675, 0xA67D, 1}, + {0xA69E, 0xA69F, 1}, + {0xA6F0, 0xA6F1, 1}, + {0xA802, 0xA806, 4}, + {0xA80B, 0xA825, 26}, + {0xA826, 0xA8C4, 158}, + {0xA8C5, 0xA8E0, 27}, {0xA8E1, 0xA8F1, 1}, {0xA926, 0xA92D, 1}, {0xA947, 0xA951, 1}, {0xA980, 0xA982, 1}, {0xA9B3, 0xA9B6, 3}, {0xA9B7, 0xA9B9, 1}, - {0xA9BC, 0xAA29, 109}, - {0xAA2A, 0xAA2E, 1}, + {0xA9BC, 0xA9E5, 41}, + {0xAA29, 0xAA2E, 1}, {0xAA31, 0xAA32, 1}, {0xAA35, 0xAA36, 1}, {0xAA43, 0xAA4C, 9}, - {0xAAB0, 0xAAB2, 2}, - {0xAAB3, 0xAAB4, 1}, + {0xAA7C, 0xAAB0, 52}, + {0xAAB2, 0xAAB4, 1}, {0xAAB7, 0xAAB8, 1}, {0xAABE, 0xAABF, 1}, - {0xAAC1, 0xABE5, 292}, - {0xABE8, 0xABED, 5}, - {0xFB1E, 0xFE00, 738}, - {0xFE01, 0xFE0F, 1}, - {0xFE20, 0xFE26, 1}, - {0x101FD, 0x10A01, 2052}, - {0x10A02, 0x10A03, 1}, + {0xAAC1, 0xAAEC, 43}, + {0xAAED, 0xAAF6, 9}, + {0xABE5, 0xABE8, 3}, + {0xABED, 0xFB1E, 20273}, + {0xFE00, 0xFE0F, 1}, + {0xFE20, 0xFE2F, 1}, + {0x101FD, 0x102E0, 227}, + {0x10376, 0x1037A, 1}, + {0x10A01, 0x10A03, 1}, {0x10A05, 0x10A06, 1}, {0x10A0C, 0x10A0F, 1}, {0x10A38, 0x10A3A, 1}, - {0x10A3F, 0x11001, 1474}, + {0x10A3F, 0x10AE5, 166}, + {0x10AE6, 0x11001, 1307}, {0x11038, 0x11046, 1}, - {0x11080, 0x11081, 1}, + {0x1107F, 0x11081, 1}, {0x110B3, 0x110B6, 1}, {0x110B9, 0x110BA, 1}, + {0x11100, 0x11102, 1}, + {0x11127, 0x1112B, 1}, + {0x1112D, 0x11134, 1}, + {0x11173, 0x11180, 13}, + {0x11181, 0x111B6, 53}, + {0x111B7, 0x111BE, 1}, + {0x111CA, 0x111CC, 1}, + {0x1122F, 0x11231, 1}, + {0x11234, 0x11236, 2}, + {0x11237, 0x1123E, 7}, + {0x112DF, 0x112E3, 4}, + {0x112E4, 0x112EA, 1}, + {0x11300, 0x11301, 1}, + {0x1133C, 0x11340, 4}, + {0x11366, 0x1136C, 1}, + {0x11370, 0x11374, 1}, + {0x11438, 0x1143F, 1}, + {0x11442, 0x11444, 1}, + {0x11446, 0x114B3, 109}, + {0x114B4, 0x114B8, 1}, + {0x114BA, 0x114BF, 5}, + {0x114C0, 0x114C2, 2}, + {0x114C3, 0x115B2, 239}, + {0x115B3, 0x115B5, 1}, + {0x115BC, 0x115BD, 1}, + {0x115BF, 0x115C0, 1}, + {0x115DC, 0x115DD, 1}, + {0x11633, 0x1163A, 1}, + {0x1163D, 0x1163F, 2}, + {0x11640, 0x116AB, 107}, + {0x116AD, 0x116B0, 3}, + {0x116B1, 0x116B5, 1}, + {0x116B7, 0x1171D, 102}, + {0x1171E, 0x1171F, 1}, + {0x11722, 0x11725, 1}, + {0x11727, 0x1172B, 1}, + {0x11A01, 0x11A06, 1}, + {0x11A09, 0x11A0A, 1}, + {0x11A33, 0x11A38, 1}, + {0x11A3B, 0x11A3E, 1}, + {0x11A47, 0x11A51, 10}, + {0x11A52, 0x11A56, 1}, + {0x11A59, 0x11A5B, 1}, + {0x11A8A, 0x11A96, 1}, + {0x11A98, 0x11A99, 1}, + {0x11C30, 0x11C36, 1}, + {0x11C38, 0x11C3D, 1}, + {0x11C3F, 0x11C92, 83}, + {0x11C93, 0x11CA7, 1}, + {0x11CAA, 0x11CB0, 1}, + {0x11CB2, 0x11CB3, 1}, + {0x11CB5, 0x11CB6, 1}, + {0x11D31, 0x11D36, 1}, + {0x11D3A, 0x11D3C, 2}, + {0x11D3D, 0x11D3F, 2}, + {0x11D40, 0x11D45, 1}, + {0x11D47, 0x16AF0, 19881}, + {0x16AF1, 0x16AF4, 1}, + {0x16B30, 0x16B36, 1}, + {0x16F8F, 0x16F92, 1}, + {0x1BC9D, 0x1BC9E, 1}, {0x1D167, 0x1D169, 1}, {0x1D17B, 0x1D182, 1}, {0x1D185, 0x1D18B, 1}, {0x1D1AA, 0x1D1AD, 1}, {0x1D242, 0x1D244, 1}, + {0x1DA00, 0x1DA36, 1}, + {0x1DA3B, 0x1DA6C, 1}, + {0x1DA75, 0x1DA84, 15}, + {0x1DA9B, 0x1DA9F, 1}, + {0x1DAA1, 0x1DAAF, 1}, + {0x1E000, 0x1E006, 1}, + {0x1E008, 0x1E018, 1}, + {0x1E01B, 0x1E021, 1}, + {0x1E023, 0x1E024, 1}, + {0x1E026, 0x1E02A, 1}, + {0x1E8D0, 0x1E8D6, 1}, + {0x1E944, 0x1E94A, 1}, {0xE0100, 0xE01EF, 1} }; } private static int[][] make_Me() { return new int[][] { - {0x0488, 0x0489, 1}, {0x20DD, 0x20E0, 1}, {0x20E2, 0x20E4, 1}, {0xA670, 0xA672, 1} + {0x0488, 0x0489, 1}, + {0x1ABE, 0x20DD, 1567}, + {0x20DE, 0x20E0, 1}, + {0x20E2, 0x20E4, 1}, + {0xA670, 0xA672, 1} }; } @@ -1267,9 +1627,7 @@ private static int[][] make_Mc() { {0x1929, 0x192B, 1}, {0x1930, 0x1931, 1}, {0x1933, 0x1938, 1}, - {0x19B0, 0x19C0, 1}, - {0x19C8, 0x19C9, 1}, - {0x1A19, 0x1A1B, 1}, + {0x1A19, 0x1A1A, 1}, {0x1A55, 0x1A57, 2}, {0x1A61, 0x1A63, 2}, {0x1A64, 0x1A6D, 9}, @@ -1287,6 +1645,8 @@ private static int[][] make_Mc() { {0x1C25, 0x1C2B, 1}, {0x1C34, 0x1C35, 1}, {0x1CE1, 0x1CF2, 17}, + {0x1CF3, 0x1CF7, 4}, + {0x302E, 0x302F, 1}, {0xA823, 0xA824, 1}, {0xA827, 0xA880, 89}, {0xA881, 0xA8B4, 51}, @@ -1299,13 +1659,53 @@ private static int[][] make_Mc() { {0xAA2F, 0xAA30, 1}, {0xAA33, 0xAA34, 1}, {0xAA4D, 0xAA7B, 46}, - {0xABE3, 0xABE4, 1}, - {0xABE6, 0xABE7, 1}, - {0xABE9, 0xABEA, 1}, - {0xABEC, 0x11000, 25620}, - {0x11002, 0x11082, 128}, - {0x110B0, 0x110B2, 1}, + {0xAA7D, 0xAAEB, 110}, + {0xAAEE, 0xAAEF, 1}, + {0xAAF5, 0xABE3, 238}, + {0xABE4, 0xABE6, 2}, + {0xABE7, 0xABE9, 2}, + {0xABEA, 0xABEC, 2}, + {0x11000, 0x11002, 2}, + {0x11082, 0x110B0, 46}, + {0x110B1, 0x110B2, 1}, {0x110B7, 0x110B8, 1}, + {0x1112C, 0x11182, 86}, + {0x111B3, 0x111B5, 1}, + {0x111BF, 0x111C0, 1}, + {0x1122C, 0x1122E, 1}, + {0x11232, 0x11233, 1}, + {0x11235, 0x112E0, 171}, + {0x112E1, 0x112E2, 1}, + {0x11302, 0x11303, 1}, + {0x1133E, 0x1133F, 1}, + {0x11341, 0x11344, 1}, + {0x11347, 0x11348, 1}, + {0x1134B, 0x1134D, 1}, + {0x11357, 0x11362, 11}, + {0x11363, 0x11435, 210}, + {0x11436, 0x11437, 1}, + {0x11440, 0x11441, 1}, + {0x11445, 0x114B0, 107}, + {0x114B1, 0x114B2, 1}, + {0x114B9, 0x114BB, 2}, + {0x114BC, 0x114BE, 1}, + {0x114C1, 0x115AF, 238}, + {0x115B0, 0x115B1, 1}, + {0x115B8, 0x115BB, 1}, + {0x115BE, 0x11630, 114}, + {0x11631, 0x11632, 1}, + {0x1163B, 0x1163C, 1}, + {0x1163E, 0x116AC, 110}, + {0x116AE, 0x116AF, 1}, + {0x116B6, 0x11720, 106}, + {0x11721, 0x11726, 5}, + {0x11A07, 0x11A08, 1}, + {0x11A39, 0x11A57, 30}, + {0x11A58, 0x11A97, 63}, + {0x11C2F, 0x11C3E, 15}, + {0x11CA9, 0x11CB1, 8}, + {0x11CB4, 0x16F51, 21149}, + {0x16F52, 0x16F7E, 1}, {0x1D165, 0x1D166, 1}, {0x1D16D, 0x1D172, 1} }; @@ -1326,6 +1726,7 @@ private static int[][] make_Nd() { {0x0C66, 0x0C6F, 1}, {0x0CE6, 0x0CEF, 1}, {0x0D66, 0x0D6F, 1}, + {0x0DE6, 0x0DEF, 1}, {0x0E50, 0x0E59, 1}, {0x0ED0, 0x0ED9, 1}, {0x0F20, 0x0F29, 1}, @@ -1345,12 +1746,28 @@ private static int[][] make_Nd() { {0xA8D0, 0xA8D9, 1}, {0xA900, 0xA909, 1}, {0xA9D0, 0xA9D9, 1}, + {0xA9F0, 0xA9F9, 1}, {0xAA50, 0xAA59, 1}, {0xABF0, 0xABF9, 1}, {0xFF10, 0xFF19, 1}, {0x104A0, 0x104A9, 1}, {0x11066, 0x1106F, 1}, - {0x1D7CE, 0x1D7FF, 1} + {0x110F0, 0x110F9, 1}, + {0x11136, 0x1113F, 1}, + {0x111D0, 0x111D9, 1}, + {0x112F0, 0x112F9, 1}, + {0x11450, 0x11459, 1}, + {0x114D0, 0x114D9, 1}, + {0x11650, 0x11659, 1}, + {0x116C0, 0x116C9, 1}, + {0x11730, 0x11739, 1}, + {0x118E0, 0x118E9, 1}, + {0x11C50, 0x11C59, 1}, + {0x11D50, 0x11D59, 1}, + {0x16A60, 0x16A69, 1}, + {0x16B50, 0x16B59, 1}, + {0x1D7CE, 0x1D7FF, 1}, + {0x1E950, 0x1E959, 1} }; } @@ -1366,7 +1783,7 @@ private static int[][] make_Nl() { {0x10140, 0x10174, 1}, {0x10341, 0x1034A, 9}, {0x103D1, 0x103D5, 1}, - {0x12400, 0x12462, 1} + {0x12400, 0x1246E, 1} }; } @@ -1379,7 +1796,8 @@ private static int[][] make_No() { {0x0B72, 0x0B77, 1}, {0x0BF0, 0x0BF2, 1}, {0x0C78, 0x0C7E, 1}, - {0x0D70, 0x0D75, 1}, + {0x0D58, 0x0D5E, 1}, + {0x0D70, 0x0D78, 1}, {0x0F2A, 0x0F33, 1}, {0x1369, 0x137C, 1}, {0x17F0, 0x17F9, 1}, @@ -1394,32 +1812,50 @@ private static int[][] make_No() { {0x2CFD, 0x3192, 1173}, {0x3193, 0x3195, 1}, {0x3220, 0x3229, 1}, + {0x3248, 0x324F, 1}, {0x3251, 0x325F, 1}, {0x3280, 0x3289, 1}, {0x32B1, 0x32BF, 1}, {0xA830, 0xA835, 1}, {0x10107, 0x10133, 1}, {0x10175, 0x10178, 1}, - {0x1018A, 0x10320, 406}, - {0x10321, 0x10323, 1}, + {0x1018A, 0x1018B, 1}, + {0x102E1, 0x102FB, 1}, + {0x10320, 0x10323, 1}, {0x10858, 0x1085F, 1}, + {0x10879, 0x1087F, 1}, + {0x108A7, 0x108AF, 1}, + {0x108FB, 0x108FF, 1}, {0x10916, 0x1091B, 1}, + {0x109BC, 0x109BD, 1}, + {0x109C0, 0x109CF, 1}, + {0x109D2, 0x109FF, 1}, {0x10A40, 0x10A47, 1}, {0x10A7D, 0x10A7E, 1}, + {0x10A9D, 0x10A9F, 1}, + {0x10AEB, 0x10AEF, 1}, {0x10B58, 0x10B5F, 1}, {0x10B78, 0x10B7F, 1}, + {0x10BA9, 0x10BAF, 1}, + {0x10CFA, 0x10CFF, 1}, {0x10E60, 0x10E7E, 1}, {0x11052, 0x11065, 1}, + {0x111E1, 0x111F4, 1}, + {0x1173A, 0x1173B, 1}, + {0x118EA, 0x118F2, 1}, + {0x11C5A, 0x11C6C, 1}, + {0x16B5B, 0x16B61, 1}, {0x1D360, 0x1D371, 1}, - {0x1F100, 0x1F10A, 1} + {0x1E8C7, 0x1E8CF, 1}, + {0x1F100, 0x1F10C, 1} }; } private static int[][] make_Zs() { return new int[][] { {0x0020, 0x00A0, 128}, - {0x1680, 0x180E, 398}, - {0x2000, 0x200A, 1}, + {0x1680, 0x2000, 2432}, + {0x2001, 0x200A, 1}, {0x202F, 0x205F, 48}, {0x3000, 0x3000, 1} }; @@ -1440,17 +1876,19 @@ private static int[][] make_Cc() { private static int[][] make_Cf() { return new int[][] { {0x00AD, 0x0600, 1363}, - {0x0601, 0x0603, 1}, - {0x06DD, 0x070F, 50}, - {0x17B4, 0x17B5, 1}, - {0x200B, 0x200F, 1}, + {0x0601, 0x0605, 1}, + {0x061C, 0x06DD, 193}, + {0x070F, 0x08E2, 467}, + {0x180E, 0x200B, 2045}, + {0x200C, 0x200F, 1}, {0x202A, 0x202E, 1}, {0x2060, 0x2064, 1}, - {0x206A, 0x206F, 1}, + {0x2066, 0x206F, 1}, {0xFEFF, 0xFFF9, 250}, {0xFFFA, 0xFFFB, 1}, - {0x110BD, 0x1D173, 49334}, - {0x1D174, 0x1D17A, 1}, + {0x110BD, 0x1BCA0, 44003}, + {0x1BCA1, 0x1BCA3, 1}, + {0x1D173, 0x1D17A, 1}, {0xE0001, 0xE0020, 31}, {0xE0021, 0xE007F, 1} }; @@ -1471,10 +1909,12 @@ private static int[][] make_Pd() { {0x1806, 0x2010, 2058}, {0x2011, 0x2015, 1}, {0x2E17, 0x2E1A, 3}, - {0x301C, 0x3030, 20}, - {0x30A0, 0xFE31, 52625}, - {0xFE32, 0xFE58, 38}, - {0xFE63, 0xFF0D, 170} + {0x2E3A, 0x2E3B, 1}, + {0x2E40, 0x301C, 476}, + {0x3030, 0x30A0, 112}, + {0xFE31, 0xFE32, 1}, + {0xFE58, 0xFE63, 11}, + {0xFF0D, 0xFF0D, 1} }; } @@ -1485,7 +1925,8 @@ private static int[][] make_Ps() { {0x0F3C, 0x169B, 1887}, {0x201A, 0x201E, 4}, {0x2045, 0x207D, 56}, - {0x208D, 0x2329, 668}, + {0x208D, 0x2308, 635}, + {0x230A, 0x2329, 31}, {0x2768, 0x2774, 2}, {0x27C5, 0x27E6, 33}, {0x27E8, 0x27EE, 2}, @@ -1493,9 +1934,10 @@ private static int[][] make_Ps() { {0x29D8, 0x29DA, 2}, {0x29FC, 0x2E22, 1062}, {0x2E24, 0x2E28, 2}, - {0x3008, 0x3010, 2}, + {0x2E42, 0x3008, 454}, + {0x300A, 0x3010, 2}, {0x3014, 0x301A, 2}, - {0x301D, 0xFD3E, 52513}, + {0x301D, 0xFD3F, 52514}, {0xFE17, 0xFE35, 30}, {0xFE37, 0xFE43, 2}, {0xFE47, 0xFE59, 18}, @@ -1512,7 +1954,8 @@ private static int[][] make_Pe() { {0x007D, 0x0F3B, 3774}, {0x0F3D, 0x169C, 1887}, {0x2046, 0x207E, 56}, - {0x208E, 0x232A, 668}, + {0x208E, 0x2309, 635}, + {0x230B, 0x232A, 31}, {0x2769, 0x2775, 2}, {0x27C6, 0x27E7, 33}, {0x27E9, 0x27EF, 2}, @@ -1523,7 +1966,7 @@ private static int[][] make_Pe() { {0x3009, 0x3011, 2}, {0x3015, 0x301B, 2}, {0x301E, 0x301F, 1}, - {0xFD3F, 0xFE18, 217}, + {0xFD3E, 0xFE18, 218}, {0xFE36, 0xFE44, 2}, {0xFE48, 0xFE5A, 18}, {0xFE5C, 0xFE5E, 2}, @@ -1550,7 +1993,8 @@ private static int[][] make_Po() { {0x002F, 0x003A, 11}, {0x003B, 0x003F, 4}, {0x0040, 0x005C, 28}, - {0x00A1, 0x00B7, 22}, + {0x00A1, 0x00A7, 6}, + {0x00B6, 0x00B7, 1}, {0x00BF, 0x037E, 703}, {0x0387, 0x055A, 467}, {0x055B, 0x055F, 1}, @@ -1568,15 +2012,16 @@ private static int[][] make_Po() { {0x0830, 0x083E, 1}, {0x085E, 0x0964, 262}, {0x0965, 0x0970, 11}, + {0x09FD, 0x0AF0, 243}, {0x0DF4, 0x0E4F, 91}, {0x0E5A, 0x0E5B, 1}, {0x0F04, 0x0F12, 1}, - {0x0F85, 0x0FD0, 75}, - {0x0FD1, 0x0FD4, 1}, + {0x0F14, 0x0F85, 113}, + {0x0FD0, 0x0FD4, 1}, {0x0FD9, 0x0FDA, 1}, {0x104A, 0x104F, 1}, - {0x10FB, 0x1361, 614}, - {0x1362, 0x1368, 1}, + {0x10FB, 0x1360, 613}, + {0x1361, 0x1368, 1}, {0x166D, 0x166E, 1}, {0x16EB, 0x16ED, 1}, {0x1735, 0x1736, 1}, @@ -1592,6 +2037,7 @@ private static int[][] make_Po() { {0x1BFC, 0x1BFF, 1}, {0x1C3B, 0x1C3F, 1}, {0x1C7E, 0x1C7F, 1}, + {0x1CC0, 0x1CC7, 1}, {0x1CD3, 0x2016, 835}, {0x2017, 0x2020, 9}, {0x2021, 0x2027, 1}, @@ -1612,7 +2058,10 @@ private static int[][] make_Po() { {0x2E1B, 0x2E1E, 3}, {0x2E1F, 0x2E2A, 11}, {0x2E2B, 0x2E2E, 1}, - {0x2E30, 0x2E31, 1}, + {0x2E30, 0x2E39, 1}, + {0x2E3C, 0x2E3F, 1}, + {0x2E41, 0x2E43, 2}, + {0x2E44, 0x2E49, 1}, {0x3001, 0x3003, 1}, {0x303D, 0x30FB, 190}, {0xA4FE, 0xA4FF, 1}, @@ -1622,12 +2071,13 @@ private static int[][] make_Po() { {0xA874, 0xA877, 1}, {0xA8CE, 0xA8CF, 1}, {0xA8F8, 0xA8FA, 1}, - {0xA92E, 0xA92F, 1}, - {0xA95F, 0xA9C1, 98}, - {0xA9C2, 0xA9CD, 1}, + {0xA8FC, 0xA92E, 50}, + {0xA92F, 0xA95F, 48}, + {0xA9C1, 0xA9CD, 1}, {0xA9DE, 0xA9DF, 1}, {0xAA5C, 0xAA5F, 1}, {0xAADE, 0xAADF, 1}, + {0xAAF0, 0xAAF1, 1}, {0xABEB, 0xFE10, 21029}, {0xFE11, 0xFE16, 1}, {0xFE19, 0xFE30, 23}, @@ -1646,16 +2096,44 @@ private static int[][] make_Po() { {0xFF20, 0xFF3C, 28}, {0xFF61, 0xFF64, 3}, {0xFF65, 0x10100, 411}, - {0x10101, 0x1039F, 670}, - {0x103D0, 0x10857, 1159}, + {0x10101, 0x10102, 1}, + {0x1039F, 0x103D0, 49}, + {0x1056F, 0x10857, 744}, {0x1091F, 0x1093F, 32}, {0x10A50, 0x10A58, 1}, - {0x10A7F, 0x10B39, 186}, - {0x10B3A, 0x10B3F, 1}, + {0x10A7F, 0x10AF0, 113}, + {0x10AF1, 0x10AF6, 1}, + {0x10B39, 0x10B3F, 1}, + {0x10B99, 0x10B9C, 1}, {0x11047, 0x1104D, 1}, {0x110BB, 0x110BC, 1}, {0x110BE, 0x110C1, 1}, - {0x12470, 0x12473, 1} + {0x11140, 0x11143, 1}, + {0x11174, 0x11175, 1}, + {0x111C5, 0x111C9, 1}, + {0x111CD, 0x111DB, 14}, + {0x111DD, 0x111DF, 1}, + {0x11238, 0x1123D, 1}, + {0x112A9, 0x1144B, 418}, + {0x1144C, 0x1144F, 1}, + {0x1145B, 0x1145D, 2}, + {0x114C6, 0x115C1, 251}, + {0x115C2, 0x115D7, 1}, + {0x11641, 0x11643, 1}, + {0x11660, 0x1166C, 1}, + {0x1173C, 0x1173E, 1}, + {0x11A3F, 0x11A46, 1}, + {0x11A9A, 0x11A9C, 1}, + {0x11A9E, 0x11AA2, 1}, + {0x11C41, 0x11C45, 1}, + {0x11C70, 0x11C71, 1}, + {0x12470, 0x12474, 1}, + {0x16A6E, 0x16A6F, 1}, + {0x16AF5, 0x16B37, 66}, + {0x16B38, 0x16B3B, 1}, + {0x16B44, 0x1BC9F, 20827}, + {0x1DA87, 0x1DA8B, 1}, + {0x1E95E, 0x1E95F, 1} }; } @@ -1681,7 +2159,6 @@ private static int[][] make_Sm() { {0x21CF, 0x21D2, 3}, {0x21D4, 0x21F4, 32}, {0x21F5, 0x22FF, 1}, - {0x2308, 0x230B, 1}, {0x2320, 0x2321, 1}, {0x237C, 0x239B, 31}, {0x239C, 0x23B3, 1}, @@ -1690,9 +2167,7 @@ private static int[][] make_Sm() { {0x25F8, 0x25FF, 1}, {0x266F, 0x27C0, 337}, {0x27C1, 0x27C4, 1}, - {0x27C7, 0x27CA, 1}, - {0x27CC, 0x27CE, 2}, - {0x27CF, 0x27E5, 1}, + {0x27C7, 0x27E5, 1}, {0x27F0, 0x27FF, 1}, {0x2900, 0x2982, 1}, {0x2999, 0x29D7, 1}, @@ -1711,7 +2186,8 @@ private static int[][] make_Sm() { {0x1D6FB, 0x1D715, 26}, {0x1D735, 0x1D74F, 26}, {0x1D76F, 0x1D789, 26}, - {0x1D7A9, 0x1D7C3, 26} + {0x1D7A9, 0x1D7C3, 26}, + {0x1EEF0, 0x1EEF1, 1} }; } @@ -1719,11 +2195,12 @@ private static int[][] make_Sc() { return new int[][] { {0x0024, 0x00A2, 126}, {0x00A3, 0x00A5, 1}, - {0x060B, 0x09F2, 999}, - {0x09F3, 0x09FB, 8}, - {0x0AF1, 0x0BF9, 264}, - {0x0E3F, 0x17DB, 2460}, - {0x20A0, 0x20B9, 1}, + {0x058F, 0x060B, 124}, + {0x09F2, 0x09F3, 1}, + {0x09FB, 0x0AF1, 246}, + {0x0BF9, 0x0E3F, 582}, + {0x17DB, 0x20A0, 2245}, + {0x20A1, 0x20BF, 1}, {0xA838, 0xFDFC, 21956}, {0xFE69, 0xFF04, 155}, {0xFFE0, 0xFFE1, 1}, @@ -1752,27 +2229,30 @@ private static int[][] make_Sk() { {0xA700, 0xA716, 1}, {0xA720, 0xA721, 1}, {0xA789, 0xA78A, 1}, - {0xFBB2, 0xFBC1, 1}, + {0xAB5B, 0xFBB2, 20567}, + {0xFBB3, 0xFBC1, 1}, {0xFF3E, 0xFF40, 2}, - {0xFFE3, 0xFFE3, 1} + {0xFFE3, 0x1F3FB, 62488}, + {0x1F3FC, 0x1F3FF, 1} }; } private static int[][] make_So() { return new int[][] { - {0x00A6, 0x00A7, 1}, - {0x00A9, 0x00AE, 5}, - {0x00B0, 0x00B6, 6}, - {0x0482, 0x060E, 396}, + {0x00A6, 0x00A9, 3}, + {0x00AE, 0x00B0, 2}, + {0x0482, 0x058D, 267}, + {0x058E, 0x060E, 128}, {0x060F, 0x06DE, 207}, {0x06E9, 0x06FD, 20}, {0x06FE, 0x07F6, 248}, {0x09FA, 0x0B70, 374}, {0x0BF3, 0x0BF8, 1}, {0x0BFA, 0x0C7F, 133}, - {0x0D79, 0x0F01, 392}, - {0x0F02, 0x0F03, 1}, - {0x0F13, 0x0F17, 1}, + {0x0D4F, 0x0D79, 42}, + {0x0F01, 0x0F03, 1}, + {0x0F13, 0x0F15, 2}, + {0x0F16, 0x0F17, 1}, {0x0F1A, 0x0F1F, 1}, {0x0F34, 0x0F38, 2}, {0x0FBE, 0x0FC5, 1}, @@ -1780,8 +2260,7 @@ private static int[][] make_So() { {0x0FCE, 0x0FCF, 1}, {0x0FD5, 0x0FD8, 1}, {0x109E, 0x109F, 1}, - {0x1360, 0x1390, 48}, - {0x1391, 0x1399, 1}, + {0x1390, 0x1399, 1}, {0x1940, 0x19DE, 158}, {0x19DF, 0x19FF, 1}, {0x1B61, 0x1B6A, 1}, @@ -1796,7 +2275,8 @@ private static int[][] make_So() { {0x212E, 0x213A, 12}, {0x213B, 0x214A, 15}, {0x214C, 0x214D, 1}, - {0x214F, 0x2195, 70}, + {0x214F, 0x218A, 59}, + {0x218B, 0x2195, 10}, {0x2196, 0x2199, 1}, {0x219C, 0x219F, 1}, {0x21A1, 0x21A2, 1}, @@ -1812,21 +2292,24 @@ private static int[][] make_So() { {0x232B, 0x237B, 1}, {0x237D, 0x239A, 1}, {0x23B4, 0x23DB, 1}, - {0x23E2, 0x23F3, 1}, - {0x2400, 0x2426, 1}, + {0x23E2, 0x2426, 1}, {0x2440, 0x244A, 1}, {0x249C, 0x24E9, 1}, {0x2500, 0x25B6, 1}, {0x25B8, 0x25C0, 1}, {0x25C2, 0x25F7, 1}, {0x2600, 0x266E, 1}, - {0x2670, 0x26FF, 1}, - {0x2701, 0x2767, 1}, + {0x2670, 0x2767, 1}, {0x2794, 0x27BF, 1}, {0x2800, 0x28FF, 1}, {0x2B00, 0x2B2F, 1}, {0x2B45, 0x2B46, 1}, - {0x2B50, 0x2B59, 1}, + {0x2B4D, 0x2B73, 1}, + {0x2B76, 0x2B95, 1}, + {0x2B98, 0x2BB9, 1}, + {0x2BBD, 0x2BC8, 1}, + {0x2BCA, 0x2BD2, 1}, + {0x2BEC, 0x2BEF, 1}, {0x2CE5, 0x2CEA, 1}, {0x2E80, 0x2E99, 1}, {0x2E9B, 0x2EF3, 1}, @@ -1840,8 +2323,9 @@ private static int[][] make_So() { {0x3196, 0x319F, 1}, {0x31C0, 0x31E3, 1}, {0x3200, 0x321E, 1}, - {0x322A, 0x3250, 1}, - {0x3260, 0x327F, 1}, + {0x322A, 0x3247, 1}, + {0x3250, 0x3260, 16}, + {0x3261, 0x327F, 1}, {0x328A, 0x32B0, 1}, {0x32C0, 0x32FE, 1}, {0x3300, 0x33FF, 1}, @@ -1854,60 +2338,64 @@ private static int[][] make_So() { {0xFDFD, 0xFFE4, 487}, {0xFFE8, 0xFFED, 5}, {0xFFEE, 0xFFFC, 14}, - {0xFFFD, 0x10102, 261}, - {0x10137, 0x1013F, 1}, + {0xFFFD, 0x10137, 314}, + {0x10138, 0x1013F, 1}, {0x10179, 0x10189, 1}, + {0x1018C, 0x1018E, 1}, {0x10190, 0x1019B, 1}, - {0x101D0, 0x101FC, 1}, + {0x101A0, 0x101D0, 48}, + {0x101D1, 0x101FC, 1}, + {0x10877, 0x10878, 1}, + {0x10AC8, 0x1173F, 3191}, + {0x16B3C, 0x16B3F, 1}, + {0x16B45, 0x1BC9C, 20823}, {0x1D000, 0x1D0F5, 1}, {0x1D100, 0x1D126, 1}, {0x1D129, 0x1D164, 1}, {0x1D16A, 0x1D16C, 1}, {0x1D183, 0x1D184, 1}, {0x1D18C, 0x1D1A9, 1}, - {0x1D1AE, 0x1D1DD, 1}, + {0x1D1AE, 0x1D1E8, 1}, {0x1D200, 0x1D241, 1}, {0x1D245, 0x1D300, 187}, {0x1D301, 0x1D356, 1}, + {0x1D800, 0x1D9FF, 1}, + {0x1DA37, 0x1DA3A, 1}, + {0x1DA6D, 0x1DA74, 1}, + {0x1DA76, 0x1DA83, 1}, + {0x1DA85, 0x1DA86, 1}, {0x1F000, 0x1F02B, 1}, {0x1F030, 0x1F093, 1}, {0x1F0A0, 0x1F0AE, 1}, - {0x1F0B1, 0x1F0BE, 1}, + {0x1F0B1, 0x1F0BF, 1}, {0x1F0C1, 0x1F0CF, 1}, - {0x1F0D1, 0x1F0DF, 1}, + {0x1F0D1, 0x1F0F5, 1}, {0x1F110, 0x1F12E, 1}, - {0x1F130, 0x1F169, 1}, - {0x1F170, 0x1F19A, 1}, + {0x1F130, 0x1F16B, 1}, + {0x1F170, 0x1F1AC, 1}, {0x1F1E6, 0x1F202, 1}, - {0x1F210, 0x1F23A, 1}, + {0x1F210, 0x1F23B, 1}, {0x1F240, 0x1F248, 1}, {0x1F250, 0x1F251, 1}, - {0x1F300, 0x1F320, 1}, - {0x1F330, 0x1F335, 1}, - {0x1F337, 0x1F37C, 1}, - {0x1F380, 0x1F393, 1}, - {0x1F3A0, 0x1F3C4, 1}, - {0x1F3C6, 0x1F3CA, 1}, - {0x1F3E0, 0x1F3F0, 1}, - {0x1F400, 0x1F43E, 1}, - {0x1F440, 0x1F442, 2}, - {0x1F443, 0x1F4F7, 1}, - {0x1F4F9, 0x1F4FC, 1}, - {0x1F500, 0x1F53D, 1}, - {0x1F550, 0x1F567, 1}, - {0x1F5FB, 0x1F5FF, 1}, - {0x1F601, 0x1F610, 1}, - {0x1F612, 0x1F614, 1}, - {0x1F616, 0x1F61C, 2}, - {0x1F61D, 0x1F61E, 1}, - {0x1F620, 0x1F625, 1}, - {0x1F628, 0x1F62B, 1}, - {0x1F62D, 0x1F630, 3}, - {0x1F631, 0x1F633, 1}, - {0x1F635, 0x1F640, 1}, - {0x1F645, 0x1F64F, 1}, - {0x1F680, 0x1F6C5, 1}, - {0x1F700, 0x1F773, 1} + {0x1F260, 0x1F265, 1}, + {0x1F300, 0x1F3FA, 1}, + {0x1F400, 0x1F6D4, 1}, + {0x1F6E0, 0x1F6EC, 1}, + {0x1F6F0, 0x1F6F8, 1}, + {0x1F700, 0x1F773, 1}, + {0x1F780, 0x1F7D4, 1}, + {0x1F800, 0x1F80B, 1}, + {0x1F810, 0x1F847, 1}, + {0x1F850, 0x1F859, 1}, + {0x1F860, 0x1F887, 1}, + {0x1F890, 0x1F8AD, 1}, + {0x1F900, 0x1F90B, 1}, + {0x1F910, 0x1F93E, 1}, + {0x1F940, 0x1F94C, 1}, + {0x1F950, 0x1F96B, 1}, + {0x1F980, 0x1F997, 1}, + {0x1F9C0, 0x1F9D0, 16}, + {0x1F9D1, 0x1F9E6, 1} }; } @@ -1942,7 +2430,8 @@ private static int[][] make_P() { {0x005B, 0x005D, 1}, {0x005F, 0x007B, 28}, {0x007D, 0x00A1, 36}, - {0x00AB, 0x00B7, 12}, + {0x00A7, 0x00AB, 4}, + {0x00B6, 0x00B7, 1}, {0x00BB, 0x00BF, 4}, {0x037E, 0x0387, 9}, {0x055A, 0x055F, 1}, @@ -1961,16 +2450,18 @@ private static int[][] make_P() { {0x0830, 0x083E, 1}, {0x085E, 0x0964, 262}, {0x0965, 0x0970, 11}, + {0x09FD, 0x0AF0, 243}, {0x0DF4, 0x0E4F, 91}, {0x0E5A, 0x0E5B, 1}, {0x0F04, 0x0F12, 1}, - {0x0F3A, 0x0F3D, 1}, + {0x0F14, 0x0F3A, 38}, + {0x0F3B, 0x0F3D, 1}, {0x0F85, 0x0FD0, 75}, {0x0FD1, 0x0FD4, 1}, {0x0FD9, 0x0FDA, 1}, {0x104A, 0x104F, 1}, - {0x10FB, 0x1361, 614}, - {0x1362, 0x1368, 1}, + {0x10FB, 0x1360, 613}, + {0x1361, 0x1368, 1}, {0x1400, 0x166D, 621}, {0x166E, 0x169B, 45}, {0x169C, 0x16EB, 79}, @@ -1987,6 +2478,7 @@ private static int[][] make_P() { {0x1BFC, 0x1BFF, 1}, {0x1C3B, 0x1C3F, 1}, {0x1C7E, 0x1C7F, 1}, + {0x1CC0, 0x1CC7, 1}, {0x1CD3, 0x2010, 829}, {0x2011, 0x2027, 1}, {0x2030, 0x2043, 1}, @@ -1994,6 +2486,7 @@ private static int[][] make_P() { {0x2053, 0x205E, 1}, {0x207D, 0x207E, 1}, {0x208D, 0x208E, 1}, + {0x2308, 0x230B, 1}, {0x2329, 0x232A, 1}, {0x2768, 0x2775, 1}, {0x27C5, 0x27C6, 1}, @@ -2005,7 +2498,7 @@ private static int[][] make_P() { {0x2CFE, 0x2CFF, 1}, {0x2D70, 0x2E00, 144}, {0x2E01, 0x2E2E, 1}, - {0x2E30, 0x2E31, 1}, + {0x2E30, 0x2E49, 1}, {0x3001, 0x3003, 1}, {0x3008, 0x3011, 1}, {0x3014, 0x301F, 1}, @@ -2018,12 +2511,13 @@ private static int[][] make_P() { {0xA874, 0xA877, 1}, {0xA8CE, 0xA8CF, 1}, {0xA8F8, 0xA8FA, 1}, - {0xA92E, 0xA92F, 1}, - {0xA95F, 0xA9C1, 98}, - {0xA9C2, 0xA9CD, 1}, + {0xA8FC, 0xA92E, 50}, + {0xA92F, 0xA95F, 48}, + {0xA9C1, 0xA9CD, 1}, {0xA9DE, 0xA9DF, 1}, {0xAA5C, 0xAA5F, 1}, {0xAADE, 0xAADF, 1}, + {0xAAF0, 0xAAF1, 1}, {0xABEB, 0xFD3E, 20819}, {0xFD3F, 0xFE10, 209}, {0xFE11, 0xFE19, 1}, @@ -2040,17 +2534,44 @@ private static int[][] make_P() { {0xFF3F, 0xFF5B, 28}, {0xFF5D, 0xFF5F, 2}, {0xFF60, 0xFF65, 1}, - {0x10100, 0x10101, 1}, + {0x10100, 0x10102, 1}, {0x1039F, 0x103D0, 49}, - {0x10857, 0x1091F, 200}, - {0x1093F, 0x10A50, 273}, - {0x10A51, 0x10A58, 1}, - {0x10A7F, 0x10B39, 186}, - {0x10B3A, 0x10B3F, 1}, + {0x1056F, 0x10857, 744}, + {0x1091F, 0x1093F, 32}, + {0x10A50, 0x10A58, 1}, + {0x10A7F, 0x10AF0, 113}, + {0x10AF1, 0x10AF6, 1}, + {0x10B39, 0x10B3F, 1}, + {0x10B99, 0x10B9C, 1}, {0x11047, 0x1104D, 1}, {0x110BB, 0x110BC, 1}, {0x110BE, 0x110C1, 1}, - {0x12470, 0x12473, 1} + {0x11140, 0x11143, 1}, + {0x11174, 0x11175, 1}, + {0x111C5, 0x111C9, 1}, + {0x111CD, 0x111DB, 14}, + {0x111DD, 0x111DF, 1}, + {0x11238, 0x1123D, 1}, + {0x112A9, 0x1144B, 418}, + {0x1144C, 0x1144F, 1}, + {0x1145B, 0x1145D, 2}, + {0x114C6, 0x115C1, 251}, + {0x115C2, 0x115D7, 1}, + {0x11641, 0x11643, 1}, + {0x11660, 0x1166C, 1}, + {0x1173C, 0x1173E, 1}, + {0x11A3F, 0x11A46, 1}, + {0x11A9A, 0x11A9C, 1}, + {0x11A9E, 0x11AA2, 1}, + {0x11C41, 0x11C45, 1}, + {0x11C70, 0x11C71, 1}, + {0x12470, 0x12474, 1}, + {0x16A6E, 0x16A6F, 1}, + {0x16AF5, 0x16B37, 66}, + {0x16B38, 0x16B3B, 1}, + {0x16B44, 0x1BC9F, 20827}, + {0x1DA87, 0x1DA8B, 1}, + {0x1E95E, 0x1E95F, 1} }; } @@ -2060,10 +2581,11 @@ private static int[][] make_S() { {0x003C, 0x003E, 1}, {0x005E, 0x0060, 2}, {0x007C, 0x007E, 2}, - {0x00A2, 0x00A9, 1}, + {0x00A2, 0x00A6, 1}, + {0x00A8, 0x00A9, 1}, {0x00AC, 0x00AE, 2}, {0x00AF, 0x00B1, 1}, - {0x00B4, 0x00B8, 2}, + {0x00B4, 0x00B8, 4}, {0x00D7, 0x00F7, 32}, {0x02C2, 0x02C5, 1}, {0x02D2, 0x02DF, 1}, @@ -2072,8 +2594,9 @@ private static int[][] make_S() { {0x02F0, 0x02FF, 1}, {0x0375, 0x0384, 15}, {0x0385, 0x03F6, 113}, - {0x0482, 0x0606, 388}, - {0x0607, 0x0608, 1}, + {0x0482, 0x058D, 267}, + {0x058E, 0x058F, 1}, + {0x0606, 0x0608, 1}, {0x060B, 0x060E, 3}, {0x060F, 0x06DE, 207}, {0x06E9, 0x06FD, 20}, @@ -2082,10 +2605,11 @@ private static int[][] make_S() { {0x09FA, 0x09FB, 1}, {0x0AF1, 0x0B70, 127}, {0x0BF3, 0x0BFA, 1}, - {0x0C7F, 0x0D79, 250}, - {0x0E3F, 0x0F01, 194}, - {0x0F02, 0x0F03, 1}, - {0x0F13, 0x0F17, 1}, + {0x0C7F, 0x0D4F, 208}, + {0x0D79, 0x0E3F, 198}, + {0x0F01, 0x0F03, 1}, + {0x0F13, 0x0F15, 2}, + {0x0F16, 0x0F17, 1}, {0x0F1A, 0x0F1F, 1}, {0x0F34, 0x0F38, 2}, {0x0FBE, 0x0FC5, 1}, @@ -2093,8 +2617,7 @@ private static int[][] make_S() { {0x0FCE, 0x0FCF, 1}, {0x0FD5, 0x0FD8, 1}, {0x109E, 0x109F, 1}, - {0x1360, 0x1390, 48}, - {0x1391, 0x1399, 1}, + {0x1390, 0x1399, 1}, {0x17DB, 0x1940, 357}, {0x19DE, 0x19FF, 1}, {0x1B61, 0x1B6A, 1}, @@ -2108,7 +2631,7 @@ private static int[][] make_S() { {0x2044, 0x2052, 14}, {0x207A, 0x207C, 1}, {0x208A, 0x208C, 1}, - {0x20A0, 0x20B9, 1}, + {0x20A0, 0x20BF, 1}, {0x2100, 0x2101, 1}, {0x2103, 0x2106, 1}, {0x2108, 0x2109, 1}, @@ -2120,23 +2643,25 @@ private static int[][] make_S() { {0x213B, 0x2140, 5}, {0x2141, 0x2144, 1}, {0x214A, 0x214D, 1}, - {0x214F, 0x2190, 65}, - {0x2191, 0x2328, 1}, - {0x232B, 0x23F3, 1}, - {0x2400, 0x2426, 1}, + {0x214F, 0x218A, 59}, + {0x218B, 0x2190, 5}, + {0x2191, 0x2307, 1}, + {0x230C, 0x2328, 1}, + {0x232B, 0x2426, 1}, {0x2440, 0x244A, 1}, {0x249C, 0x24E9, 1}, - {0x2500, 0x26FF, 1}, - {0x2701, 0x2767, 1}, + {0x2500, 0x2767, 1}, {0x2794, 0x27C4, 1}, - {0x27C7, 0x27CA, 1}, - {0x27CC, 0x27CE, 2}, - {0x27CF, 0x27E5, 1}, + {0x27C7, 0x27E5, 1}, {0x27F0, 0x2982, 1}, {0x2999, 0x29D7, 1}, {0x29DC, 0x29FB, 1}, - {0x29FE, 0x2B4C, 1}, - {0x2B50, 0x2B59, 1}, + {0x29FE, 0x2B73, 1}, + {0x2B76, 0x2B95, 1}, + {0x2B98, 0x2BB9, 1}, + {0x2BBD, 0x2BC8, 1}, + {0x2BCA, 0x2BD2, 1}, + {0x2BEC, 0x2BEF, 1}, {0x2CE5, 0x2CEA, 1}, {0x2E80, 0x2E99, 1}, {0x2E9B, 0x2EF3, 1}, @@ -2151,8 +2676,9 @@ private static int[][] make_S() { {0x3196, 0x319F, 1}, {0x31C0, 0x31E3, 1}, {0x3200, 0x321E, 1}, - {0x322A, 0x3250, 1}, - {0x3260, 0x327F, 1}, + {0x322A, 0x3247, 1}, + {0x3250, 0x3260, 16}, + {0x3261, 0x327F, 1}, {0x328A, 0x32B0, 1}, {0x32C0, 0x32FE, 1}, {0x3300, 0x33FF, 1}, @@ -2164,8 +2690,8 @@ private static int[][] make_S() { {0xA828, 0xA82B, 1}, {0xA836, 0xA839, 1}, {0xAA77, 0xAA79, 1}, - {0xFB29, 0xFBB2, 137}, - {0xFBB3, 0xFBC1, 1}, + {0xAB5B, 0xFB29, 20430}, + {0xFBB2, 0xFBC1, 1}, {0xFDFC, 0xFDFD, 1}, {0xFE62, 0xFE64, 2}, {0xFE65, 0xFE66, 1}, @@ -2177,18 +2703,23 @@ private static int[][] make_S() { {0xFFE0, 0xFFE6, 1}, {0xFFE8, 0xFFEE, 1}, {0xFFFC, 0xFFFD, 1}, - {0x10102, 0x10137, 53}, - {0x10138, 0x1013F, 1}, + {0x10137, 0x1013F, 1}, {0x10179, 0x10189, 1}, + {0x1018C, 0x1018E, 1}, {0x10190, 0x1019B, 1}, - {0x101D0, 0x101FC, 1}, + {0x101A0, 0x101D0, 48}, + {0x101D1, 0x101FC, 1}, + {0x10877, 0x10878, 1}, + {0x10AC8, 0x1173F, 3191}, + {0x16B3C, 0x16B3F, 1}, + {0x16B45, 0x1BC9C, 20823}, {0x1D000, 0x1D0F5, 1}, {0x1D100, 0x1D126, 1}, {0x1D129, 0x1D164, 1}, {0x1D16A, 0x1D16C, 1}, {0x1D183, 0x1D184, 1}, {0x1D18C, 0x1D1A9, 1}, - {0x1D1AE, 0x1D1DD, 1}, + {0x1D1AE, 0x1D1E8, 1}, {0x1D200, 0x1D241, 1}, {0x1D245, 0x1D300, 187}, {0x1D301, 0x1D356, 1}, @@ -2197,45 +2728,43 @@ private static int[][] make_S() { {0x1D735, 0x1D74F, 26}, {0x1D76F, 0x1D789, 26}, {0x1D7A9, 0x1D7C3, 26}, + {0x1D800, 0x1D9FF, 1}, + {0x1DA37, 0x1DA3A, 1}, + {0x1DA6D, 0x1DA74, 1}, + {0x1DA76, 0x1DA83, 1}, + {0x1DA85, 0x1DA86, 1}, + {0x1EEF0, 0x1EEF1, 1}, {0x1F000, 0x1F02B, 1}, {0x1F030, 0x1F093, 1}, {0x1F0A0, 0x1F0AE, 1}, - {0x1F0B1, 0x1F0BE, 1}, + {0x1F0B1, 0x1F0BF, 1}, {0x1F0C1, 0x1F0CF, 1}, - {0x1F0D1, 0x1F0DF, 1}, + {0x1F0D1, 0x1F0F5, 1}, {0x1F110, 0x1F12E, 1}, - {0x1F130, 0x1F169, 1}, - {0x1F170, 0x1F19A, 1}, + {0x1F130, 0x1F16B, 1}, + {0x1F170, 0x1F1AC, 1}, {0x1F1E6, 0x1F202, 1}, - {0x1F210, 0x1F23A, 1}, + {0x1F210, 0x1F23B, 1}, {0x1F240, 0x1F248, 1}, {0x1F250, 0x1F251, 1}, - {0x1F300, 0x1F320, 1}, - {0x1F330, 0x1F335, 1}, - {0x1F337, 0x1F37C, 1}, - {0x1F380, 0x1F393, 1}, - {0x1F3A0, 0x1F3C4, 1}, - {0x1F3C6, 0x1F3CA, 1}, - {0x1F3E0, 0x1F3F0, 1}, - {0x1F400, 0x1F43E, 1}, - {0x1F440, 0x1F442, 2}, - {0x1F443, 0x1F4F7, 1}, - {0x1F4F9, 0x1F4FC, 1}, - {0x1F500, 0x1F53D, 1}, - {0x1F550, 0x1F567, 1}, - {0x1F5FB, 0x1F5FF, 1}, - {0x1F601, 0x1F610, 1}, - {0x1F612, 0x1F614, 1}, - {0x1F616, 0x1F61C, 2}, - {0x1F61D, 0x1F61E, 1}, - {0x1F620, 0x1F625, 1}, - {0x1F628, 0x1F62B, 1}, - {0x1F62D, 0x1F630, 3}, - {0x1F631, 0x1F633, 1}, - {0x1F635, 0x1F640, 1}, - {0x1F645, 0x1F64F, 1}, - {0x1F680, 0x1F6C5, 1}, - {0x1F700, 0x1F773, 1} + {0x1F260, 0x1F265, 1}, + {0x1F300, 0x1F6D4, 1}, + {0x1F6E0, 0x1F6EC, 1}, + {0x1F6F0, 0x1F6F8, 1}, + {0x1F700, 0x1F773, 1}, + {0x1F780, 0x1F7D4, 1}, + {0x1F800, 0x1F80B, 1}, + {0x1F810, 0x1F847, 1}, + {0x1F850, 0x1F859, 1}, + {0x1F860, 0x1F887, 1}, + {0x1F890, 0x1F8AD, 1}, + {0x1F900, 0x1F90B, 1}, + {0x1F910, 0x1F93E, 1}, + {0x1F940, 0x1F94C, 1}, + {0x1F950, 0x1F96B, 1}, + {0x1F980, 0x1F997, 1}, + {0x1F9C0, 0x1F9D0, 16}, + {0x1F9D1, 0x1F9E6, 1} }; } @@ -2244,18 +2773,20 @@ private static int[][] make_C() { {0x0000, 0x001F, 1}, {0x007F, 0x009F, 1}, {0x00AD, 0x0600, 1363}, - {0x0601, 0x0603, 1}, - {0x06DD, 0x070F, 50}, - {0x17B4, 0x17B5, 1}, - {0x200B, 0x200F, 1}, + {0x0601, 0x0605, 1}, + {0x061C, 0x06DD, 193}, + {0x070F, 0x08E2, 467}, + {0x180E, 0x200B, 2045}, + {0x200C, 0x200F, 1}, {0x202A, 0x202E, 1}, {0x2060, 0x2064, 1}, - {0x206A, 0x206F, 1}, + {0x2066, 0x206F, 1}, {0xD800, 0xF8FF, 1}, {0xFEFF, 0xFFF9, 250}, {0xFFFA, 0xFFFB, 1}, - {0x110BD, 0x1D173, 49334}, - {0x1D174, 0x1D17A, 1}, + {0x110BD, 0x1BCA0, 44003}, + {0x1BCA1, 0x1BCA3, 1}, + {0x1D173, 0x1D17A, 1}, {0xE0001, 0xE0020, 31}, {0xE0021, 0xE007F, 1}, {0xF0000, 0xFFFFD, 1}, @@ -2266,8 +2797,8 @@ private static int[][] make_C() { private static int[][] make_Z() { return new int[][] { {0x0020, 0x00A0, 128}, - {0x1680, 0x180E, 398}, - {0x2000, 0x200A, 1}, + {0x1680, 0x2000, 2432}, + {0x2001, 0x200A, 1}, {0x2028, 0x2029, 1}, {0x202F, 0x205F, 48}, {0x3000, 0x3000, 1} @@ -2289,13 +2820,13 @@ private static int[][] make_L() { {0x0370, 0x0374, 1}, {0x0376, 0x0377, 1}, {0x037A, 0x037D, 1}, - {0x0386, 0x0388, 2}, - {0x0389, 0x038A, 1}, + {0x037F, 0x0386, 7}, + {0x0388, 0x038A, 1}, {0x038C, 0x038E, 2}, {0x038F, 0x03A1, 1}, {0x03A3, 0x03F5, 1}, {0x03F7, 0x0481, 1}, - {0x048A, 0x0527, 1}, + {0x048A, 0x052F, 1}, {0x0531, 0x0556, 1}, {0x0559, 0x0561, 8}, {0x0562, 0x0587, 1}, @@ -2319,11 +2850,13 @@ private static int[][] make_L() { {0x081A, 0x0824, 10}, {0x0828, 0x0840, 24}, {0x0841, 0x0858, 1}, + {0x0860, 0x086A, 1}, + {0x08A0, 0x08B4, 1}, + {0x08B6, 0x08BD, 1}, {0x0904, 0x0939, 1}, {0x093D, 0x0950, 19}, {0x0958, 0x0961, 1}, - {0x0971, 0x0977, 1}, - {0x0979, 0x097F, 1}, + {0x0971, 0x0980, 1}, {0x0985, 0x098C, 1}, {0x098F, 0x0990, 1}, {0x0993, 0x09A8, 1}, @@ -2334,7 +2867,8 @@ private static int[][] make_L() { {0x09DC, 0x09DD, 1}, {0x09DF, 0x09E1, 1}, {0x09F0, 0x09F1, 1}, - {0x0A05, 0x0A0A, 1}, + {0x09FC, 0x0A05, 9}, + {0x0A06, 0x0A0A, 1}, {0x0A0F, 0x0A10, 1}, {0x0A13, 0x0A28, 1}, {0x0A2A, 0x0A30, 1}, @@ -2352,7 +2886,8 @@ private static int[][] make_L() { {0x0AB5, 0x0AB9, 1}, {0x0ABD, 0x0AD0, 19}, {0x0AE0, 0x0AE1, 1}, - {0x0B05, 0x0B0C, 1}, + {0x0AF9, 0x0B05, 12}, + {0x0B06, 0x0B0C, 1}, {0x0B0F, 0x0B10, 1}, {0x0B13, 0x0B28, 1}, {0x0B2A, 0x0B30, 1}, @@ -2375,11 +2910,11 @@ private static int[][] make_L() { {0x0C06, 0x0C0C, 1}, {0x0C0E, 0x0C10, 1}, {0x0C12, 0x0C28, 1}, - {0x0C2A, 0x0C33, 1}, - {0x0C35, 0x0C39, 1}, + {0x0C2A, 0x0C39, 1}, {0x0C3D, 0x0C58, 27}, - {0x0C59, 0x0C60, 7}, - {0x0C61, 0x0C85, 36}, + {0x0C59, 0x0C5A, 1}, + {0x0C60, 0x0C61, 1}, + {0x0C80, 0x0C85, 5}, {0x0C86, 0x0C8C, 1}, {0x0C8E, 0x0C90, 1}, {0x0C92, 0x0CA8, 1}, @@ -2392,7 +2927,8 @@ private static int[][] make_L() { {0x0D0E, 0x0D10, 1}, {0x0D12, 0x0D3A, 1}, {0x0D3D, 0x0D4E, 17}, - {0x0D60, 0x0D61, 1}, + {0x0D54, 0x0D56, 1}, + {0x0D5F, 0x0D61, 1}, {0x0D7A, 0x0D7F, 1}, {0x0D85, 0x0D96, 1}, {0x0D9A, 0x0DB1, 1}, @@ -2416,8 +2952,9 @@ private static int[][] make_L() { {0x0EBD, 0x0EC0, 3}, {0x0EC1, 0x0EC4, 1}, {0x0EC6, 0x0EDC, 22}, - {0x0EDD, 0x0F00, 35}, - {0x0F40, 0x0F47, 1}, + {0x0EDD, 0x0EDF, 1}, + {0x0F00, 0x0F40, 64}, + {0x0F41, 0x0F47, 1}, {0x0F49, 0x0F6C, 1}, {0x0F88, 0x0F8C, 1}, {0x1000, 0x102A, 1}, @@ -2430,9 +2967,9 @@ private static int[][] make_L() { {0x1075, 0x1081, 1}, {0x108E, 0x10A0, 18}, {0x10A1, 0x10C5, 1}, + {0x10C7, 0x10CD, 6}, {0x10D0, 0x10FA, 1}, - {0x10FC, 0x1100, 4}, - {0x1101, 0x1248, 1}, + {0x10FC, 0x1248, 1}, {0x124A, 0x124D, 1}, {0x1250, 0x1256, 1}, {0x1258, 0x125A, 2}, @@ -2449,11 +2986,13 @@ private static int[][] make_L() { {0x1312, 0x1315, 1}, {0x1318, 0x135A, 1}, {0x1380, 0x138F, 1}, - {0x13A0, 0x13F4, 1}, + {0x13A0, 0x13F5, 1}, + {0x13F8, 0x13FD, 1}, {0x1401, 0x166C, 1}, {0x166F, 0x167F, 1}, {0x1681, 0x169A, 1}, {0x16A0, 0x16EA, 1}, + {0x16F1, 0x16F8, 1}, {0x1700, 0x170C, 1}, {0x170E, 0x1711, 1}, {0x1720, 0x1731, 1}, @@ -2463,14 +3002,15 @@ private static int[][] make_L() { {0x1780, 0x17B3, 1}, {0x17D7, 0x17DC, 5}, {0x1820, 0x1877, 1}, - {0x1880, 0x18A8, 1}, + {0x1880, 0x1884, 1}, + {0x1887, 0x18A8, 1}, {0x18AA, 0x18B0, 6}, {0x18B1, 0x18F5, 1}, - {0x1900, 0x191C, 1}, + {0x1900, 0x191E, 1}, {0x1950, 0x196D, 1}, {0x1970, 0x1974, 1}, {0x1980, 0x19AB, 1}, - {0x19C1, 0x19C7, 1}, + {0x19B0, 0x19C9, 1}, {0x1A00, 0x1A16, 1}, {0x1A20, 0x1A54, 1}, {0x1AA7, 0x1B05, 94}, @@ -2478,12 +3018,14 @@ private static int[][] make_L() { {0x1B45, 0x1B4B, 1}, {0x1B83, 0x1BA0, 1}, {0x1BAE, 0x1BAF, 1}, - {0x1BC0, 0x1BE5, 1}, + {0x1BBA, 0x1BE5, 1}, {0x1C00, 0x1C23, 1}, {0x1C4D, 0x1C4F, 1}, {0x1C5A, 0x1C7D, 1}, + {0x1C80, 0x1C88, 1}, {0x1CE9, 0x1CEC, 1}, {0x1CEE, 0x1CF1, 1}, + {0x1CF5, 0x1CF6, 1}, {0x1D00, 0x1DBF, 1}, {0x1E00, 0x1F15, 1}, {0x1F18, 0x1F1D, 1}, @@ -2519,8 +3061,10 @@ private static int[][] make_L() { {0x2C30, 0x2C5E, 1}, {0x2C60, 0x2CE4, 1}, {0x2CEB, 0x2CEE, 1}, + {0x2CF2, 0x2CF3, 1}, {0x2D00, 0x2D25, 1}, - {0x2D30, 0x2D65, 1}, + {0x2D27, 0x2D2D, 6}, + {0x2D30, 0x2D67, 1}, {0x2D6F, 0x2D80, 17}, {0x2D81, 0x2D96, 1}, {0x2DA0, 0x2DA6, 1}, @@ -2539,60 +3083,65 @@ private static int[][] make_L() { {0x309D, 0x309F, 1}, {0x30A1, 0x30FA, 1}, {0x30FC, 0x30FF, 1}, - {0x3105, 0x312D, 1}, + {0x3105, 0x312E, 1}, {0x3131, 0x318E, 1}, {0x31A0, 0x31BA, 1}, {0x31F0, 0x31FF, 1}, {0x3400, 0x4DB5, 1}, - {0x4E00, 0x9FCB, 1}, + {0x4E00, 0x9FEA, 1}, {0xA000, 0xA48C, 1}, {0xA4D0, 0xA4FD, 1}, {0xA500, 0xA60C, 1}, {0xA610, 0xA61F, 1}, {0xA62A, 0xA62B, 1}, {0xA640, 0xA66E, 1}, - {0xA67F, 0xA697, 1}, + {0xA67F, 0xA69D, 1}, {0xA6A0, 0xA6E5, 1}, {0xA717, 0xA71F, 1}, {0xA722, 0xA788, 1}, - {0xA78B, 0xA78E, 1}, - {0xA790, 0xA791, 1}, - {0xA7A0, 0xA7A9, 1}, - {0xA7FA, 0xA801, 1}, + {0xA78B, 0xA7AE, 1}, + {0xA7B0, 0xA7B7, 1}, + {0xA7F7, 0xA801, 1}, {0xA803, 0xA805, 1}, {0xA807, 0xA80A, 1}, {0xA80C, 0xA822, 1}, {0xA840, 0xA873, 1}, {0xA882, 0xA8B3, 1}, {0xA8F2, 0xA8F7, 1}, - {0xA8FB, 0xA90A, 15}, - {0xA90B, 0xA925, 1}, + {0xA8FB, 0xA8FD, 2}, + {0xA90A, 0xA925, 1}, {0xA930, 0xA946, 1}, {0xA960, 0xA97C, 1}, {0xA984, 0xA9B2, 1}, - {0xA9CF, 0xAA00, 49}, - {0xAA01, 0xAA28, 1}, + {0xA9CF, 0xA9E0, 17}, + {0xA9E1, 0xA9E4, 1}, + {0xA9E6, 0xA9EF, 1}, + {0xA9FA, 0xA9FE, 1}, + {0xAA00, 0xAA28, 1}, {0xAA40, 0xAA42, 1}, {0xAA44, 0xAA4B, 1}, {0xAA60, 0xAA76, 1}, - {0xAA7A, 0xAA80, 6}, - {0xAA81, 0xAAAF, 1}, + {0xAA7A, 0xAA7E, 4}, + {0xAA7F, 0xAAAF, 1}, {0xAAB1, 0xAAB5, 4}, {0xAAB6, 0xAAB9, 3}, {0xAABA, 0xAABD, 1}, {0xAAC0, 0xAAC2, 2}, {0xAADB, 0xAADD, 1}, + {0xAAE0, 0xAAEA, 1}, + {0xAAF2, 0xAAF4, 1}, {0xAB01, 0xAB06, 1}, {0xAB09, 0xAB0E, 1}, {0xAB11, 0xAB16, 1}, {0xAB20, 0xAB26, 1}, {0xAB28, 0xAB2E, 1}, - {0xABC0, 0xABE2, 1}, + {0xAB30, 0xAB5A, 1}, + {0xAB5C, 0xAB65, 1}, + {0xAB70, 0xABE2, 1}, {0xAC00, 0xD7A3, 1}, {0xD7B0, 0xD7C6, 1}, {0xD7CB, 0xD7FB, 1}, - {0xF900, 0xFA2D, 1}, - {0xFA30, 0xFA6D, 1}, + {0xF900, 0xFA6D, 1}, {0xFA70, 0xFAD9, 1}, {0xFB00, 0xFB06, 1}, {0xFB13, 0xFB17, 1}, @@ -2626,36 +3175,124 @@ private static int[][] make_L() { {0x10080, 0x100FA, 1}, {0x10280, 0x1029C, 1}, {0x102A0, 0x102D0, 1}, - {0x10300, 0x1031E, 1}, - {0x10330, 0x10340, 1}, + {0x10300, 0x1031F, 1}, + {0x1032D, 0x10340, 1}, {0x10342, 0x10349, 1}, + {0x10350, 0x10375, 1}, {0x10380, 0x1039D, 1}, {0x103A0, 0x103C3, 1}, {0x103C8, 0x103CF, 1}, {0x10400, 0x1049D, 1}, + {0x104B0, 0x104D3, 1}, + {0x104D8, 0x104FB, 1}, + {0x10500, 0x10527, 1}, + {0x10530, 0x10563, 1}, + {0x10600, 0x10736, 1}, + {0x10740, 0x10755, 1}, + {0x10760, 0x10767, 1}, {0x10800, 0x10805, 1}, {0x10808, 0x1080A, 2}, {0x1080B, 0x10835, 1}, {0x10837, 0x10838, 1}, {0x1083C, 0x1083F, 3}, {0x10840, 0x10855, 1}, + {0x10860, 0x10876, 1}, + {0x10880, 0x1089E, 1}, + {0x108E0, 0x108F2, 1}, + {0x108F4, 0x108F5, 1}, {0x10900, 0x10915, 1}, {0x10920, 0x10939, 1}, + {0x10980, 0x109B7, 1}, + {0x109BE, 0x109BF, 1}, {0x10A00, 0x10A10, 16}, {0x10A11, 0x10A13, 1}, {0x10A15, 0x10A17, 1}, {0x10A19, 0x10A33, 1}, {0x10A60, 0x10A7C, 1}, + {0x10A80, 0x10A9C, 1}, + {0x10AC0, 0x10AC7, 1}, + {0x10AC9, 0x10AE4, 1}, {0x10B00, 0x10B35, 1}, {0x10B40, 0x10B55, 1}, {0x10B60, 0x10B72, 1}, + {0x10B80, 0x10B91, 1}, {0x10C00, 0x10C48, 1}, + {0x10C80, 0x10CB2, 1}, + {0x10CC0, 0x10CF2, 1}, {0x11003, 0x11037, 1}, {0x11083, 0x110AF, 1}, - {0x12000, 0x1236E, 1}, + {0x110D0, 0x110E8, 1}, + {0x11103, 0x11126, 1}, + {0x11150, 0x11172, 1}, + {0x11176, 0x11183, 13}, + {0x11184, 0x111B2, 1}, + {0x111C1, 0x111C4, 1}, + {0x111DA, 0x111DC, 2}, + {0x11200, 0x11211, 1}, + {0x11213, 0x1122B, 1}, + {0x11280, 0x11286, 1}, + {0x11288, 0x1128A, 2}, + {0x1128B, 0x1128D, 1}, + {0x1128F, 0x1129D, 1}, + {0x1129F, 0x112A8, 1}, + {0x112B0, 0x112DE, 1}, + {0x11305, 0x1130C, 1}, + {0x1130F, 0x11310, 1}, + {0x11313, 0x11328, 1}, + {0x1132A, 0x11330, 1}, + {0x11332, 0x11333, 1}, + {0x11335, 0x11339, 1}, + {0x1133D, 0x11350, 19}, + {0x1135D, 0x11361, 1}, + {0x11400, 0x11434, 1}, + {0x11447, 0x1144A, 1}, + {0x11480, 0x114AF, 1}, + {0x114C4, 0x114C5, 1}, + {0x114C7, 0x11580, 185}, + {0x11581, 0x115AE, 1}, + {0x115D8, 0x115DB, 1}, + {0x11600, 0x1162F, 1}, + {0x11644, 0x11680, 60}, + {0x11681, 0x116AA, 1}, + {0x11700, 0x11719, 1}, + {0x118A0, 0x118DF, 1}, + {0x118FF, 0x11A00, 257}, + {0x11A0B, 0x11A32, 1}, + {0x11A3A, 0x11A50, 22}, + {0x11A5C, 0x11A83, 1}, + {0x11A86, 0x11A89, 1}, + {0x11AC0, 0x11AF8, 1}, + {0x11C00, 0x11C08, 1}, + {0x11C0A, 0x11C2E, 1}, + {0x11C40, 0x11C72, 50}, + {0x11C73, 0x11C8F, 1}, + {0x11D00, 0x11D06, 1}, + {0x11D08, 0x11D09, 1}, + {0x11D0B, 0x11D30, 1}, + {0x11D46, 0x12000, 698}, + {0x12001, 0x12399, 1}, + {0x12480, 0x12543, 1}, {0x13000, 0x1342E, 1}, + {0x14400, 0x14646, 1}, {0x16800, 0x16A38, 1}, - {0x1B000, 0x1B001, 1}, + {0x16A40, 0x16A5E, 1}, + {0x16AD0, 0x16AED, 1}, + {0x16B00, 0x16B2F, 1}, + {0x16B40, 0x16B43, 1}, + {0x16B63, 0x16B77, 1}, + {0x16B7D, 0x16B8F, 1}, + {0x16F00, 0x16F44, 1}, + {0x16F50, 0x16F93, 67}, + {0x16F94, 0x16F9F, 1}, + {0x16FE0, 0x16FE1, 1}, + {0x17000, 0x187EC, 1}, + {0x18800, 0x18AF2, 1}, + {0x1B000, 0x1B11E, 1}, + {0x1B170, 0x1B2FB, 1}, + {0x1BC00, 0x1BC6A, 1}, + {0x1BC70, 0x1BC7C, 1}, + {0x1BC80, 0x1BC88, 1}, + {0x1BC90, 0x1BC99, 1}, {0x1D400, 0x1D454, 1}, {0x1D456, 0x1D49C, 1}, {0x1D49E, 0x1D49F, 1}, @@ -2686,9 +3323,37 @@ private static int[][] make_L() { {0x1D78A, 0x1D7A8, 1}, {0x1D7AA, 0x1D7C2, 1}, {0x1D7C4, 0x1D7CB, 1}, + {0x1E800, 0x1E8C4, 1}, + {0x1E900, 0x1E943, 1}, + {0x1EE00, 0x1EE03, 1}, + {0x1EE05, 0x1EE1F, 1}, + {0x1EE21, 0x1EE22, 1}, + {0x1EE24, 0x1EE27, 3}, + {0x1EE29, 0x1EE32, 1}, + {0x1EE34, 0x1EE37, 1}, + {0x1EE39, 0x1EE3B, 2}, + {0x1EE42, 0x1EE47, 5}, + {0x1EE49, 0x1EE4D, 2}, + {0x1EE4E, 0x1EE4F, 1}, + {0x1EE51, 0x1EE52, 1}, + {0x1EE54, 0x1EE57, 3}, + {0x1EE59, 0x1EE61, 2}, + {0x1EE62, 0x1EE64, 2}, + {0x1EE67, 0x1EE6A, 1}, + {0x1EE6C, 0x1EE72, 1}, + {0x1EE74, 0x1EE77, 1}, + {0x1EE79, 0x1EE7C, 1}, + {0x1EE7E, 0x1EE80, 2}, + {0x1EE81, 0x1EE89, 1}, + {0x1EE8B, 0x1EE9B, 1}, + {0x1EEA1, 0x1EEA3, 1}, + {0x1EEA5, 0x1EEA9, 1}, + {0x1EEAB, 0x1EEBB, 1}, {0x20000, 0x2A6D6, 1}, {0x2A700, 0x2B734, 1}, {0x2B740, 0x2B81D, 1}, + {0x2B820, 0x2CEA1, 1}, + {0x2CEB0, 0x2EBE0, 1}, {0x2F800, 0x2FA1D, 1} }; } @@ -2717,7 +3382,8 @@ private static int[][] make_M() { {0x0825, 0x0827, 1}, {0x0829, 0x082D, 1}, {0x0859, 0x085B, 1}, - {0x0900, 0x0903, 1}, + {0x08D4, 0x08E1, 1}, + {0x08E3, 0x0903, 1}, {0x093A, 0x093C, 1}, {0x093E, 0x094F, 1}, {0x0951, 0x0957, 1}, @@ -2742,6 +3408,7 @@ private static int[][] make_M() { {0x0AC7, 0x0AC9, 1}, {0x0ACB, 0x0ACD, 1}, {0x0AE2, 0x0AE3, 1}, + {0x0AFA, 0x0AFF, 1}, {0x0B01, 0x0B03, 1}, {0x0B3C, 0x0B3E, 2}, {0x0B3F, 0x0B44, 1}, @@ -2753,21 +3420,22 @@ private static int[][] make_M() { {0x0BBF, 0x0BC2, 1}, {0x0BC6, 0x0BC8, 1}, {0x0BCA, 0x0BCD, 1}, - {0x0BD7, 0x0C01, 42}, - {0x0C02, 0x0C03, 1}, + {0x0BD7, 0x0C00, 41}, + {0x0C01, 0x0C03, 1}, {0x0C3E, 0x0C44, 1}, {0x0C46, 0x0C48, 1}, {0x0C4A, 0x0C4D, 1}, {0x0C55, 0x0C56, 1}, {0x0C62, 0x0C63, 1}, - {0x0C82, 0x0C83, 1}, + {0x0C81, 0x0C83, 1}, {0x0CBC, 0x0CBE, 2}, {0x0CBF, 0x0CC4, 1}, {0x0CC6, 0x0CC8, 1}, {0x0CCA, 0x0CCD, 1}, {0x0CD5, 0x0CD6, 1}, {0x0CE2, 0x0CE3, 1}, - {0x0D02, 0x0D03, 1}, + {0x0D00, 0x0D03, 1}, + {0x0D3B, 0x0D3C, 1}, {0x0D3E, 0x0D44, 1}, {0x0D46, 0x0D48, 1}, {0x0D4A, 0x0D4D, 1}, @@ -2807,30 +3475,32 @@ private static int[][] make_M() { {0x1732, 0x1734, 1}, {0x1752, 0x1753, 1}, {0x1772, 0x1773, 1}, - {0x17B6, 0x17D3, 1}, + {0x17B4, 0x17D3, 1}, {0x17DD, 0x180B, 46}, {0x180C, 0x180D, 1}, + {0x1885, 0x1886, 1}, {0x18A9, 0x1920, 119}, {0x1921, 0x192B, 1}, {0x1930, 0x193B, 1}, - {0x19B0, 0x19C0, 1}, - {0x19C8, 0x19C9, 1}, {0x1A17, 0x1A1B, 1}, {0x1A55, 0x1A5E, 1}, {0x1A60, 0x1A7C, 1}, - {0x1A7F, 0x1B00, 129}, - {0x1B01, 0x1B04, 1}, + {0x1A7F, 0x1AB0, 49}, + {0x1AB1, 0x1ABE, 1}, + {0x1B00, 0x1B04, 1}, {0x1B34, 0x1B44, 1}, {0x1B6B, 0x1B73, 1}, {0x1B80, 0x1B82, 1}, - {0x1BA1, 0x1BAA, 1}, + {0x1BA1, 0x1BAD, 1}, {0x1BE6, 0x1BF3, 1}, {0x1C24, 0x1C37, 1}, {0x1CD0, 0x1CD2, 1}, {0x1CD4, 0x1CE8, 1}, {0x1CED, 0x1CF2, 5}, - {0x1DC0, 0x1DE6, 1}, - {0x1DFC, 0x1DFF, 1}, + {0x1CF3, 0x1CF4, 1}, + {0x1CF7, 0x1CF9, 1}, + {0x1DC0, 0x1DF9, 1}, + {0x1DFB, 0x1DFF, 1}, {0x20D0, 0x20F0, 1}, {0x2CEF, 0x2CF1, 1}, {0x2D7F, 0x2DE0, 97}, @@ -2838,47 +3508,112 @@ private static int[][] make_M() { {0x302A, 0x302F, 1}, {0x3099, 0x309A, 1}, {0xA66F, 0xA672, 1}, - {0xA67C, 0xA67D, 1}, + {0xA674, 0xA67D, 1}, + {0xA69E, 0xA69F, 1}, {0xA6F0, 0xA6F1, 1}, {0xA802, 0xA806, 4}, {0xA80B, 0xA823, 24}, {0xA824, 0xA827, 1}, {0xA880, 0xA881, 1}, - {0xA8B4, 0xA8C4, 1}, + {0xA8B4, 0xA8C5, 1}, {0xA8E0, 0xA8F1, 1}, {0xA926, 0xA92D, 1}, {0xA947, 0xA953, 1}, {0xA980, 0xA983, 1}, {0xA9B3, 0xA9C0, 1}, - {0xAA29, 0xAA36, 1}, + {0xA9E5, 0xAA29, 68}, + {0xAA2A, 0xAA36, 1}, {0xAA43, 0xAA4C, 9}, {0xAA4D, 0xAA7B, 46}, + {0xAA7C, 0xAA7D, 1}, {0xAAB0, 0xAAB2, 2}, {0xAAB3, 0xAAB4, 1}, {0xAAB7, 0xAAB8, 1}, {0xAABE, 0xAABF, 1}, - {0xAAC1, 0xABE3, 290}, - {0xABE4, 0xABEA, 1}, + {0xAAC1, 0xAAEB, 42}, + {0xAAEC, 0xAAEF, 1}, + {0xAAF5, 0xAAF6, 1}, + {0xABE3, 0xABEA, 1}, {0xABEC, 0xABED, 1}, {0xFB1E, 0xFE00, 738}, {0xFE01, 0xFE0F, 1}, - {0xFE20, 0xFE26, 1}, - {0x101FD, 0x10A01, 2052}, - {0x10A02, 0x10A03, 1}, + {0xFE20, 0xFE2F, 1}, + {0x101FD, 0x102E0, 227}, + {0x10376, 0x1037A, 1}, + {0x10A01, 0x10A03, 1}, {0x10A05, 0x10A06, 1}, {0x10A0C, 0x10A0F, 1}, {0x10A38, 0x10A3A, 1}, - {0x10A3F, 0x11000, 1473}, + {0x10A3F, 0x10AE5, 166}, + {0x10AE6, 0x11000, 1306}, {0x11001, 0x11002, 1}, {0x11038, 0x11046, 1}, - {0x11080, 0x11082, 1}, + {0x1107F, 0x11082, 1}, {0x110B0, 0x110BA, 1}, + {0x11100, 0x11102, 1}, + {0x11127, 0x11134, 1}, + {0x11173, 0x11180, 13}, + {0x11181, 0x11182, 1}, + {0x111B3, 0x111C0, 1}, + {0x111CA, 0x111CC, 1}, + {0x1122C, 0x11237, 1}, + {0x1123E, 0x112DF, 161}, + {0x112E0, 0x112EA, 1}, + {0x11300, 0x11303, 1}, + {0x1133C, 0x1133E, 2}, + {0x1133F, 0x11344, 1}, + {0x11347, 0x11348, 1}, + {0x1134B, 0x1134D, 1}, + {0x11357, 0x11362, 11}, + {0x11363, 0x11366, 3}, + {0x11367, 0x1136C, 1}, + {0x11370, 0x11374, 1}, + {0x11435, 0x11446, 1}, + {0x114B0, 0x114C3, 1}, + {0x115AF, 0x115B5, 1}, + {0x115B8, 0x115C0, 1}, + {0x115DC, 0x115DD, 1}, + {0x11630, 0x11640, 1}, + {0x116AB, 0x116B7, 1}, + {0x1171D, 0x1172B, 1}, + {0x11A01, 0x11A0A, 1}, + {0x11A33, 0x11A39, 1}, + {0x11A3B, 0x11A3E, 1}, + {0x11A47, 0x11A51, 10}, + {0x11A52, 0x11A5B, 1}, + {0x11A8A, 0x11A99, 1}, + {0x11C2F, 0x11C36, 1}, + {0x11C38, 0x11C3F, 1}, + {0x11C92, 0x11CA7, 1}, + {0x11CA9, 0x11CB6, 1}, + {0x11D31, 0x11D36, 1}, + {0x11D3A, 0x11D3C, 2}, + {0x11D3D, 0x11D3F, 2}, + {0x11D40, 0x11D45, 1}, + {0x11D47, 0x16AF0, 19881}, + {0x16AF1, 0x16AF4, 1}, + {0x16B30, 0x16B36, 1}, + {0x16F51, 0x16F7E, 1}, + {0x16F8F, 0x16F92, 1}, + {0x1BC9D, 0x1BC9E, 1}, {0x1D165, 0x1D169, 1}, {0x1D16D, 0x1D172, 1}, {0x1D17B, 0x1D182, 1}, {0x1D185, 0x1D18B, 1}, {0x1D1AA, 0x1D1AD, 1}, {0x1D242, 0x1D244, 1}, + {0x1DA00, 0x1DA36, 1}, + {0x1DA3B, 0x1DA6C, 1}, + {0x1DA75, 0x1DA84, 15}, + {0x1DA9B, 0x1DA9F, 1}, + {0x1DAA1, 0x1DAAF, 1}, + {0x1E000, 0x1E006, 1}, + {0x1E008, 0x1E018, 1}, + {0x1E01B, 0x1E021, 1}, + {0x1E023, 0x1E024, 1}, + {0x1E026, 0x1E02A, 1}, + {0x1E8D0, 0x1E8D6, 1}, + {0x1E944, 0x1E94A, 1}, {0xE0100, 0xE01EF, 1} }; } @@ -2903,7 +3638,9 @@ private static int[][] make_N() { {0x0C66, 0x0C6F, 1}, {0x0C78, 0x0C7E, 1}, {0x0CE6, 0x0CEF, 1}, - {0x0D66, 0x0D75, 1}, + {0x0D58, 0x0D5E, 1}, + {0x0D66, 0x0D78, 1}, + {0x0DE6, 0x0DEF, 1}, {0x0E50, 0x0E59, 1}, {0x0ED0, 0x0ED9, 1}, {0x0F20, 0x0F33, 1}, @@ -2935,6 +3672,7 @@ private static int[][] make_N() { {0x3038, 0x303A, 1}, {0x3192, 0x3195, 1}, {0x3220, 0x3229, 1}, + {0x3248, 0x324F, 1}, {0x3251, 0x325F, 1}, {0x3280, 0x3289, 1}, {0x32B1, 0x32BF, 1}, @@ -2944,28 +3682,58 @@ private static int[][] make_N() { {0xA8D0, 0xA8D9, 1}, {0xA900, 0xA909, 1}, {0xA9D0, 0xA9D9, 1}, + {0xA9F0, 0xA9F9, 1}, {0xAA50, 0xAA59, 1}, {0xABF0, 0xABF9, 1}, {0xFF10, 0xFF19, 1}, {0x10107, 0x10133, 1}, {0x10140, 0x10178, 1}, - {0x1018A, 0x10320, 406}, - {0x10321, 0x10323, 1}, + {0x1018A, 0x1018B, 1}, + {0x102E1, 0x102FB, 1}, + {0x10320, 0x10323, 1}, {0x10341, 0x1034A, 9}, {0x103D1, 0x103D5, 1}, {0x104A0, 0x104A9, 1}, {0x10858, 0x1085F, 1}, + {0x10879, 0x1087F, 1}, + {0x108A7, 0x108AF, 1}, + {0x108FB, 0x108FF, 1}, {0x10916, 0x1091B, 1}, + {0x109BC, 0x109BD, 1}, + {0x109C0, 0x109CF, 1}, + {0x109D2, 0x109FF, 1}, {0x10A40, 0x10A47, 1}, {0x10A7D, 0x10A7E, 1}, + {0x10A9D, 0x10A9F, 1}, + {0x10AEB, 0x10AEF, 1}, {0x10B58, 0x10B5F, 1}, {0x10B78, 0x10B7F, 1}, + {0x10BA9, 0x10BAF, 1}, + {0x10CFA, 0x10CFF, 1}, {0x10E60, 0x10E7E, 1}, {0x11052, 0x1106F, 1}, - {0x12400, 0x12462, 1}, + {0x110F0, 0x110F9, 1}, + {0x11136, 0x1113F, 1}, + {0x111D0, 0x111D9, 1}, + {0x111E1, 0x111F4, 1}, + {0x112F0, 0x112F9, 1}, + {0x11450, 0x11459, 1}, + {0x114D0, 0x114D9, 1}, + {0x11650, 0x11659, 1}, + {0x116C0, 0x116C9, 1}, + {0x11730, 0x1173B, 1}, + {0x118E0, 0x118F2, 1}, + {0x11C50, 0x11C6C, 1}, + {0x11D50, 0x11D59, 1}, + {0x12400, 0x1246E, 1}, + {0x16A60, 0x16A69, 1}, + {0x16B50, 0x16B59, 1}, + {0x16B5B, 0x16B61, 1}, {0x1D360, 0x1D371, 1}, {0x1D7CE, 0x1D7FF, 1}, - {0x1F100, 0x1F10A, 1} + {0x1E8C7, 0x1E8CF, 1}, + {0x1E950, 0x1E959, 1}, + {0x1F100, 0x1F10C, 1} }; } @@ -2982,12 +3750,11 @@ private static int[][] make_Common() { {0x02EC, 0x02FF, 1}, {0x0374, 0x037E, 10}, {0x0385, 0x0387, 2}, - {0x0589, 0x060C, 131}, - {0x061B, 0x061F, 4}, - {0x0640, 0x0660, 32}, - {0x0661, 0x0669, 1}, - {0x06DD, 0x0964, 647}, - {0x0965, 0x0970, 11}, + {0x0589, 0x0605, 124}, + {0x060C, 0x061B, 15}, + {0x061F, 0x0640, 33}, + {0x06DD, 0x08E2, 517}, + {0x0964, 0x0965, 1}, {0x0E3F, 0x0FD5, 406}, {0x0FD6, 0x0FD8, 1}, {0x10FB, 0x16EB, 1520}, @@ -2997,29 +3764,30 @@ private static int[][] make_Common() { {0x1805, 0x1CD3, 1230}, {0x1CE1, 0x1CE9, 8}, {0x1CEA, 0x1CEC, 1}, - {0x1CEE, 0x1CF2, 1}, + {0x1CEE, 0x1CF3, 1}, + {0x1CF5, 0x1CF7, 1}, {0x2000, 0x200B, 1}, {0x200E, 0x2064, 1}, - {0x206A, 0x2070, 1}, + {0x2066, 0x2070, 1}, {0x2074, 0x207E, 1}, {0x2080, 0x208E, 1}, - {0x20A0, 0x20B9, 1}, + {0x20A0, 0x20BF, 1}, {0x2100, 0x2125, 1}, {0x2127, 0x2129, 1}, {0x212C, 0x2131, 1}, {0x2133, 0x214D, 1}, {0x214F, 0x215F, 1}, - {0x2189, 0x2190, 7}, - {0x2191, 0x23F3, 1}, - {0x2400, 0x2426, 1}, + {0x2189, 0x218B, 1}, + {0x2190, 0x2426, 1}, {0x2440, 0x244A, 1}, - {0x2460, 0x26FF, 1}, - {0x2701, 0x27CA, 1}, - {0x27CC, 0x27CE, 2}, - {0x27CF, 0x27FF, 1}, - {0x2900, 0x2B4C, 1}, - {0x2B50, 0x2B59, 1}, - {0x2E00, 0x2E31, 1}, + {0x2460, 0x27FF, 1}, + {0x2900, 0x2B73, 1}, + {0x2B76, 0x2B95, 1}, + {0x2B98, 0x2BB9, 1}, + {0x2BBD, 0x2BC8, 1}, + {0x2BCA, 0x2BD2, 1}, + {0x2BEC, 0x2BEF, 1}, + {0x2E00, 0x2E49, 1}, {0x2FF0, 0x2FFB, 1}, {0x3000, 0x3004, 1}, {0x3006, 0x3008, 2}, @@ -3038,8 +3806,9 @@ private static int[][] make_Common() { {0xA700, 0xA721, 1}, {0xA788, 0xA78A, 1}, {0xA830, 0xA839, 1}, - {0xFD3E, 0xFD3F, 1}, - {0xFDFD, 0xFE10, 19}, + {0xA92E, 0xA9CF, 161}, + {0xAB5B, 0xFD3E, 20963}, + {0xFD3F, 0xFE10, 209}, {0xFE11, 0xFE19, 1}, {0xFE30, 0xFE52, 1}, {0xFE54, 0xFE66, 1}, @@ -3058,13 +3827,15 @@ private static int[][] make_Common() { {0x10137, 0x1013F, 1}, {0x10190, 0x1019B, 1}, {0x101D0, 0x101FC, 1}, + {0x102E1, 0x102FB, 1}, + {0x1BCA0, 0x1BCA3, 1}, {0x1D000, 0x1D0F5, 1}, {0x1D100, 0x1D126, 1}, {0x1D129, 0x1D166, 1}, {0x1D16A, 0x1D17A, 1}, {0x1D183, 0x1D184, 1}, {0x1D18C, 0x1D1A9, 1}, - {0x1D1AE, 0x1D1DD, 1}, + {0x1D1AE, 0x1D1E8, 1}, {0x1D300, 0x1D356, 1}, {0x1D360, 0x1D371, 1}, {0x1D400, 0x1D454, 1}, @@ -3091,44 +3862,36 @@ private static int[][] make_Common() { {0x1F000, 0x1F02B, 1}, {0x1F030, 0x1F093, 1}, {0x1F0A0, 0x1F0AE, 1}, - {0x1F0B1, 0x1F0BE, 1}, + {0x1F0B1, 0x1F0BF, 1}, {0x1F0C1, 0x1F0CF, 1}, - {0x1F0D1, 0x1F0DF, 1}, - {0x1F100, 0x1F10A, 1}, + {0x1F0D1, 0x1F0F5, 1}, + {0x1F100, 0x1F10C, 1}, {0x1F110, 0x1F12E, 1}, - {0x1F130, 0x1F169, 1}, - {0x1F170, 0x1F19A, 1}, + {0x1F130, 0x1F16B, 1}, + {0x1F170, 0x1F1AC, 1}, {0x1F1E6, 0x1F1FF, 1}, {0x1F201, 0x1F202, 1}, - {0x1F210, 0x1F23A, 1}, + {0x1F210, 0x1F23B, 1}, {0x1F240, 0x1F248, 1}, {0x1F250, 0x1F251, 1}, - {0x1F300, 0x1F320, 1}, - {0x1F330, 0x1F335, 1}, - {0x1F337, 0x1F37C, 1}, - {0x1F380, 0x1F393, 1}, - {0x1F3A0, 0x1F3C4, 1}, - {0x1F3C6, 0x1F3CA, 1}, - {0x1F3E0, 0x1F3F0, 1}, - {0x1F400, 0x1F43E, 1}, - {0x1F440, 0x1F442, 2}, - {0x1F443, 0x1F4F7, 1}, - {0x1F4F9, 0x1F4FC, 1}, - {0x1F500, 0x1F53D, 1}, - {0x1F550, 0x1F567, 1}, - {0x1F5FB, 0x1F5FF, 1}, - {0x1F601, 0x1F610, 1}, - {0x1F612, 0x1F614, 1}, - {0x1F616, 0x1F61C, 2}, - {0x1F61D, 0x1F61E, 1}, - {0x1F620, 0x1F625, 1}, - {0x1F628, 0x1F62B, 1}, - {0x1F62D, 0x1F630, 3}, - {0x1F631, 0x1F633, 1}, - {0x1F635, 0x1F640, 1}, - {0x1F645, 0x1F64F, 1}, - {0x1F680, 0x1F6C5, 1}, + {0x1F260, 0x1F265, 1}, + {0x1F300, 0x1F6D4, 1}, + {0x1F6E0, 0x1F6EC, 1}, + {0x1F6F0, 0x1F6F8, 1}, {0x1F700, 0x1F773, 1}, + {0x1F780, 0x1F7D4, 1}, + {0x1F800, 0x1F80B, 1}, + {0x1F810, 0x1F847, 1}, + {0x1F850, 0x1F859, 1}, + {0x1F860, 0x1F887, 1}, + {0x1F890, 0x1F8AD, 1}, + {0x1F900, 0x1F90B, 1}, + {0x1F910, 0x1F93E, 1}, + {0x1F940, 0x1F94C, 1}, + {0x1F950, 0x1F96B, 1}, + {0x1F980, 0x1F997, 1}, + {0x1F9C0, 0x1F9D0, 16}, + {0x1F9D1, 0x1F9E6, 1}, {0xE0001, 0xE0020, 31}, {0xE0021, 0xE007F, 1} }; @@ -3139,22 +3902,24 @@ private static int[][] make_Inherited() { {0x0300, 0x036F, 1}, {0x0485, 0x0486, 1}, {0x064B, 0x0655, 1}, - {0x065F, 0x0670, 17}, - {0x0951, 0x0952, 1}, + {0x0670, 0x0951, 737}, + {0x0952, 0x1AB0, 4446}, + {0x1AB1, 0x1ABE, 1}, {0x1CD0, 0x1CD2, 1}, {0x1CD4, 0x1CE0, 1}, {0x1CE2, 0x1CE8, 1}, - {0x1CED, 0x1DC0, 211}, - {0x1DC1, 0x1DE6, 1}, - {0x1DFC, 0x1DFF, 1}, + {0x1CED, 0x1CF4, 7}, + {0x1CF8, 0x1CF9, 1}, + {0x1DC0, 0x1DF9, 1}, + {0x1DFB, 0x1DFF, 1}, {0x200C, 0x200D, 1}, {0x20D0, 0x20F0, 1}, {0x302A, 0x302D, 1}, {0x3099, 0x309A, 1}, {0xFE00, 0xFE0F, 1}, - {0xFE20, 0xFE26, 1}, - {0x101FD, 0x1D167, 53098}, - {0x1D168, 0x1D169, 1}, + {0xFE20, 0xFE2D, 1}, + {0x101FD, 0x102E0, 227}, + {0x1D167, 0x1D169, 1}, {0x1D17B, 0x1D182, 1}, {0x1D185, 0x1D18B, 1}, {0x1D1AA, 0x1D1AD, 1}, @@ -3162,51 +3927,72 @@ private static int[][] make_Inherited() { }; } - private static int[][] make_Bamum() { - return new int[][] {{0xA6A0, 0xA6F7, 1}, {0x16800, 0x16A38, 1}}; - } - private static int[][] make_Arabic() { return new int[][] { - {0x0600, 0x0603, 1}, + {0x0600, 0x0604, 1}, {0x0606, 0x060B, 1}, {0x060D, 0x061A, 1}, - {0x061E, 0x0620, 2}, + {0x061C, 0x0620, 2}, {0x0621, 0x063F, 1}, {0x0641, 0x064A, 1}, - {0x0656, 0x065E, 1}, - {0x066A, 0x066F, 1}, + {0x0656, 0x066F, 1}, {0x0671, 0x06DC, 1}, {0x06DE, 0x06FF, 1}, {0x0750, 0x077F, 1}, + {0x08A0, 0x08B4, 1}, + {0x08B6, 0x08BD, 1}, + {0x08D4, 0x08E1, 1}, + {0x08E3, 0x08FF, 1}, {0xFB50, 0xFBC1, 1}, {0xFBD3, 0xFD3D, 1}, {0xFD50, 0xFD8F, 1}, {0xFD92, 0xFDC7, 1}, - {0xFDF0, 0xFDFC, 1}, + {0xFDF0, 0xFDFD, 1}, {0xFE70, 0xFE74, 1}, {0xFE76, 0xFEFC, 1}, - {0x10E60, 0x10E7E, 1} + {0x10E60, 0x10E7E, 1}, + {0x1EE00, 0x1EE03, 1}, + {0x1EE05, 0x1EE1F, 1}, + {0x1EE21, 0x1EE22, 1}, + {0x1EE24, 0x1EE27, 3}, + {0x1EE29, 0x1EE32, 1}, + {0x1EE34, 0x1EE37, 1}, + {0x1EE39, 0x1EE3B, 2}, + {0x1EE42, 0x1EE47, 5}, + {0x1EE49, 0x1EE4D, 2}, + {0x1EE4E, 0x1EE4F, 1}, + {0x1EE51, 0x1EE52, 1}, + {0x1EE54, 0x1EE57, 3}, + {0x1EE59, 0x1EE61, 2}, + {0x1EE62, 0x1EE64, 2}, + {0x1EE67, 0x1EE6A, 1}, + {0x1EE6C, 0x1EE72, 1}, + {0x1EE74, 0x1EE77, 1}, + {0x1EE79, 0x1EE7C, 1}, + {0x1EE7E, 0x1EE80, 2}, + {0x1EE81, 0x1EE89, 1}, + {0x1EE8B, 0x1EE9B, 1}, + {0x1EEA1, 0x1EEA3, 1}, + {0x1EEA5, 0x1EEA9, 1}, + {0x1EEAB, 0x1EEBB, 1}, + {0x1EEF0, 0x1EEF1, 1} }; } - private static int[][] make_Lisu() { - return new int[][] {{0xA4D0, 0xA4FF, 1}}; - } - private static int[][] make_Armenian() { return new int[][] { {0x0531, 0x0556, 1}, {0x0559, 0x055F, 1}, {0x0561, 0x0587, 1}, - {0x058A, 0xFB13, 62857}, - {0xFB14, 0xFB17, 1} + {0x058A, 0x058D, 3}, + {0x058E, 0x058F, 1}, + {0xFB13, 0xFB17, 1} }; } private static int[][] make_Bengali() { return new int[][] { - {0x0981, 0x0983, 1}, + {0x0980, 0x0983, 1}, {0x0985, 0x098C, 1}, {0x098F, 0x0990, 1}, {0x0993, 0x09A8, 1}, @@ -3219,34 +4005,31 @@ private static int[][] make_Bengali() { {0x09D7, 0x09DC, 5}, {0x09DD, 0x09DF, 2}, {0x09E0, 0x09E3, 1}, - {0x09E6, 0x09FB, 1} + {0x09E6, 0x09FD, 1} }; } - private static int[][] make_Old_South_Arabian() { - return new int[][] {{0x10A60, 0x10A7F, 1}}; - } - private static int[][] make_Bopomofo() { - return new int[][] {{0x02EA, 0x02EB, 1}, {0x3105, 0x312D, 1}, {0x31A0, 0x31BA, 1}}; + return new int[][] {{0x02EA, 0x02EB, 1}, {0x3105, 0x312E, 1}, {0x31A0, 0x31BA, 1}}; } private static int[][] make_Cherokee() { - return new int[][] {{0x13A0, 0x13F4, 1}}; + return new int[][] {{0x13A0, 0x13F5, 1}, {0x13F8, 0x13FD, 1}, {0xAB70, 0xABBF, 1}}; } private static int[][] make_Coptic() { - return new int[][] {{0x03E2, 0x03EF, 1}, {0x2C80, 0x2CF1, 1}, {0x2CF9, 0x2CFF, 1}}; + return new int[][] {{0x03E2, 0x03EF, 1}, {0x2C80, 0x2CF3, 1}, {0x2CF9, 0x2CFF, 1}}; } private static int[][] make_Cyrillic() { return new int[][] { {0x0400, 0x0484, 1}, - {0x0487, 0x0527, 1}, + {0x0487, 0x052F, 1}, + {0x1C80, 0x1C88, 1}, {0x1D2B, 0x1D78, 77}, {0x2DE0, 0x2DFF, 1}, - {0xA640, 0xA673, 1}, - {0xA67C, 0xA697, 1} + {0xA640, 0xA69F, 1}, + {0xFE2E, 0xFE2F, 1} }; } @@ -3256,12 +4039,7 @@ private static int[][] make_Deseret() { private static int[][] make_Devanagari() { return new int[][] { - {0x0900, 0x0950, 1}, - {0x0953, 0x0963, 1}, - {0x0966, 0x096F, 1}, - {0x0971, 0x0977, 1}, - {0x0979, 0x097F, 1}, - {0xA8E0, 0xA8FB, 1} + {0x0900, 0x0950, 1}, {0x0953, 0x0963, 1}, {0x0966, 0x097F, 1}, {0xA8E0, 0xA8FD, 1} }; } @@ -3304,7 +4082,12 @@ private static int[][] make_Ethiopic() { private static int[][] make_Georgian() { return new int[][] { - {0x10A0, 0x10C5, 1}, {0x10D0, 0x10FA, 1}, {0x10FC, 0x2D00, 7172}, {0x2D01, 0x2D25, 1} + {0x10A0, 0x10C5, 1}, + {0x10C7, 0x10CD, 6}, + {0x10D0, 0x10FA, 1}, + {0x10FC, 0x10FF, 1}, + {0x2D00, 0x2D25, 1}, + {0x2D27, 0x2D2D, 6} }; } @@ -3317,7 +4100,8 @@ private static int[][] make_Greek() { {0x0370, 0x0373, 1}, {0x0375, 0x0377, 1}, {0x037A, 0x037D, 1}, - {0x0384, 0x0388, 2}, + {0x037F, 0x0384, 5}, + {0x0386, 0x0388, 2}, {0x0389, 0x038A, 1}, {0x038C, 0x038E, 2}, {0x038F, 0x03A1, 1}, @@ -3341,9 +4125,10 @@ private static int[][] make_Greek() { {0x1FDD, 0x1FEF, 1}, {0x1FF2, 0x1FF4, 1}, {0x1FF6, 0x1FFE, 1}, - {0x2126, 0x10140, 57370}, - {0x10141, 0x1018A, 1}, - {0x1D200, 0x1D245, 1} + {0x2126, 0xAB65, 35391}, + {0x10140, 0x1018E, 1}, + {0x101A0, 0x1D200, 53344}, + {0x1D201, 0x1D245, 1} }; } @@ -3361,8 +4146,8 @@ private static int[][] make_Gujarati() { {0x0ACB, 0x0ACD, 1}, {0x0AD0, 0x0AE0, 16}, {0x0AE1, 0x0AE3, 1}, - {0x0AE6, 0x0AEF, 1}, - {0x0AF1, 0x0AF1, 1} + {0x0AE6, 0x0AF1, 1}, + {0x0AF9, 0x0AFF, 1} }; } @@ -3396,13 +4181,14 @@ private static int[][] make_Han() { {0x3021, 0x3029, 1}, {0x3038, 0x303B, 1}, {0x3400, 0x4DB5, 1}, - {0x4E00, 0x9FCB, 1}, - {0xF900, 0xFA2D, 1}, - {0xFA30, 0xFA6D, 1}, + {0x4E00, 0x9FEA, 1}, + {0xF900, 0xFA6D, 1}, {0xFA70, 0xFAD9, 1}, {0x20000, 0x2A6D6, 1}, {0x2A700, 0x2B734, 1}, {0x2B740, 0x2B81D, 1}, + {0x2B820, 0x2CEA1, 1}, + {0x2CEB0, 0x2EBE0, 1}, {0x2F800, 0x2FA1D, 1} }; } @@ -3441,12 +4227,14 @@ private static int[][] make_Hebrew() { } private static int[][] make_Hiragana() { - return new int[][] {{0x3041, 0x3096, 1}, {0x309D, 0x309F, 1}, {0x1B001, 0x1F200, 16895}}; + return new int[][] { + {0x3041, 0x3096, 1}, {0x309D, 0x309F, 1}, {0x1B001, 0x1B11E, 1}, {0x1F200, 0x1F200, 1} + }; } private static int[][] make_Kannada() { return new int[][] { - {0x0C82, 0x0C83, 1}, + {0x0C80, 0x0C83, 1}, {0x0C85, 0x0C8C, 1}, {0x0C8E, 0x0C90, 1}, {0x0C92, 0x0CA8, 1}, @@ -3499,7 +4287,7 @@ private static int[][] make_Lao() { {0x0EC6, 0x0EC8, 2}, {0x0EC9, 0x0ECD, 1}, {0x0ED0, 0x0ED9, 1}, - {0x0EDC, 0x0EDD, 1} + {0x0EDC, 0x0EDF, 1} }; } @@ -3525,10 +4313,11 @@ private static int[][] make_Latin() { {0x2160, 0x2188, 1}, {0x2C60, 0x2C7F, 1}, {0xA722, 0xA787, 1}, - {0xA78B, 0xA78E, 1}, - {0xA790, 0xA791, 1}, - {0xA7A0, 0xA7A9, 1}, - {0xA7FA, 0xA7FF, 1}, + {0xA78B, 0xA7AE, 1}, + {0xA7B0, 0xA7B7, 1}, + {0xA7F7, 0xA7FF, 1}, + {0xAB30, 0xAB5A, 1}, + {0xAB5C, 0xAB64, 1}, {0xFB00, 0xFB06, 1}, {0xFF21, 0xFF3A, 1}, {0xFF41, 0xFF5A, 1} @@ -3537,17 +4326,14 @@ private static int[][] make_Latin() { private static int[][] make_Malayalam() { return new int[][] { - {0x0D02, 0x0D03, 1}, + {0x0D00, 0x0D03, 1}, {0x0D05, 0x0D0C, 1}, {0x0D0E, 0x0D10, 1}, - {0x0D12, 0x0D3A, 1}, - {0x0D3D, 0x0D44, 1}, + {0x0D12, 0x0D44, 1}, {0x0D46, 0x0D48, 1}, - {0x0D4A, 0x0D4E, 1}, - {0x0D57, 0x0D60, 9}, - {0x0D61, 0x0D63, 1}, - {0x0D66, 0x0D75, 1}, - {0x0D79, 0x0D7F, 1} + {0x0D4A, 0x0D4F, 1}, + {0x0D54, 0x0D63, 1}, + {0x0D66, 0x0D7F, 1} }; } @@ -3558,12 +4344,13 @@ private static int[][] make_Mongolian() { {0x1807, 0x180E, 1}, {0x1810, 0x1819, 1}, {0x1820, 0x1877, 1}, - {0x1880, 0x18AA, 1} + {0x1880, 0x18AA, 1}, + {0x11660, 0x1166C, 1} }; } private static int[][] make_Myanmar() { - return new int[][] {{0x1000, 0x109F, 1}, {0xAA60, 0xAA7B, 1}}; + return new int[][] {{0x1000, 0x109F, 1}, {0xA9E0, 0xA9FE, 1}, {0xAA60, 0xAA7F, 1}}; } private static int[][] make_Ogham() { @@ -3571,7 +4358,7 @@ private static int[][] make_Ogham() { } private static int[][] make_Old_Italic() { - return new int[][] {{0x10300, 0x1031E, 1}, {0x10320, 0x10323, 1}}; + return new int[][] {{0x10300, 0x10323, 1}, {0x1032D, 0x1032F, 1}}; } private static int[][] make_Oriya() { @@ -3594,7 +4381,7 @@ private static int[][] make_Oriya() { } private static int[][] make_Runic() { - return new int[][] {{0x16A0, 0x16EA, 1}, {0x16EE, 0x16F0, 1}}; + return new int[][] {{0x16A0, 0x16EA, 1}, {0x16EE, 0x16F8, 1}}; } private static int[][] make_Sinhala() { @@ -3609,12 +4396,16 @@ private static int[][] make_Sinhala() { {0x0DD0, 0x0DD4, 1}, {0x0DD6, 0x0DD8, 2}, {0x0DD9, 0x0DDF, 1}, - {0x0DF2, 0x0DF4, 1} + {0x0DE6, 0x0DEF, 1}, + {0x0DF2, 0x0DF4, 1}, + {0x111E1, 0x111F4, 1} }; } private static int[][] make_Syriac() { - return new int[][] {{0x0700, 0x070D, 1}, {0x070F, 0x074A, 1}, {0x074D, 0x074F, 1}}; + return new int[][] { + {0x0700, 0x070D, 1}, {0x070F, 0x074A, 1}, {0x074D, 0x074F, 1}, {0x0860, 0x086A, 1} + }; } private static int[][] make_Tamil() { @@ -3639,17 +4430,16 @@ private static int[][] make_Tamil() { private static int[][] make_Telugu() { return new int[][] { - {0x0C01, 0x0C03, 1}, + {0x0C00, 0x0C03, 1}, {0x0C05, 0x0C0C, 1}, {0x0C0E, 0x0C10, 1}, {0x0C12, 0x0C28, 1}, - {0x0C2A, 0x0C33, 1}, - {0x0C35, 0x0C39, 1}, + {0x0C2A, 0x0C39, 1}, {0x0C3D, 0x0C44, 1}, {0x0C46, 0x0C48, 1}, {0x0C4A, 0x0C4D, 1}, {0x0C55, 0x0C56, 1}, - {0x0C58, 0x0C59, 1}, + {0x0C58, 0x0C5A, 1}, {0x0C60, 0x0C63, 1}, {0x0C66, 0x0C6F, 1}, {0x0C78, 0x0C7F, 1} @@ -3716,7 +4506,7 @@ private static int[][] make_Cypriot() { private static int[][] make_Limbu() { return new int[][] { - {0x1900, 0x191C, 1}, + {0x1900, 0x191E, 1}, {0x1920, 0x192B, 1}, {0x1930, 0x193B, 1}, {0x1940, 0x1944, 4}, @@ -3757,7 +4547,15 @@ private static int[][] make_Buginese() { } private static int[][] make_Glagolitic() { - return new int[][] {{0x2C00, 0x2C2E, 1}, {0x2C30, 0x2C5E, 1}}; + return new int[][] { + {0x2C00, 0x2C2E, 1}, + {0x2C30, 0x2C5E, 1}, + {0x1E000, 0x1E006, 1}, + {0x1E008, 0x1E018, 1}, + {0x1E01B, 0x1E021, 1}, + {0x1E023, 0x1E024, 1}, + {0x1E026, 0x1E02A, 1} + }; } private static int[][] make_Kharoshthi() { @@ -3784,7 +4582,7 @@ private static int[][] make_New_Tai_Lue() { } private static int[][] make_Tifinagh() { - return new int[][] {{0x2D30, 0x2D65, 1}, {0x2D6F, 0x2D70, 1}, {0x2D7F, 0x2D7F, 1}}; + return new int[][] {{0x2D30, 0x2D67, 1}, {0x2D6F, 0x2D70, 1}, {0x2D7F, 0x2D7F, 1}}; } private static int[][] make_Old_Persian() { @@ -3800,7 +4598,7 @@ private static int[][] make_Batak() { } private static int[][] make_Brahmi() { - return new int[][] {{0x11000, 0x1104D, 1}, {0x11052, 0x1106F, 1}}; + return new int[][] {{0x11000, 0x1104D, 1}, {0x11052, 0x1106F, 1}, {0x1107F, 0x1107F, 1}}; } private static int[][] make_Cham() { @@ -3813,22 +4611,44 @@ private static int[][] make_Egyptian_Hieroglyphs() { return new int[][] {{0x13000, 0x1342E, 1}}; } + private static int[][] make_Pahawh_Hmong() { + return new int[][] { + {0x16B00, 0x16B45, 1}, + {0x16B50, 0x16B59, 1}, + {0x16B5B, 0x16B61, 1}, + {0x16B63, 0x16B77, 1}, + {0x16B7D, 0x16B8F, 1} + }; + } + + private static int[][] make_Old_Hungarian() { + return new int[][] {{0x10C80, 0x10CB2, 1}, {0x10CC0, 0x10CF2, 1}, {0x10CFA, 0x10CFF, 1}}; + } + private static int[][] make_Javanese() { - return new int[][] {{0xA980, 0xA9CD, 1}, {0xA9CF, 0xA9D9, 1}, {0xA9DE, 0xA9DF, 1}}; + return new int[][] {{0xA980, 0xA9CD, 1}, {0xA9D0, 0xA9D9, 1}, {0xA9DE, 0xA9DF, 1}}; } private static int[][] make_Kayah_Li() { - return new int[][] {{0xA900, 0xA92F, 1}}; + return new int[][] {{0xA900, 0xA92D, 1}, {0xA92F, 0xA92F, 1}}; } private static int[][] make_Lepcha() { return new int[][] {{0x1C00, 0x1C37, 1}, {0x1C3B, 0x1C49, 1}, {0x1C4D, 0x1C4F, 1}}; } + private static int[][] make_Linear_A() { + return new int[][] {{0x10600, 0x10736, 1}, {0x10740, 0x10755, 1}, {0x10760, 0x10767, 1}}; + } + private static int[][] make_Mandaic() { return new int[][] {{0x0840, 0x085B, 1}, {0x085E, 0x085E, 1}}; } + private static int[][] make_Meroitic_Hieroglyphs() { + return new int[][] {{0x10980, 0x1099F, 1}}; + } + private static int[][] make_Nko() { return new int[][] {{0x07C0, 0x07FA, 1}}; } @@ -3837,6 +4657,10 @@ private static int[][] make_Old_Turkic() { return new int[][] {{0x10C00, 0x10C48, 1}}; } + private static int[][] make_Old_Permic() { + return new int[][] {{0x10350, 0x1037A, 1}}; + } + private static int[][] make_Phags_Pa() { return new int[][] {{0xA840, 0xA877, 1}}; } @@ -3845,12 +4669,18 @@ private static int[][] make_Phoenician() { return new int[][] {{0x10900, 0x1091B, 1}, {0x1091F, 0x1091F, 1}}; } + private static int[][] make_Miao() { + return new int[][] {{0x16F00, 0x16F44, 1}, {0x16F50, 0x16F7E, 1}, {0x16F8F, 0x16F9F, 1}}; + } + private static int[][] make_Vai() { return new int[][] {{0xA500, 0xA62B, 1}}; } private static int[][] make_Cuneiform() { - return new int[][] {{0x12000, 0x1236E, 1}, {0x12400, 0x12462, 1}, {0x12470, 0x12473, 1}}; + return new int[][] { + {0x12000, 0x12399, 1}, {0x12400, 0x1246E, 1}, {0x12470, 0x12474, 1}, {0x12480, 0x12543, 1} + }; } private static int[][] make_Unknown() { @@ -3888,15 +4718,19 @@ private static int[][] make_Rejang() { } private static int[][] make_Saurashtra() { - return new int[][] {{0xA880, 0xA8C4, 1}, {0xA8CE, 0xA8D9, 1}}; + return new int[][] {{0xA880, 0xA8C5, 1}, {0xA8CE, 0xA8D9, 1}}; + } + + private static int[][] make_SignWriting() { + return new int[][] {{0x1D800, 0x1DA8B, 1}, {0x1DA9B, 0x1DA9F, 1}, {0x1DAA1, 0x1DAAF, 1}}; } private static int[][] make_Sundanese() { - return new int[][] {{0x1B80, 0x1BAA, 1}, {0x1BAE, 0x1BB9, 1}}; + return new int[][] {{0x1B80, 0x1BBF, 1}, {0x1CC0, 0x1CC7, 1}}; } private static int[][] make_Meetei_Mayek() { - return new int[][] {{0xABC0, 0xABED, 1}, {0xABF0, 0xABF9, 1}}; + return new int[][] {{0xAAE0, 0xAAF6, 1}, {0xABC0, 0xABED, 1}, {0xABF0, 0xABF9, 1}}; } private static int[][] make_Imperial_Aramaic() { @@ -3907,14 +4741,26 @@ private static int[][] make_Avestan() { return new int[][] {{0x10B00, 0x10B35, 1}, {0x10B39, 0x10B3F, 1}}; } + private static int[][] make_Chakma() { + return new int[][] {{0x11100, 0x11134, 1}, {0x11136, 0x11143, 1}}; + } + private static int[][] make_Kaithi() { return new int[][] {{0x11080, 0x110C1, 1}}; } + private static int[][] make_Manichaean() { + return new int[][] {{0x10AC0, 0x10AE6, 1}, {0x10AEB, 0x10AF6, 1}}; + } + private static int[][] make_Inscriptional_Pahlavi() { return new int[][] {{0x10B60, 0x10B72, 1}, {0x10B78, 0x10B7F, 1}}; } + private static int[][] make_Psalter_Pahlavi() { + return new int[][] {{0x10B80, 0x10B91, 1}, {0x10B99, 0x10B9C, 1}, {0x10BA9, 0x10BAF, 1}}; + } + private static int[][] make_Inscriptional_Parthian() { return new int[][] {{0x10B40, 0x10B55, 1}, {0x10B58, 0x10B5F, 1}}; } @@ -3927,6 +4773,199 @@ private static int[][] make_Tai_Viet() { return new int[][] {{0xAA80, 0xAAC2, 1}, {0xAADB, 0xAADF, 1}}; } + private static int[][] make_Bamum() { + return new int[][] {{0xA6A0, 0xA6F7, 1}, {0x16800, 0x16A38, 1}}; + } + + private static int[][] make_Lisu() { + return new int[][] {{0xA4D0, 0xA4FF, 1}}; + } + + private static int[][] make_Old_South_Arabian() { + return new int[][] {{0x10A60, 0x10A7F, 1}}; + } + + private static int[][] make_Bassa_Vah() { + return new int[][] {{0x16AD0, 0x16AED, 1}, {0x16AF0, 0x16AF5, 1}}; + } + + private static int[][] make_Duployan() { + return new int[][] { + {0x1BC00, 0x1BC6A, 1}, + {0x1BC70, 0x1BC7C, 1}, + {0x1BC80, 0x1BC88, 1}, + {0x1BC90, 0x1BC99, 1}, + {0x1BC9C, 0x1BC9F, 1} + }; + } + + private static int[][] make_Elbasan() { + return new int[][] {{0x10500, 0x10527, 1}}; + } + + private static int[][] make_Grantha() { + return new int[][] { + {0x11300, 0x11303, 1}, + {0x11305, 0x1130C, 1}, + {0x1130F, 0x11310, 1}, + {0x11313, 0x11328, 1}, + {0x1132A, 0x11330, 1}, + {0x11332, 0x11333, 1}, + {0x11335, 0x11339, 1}, + {0x1133C, 0x11344, 1}, + {0x11347, 0x11348, 1}, + {0x1134B, 0x1134D, 1}, + {0x11350, 0x11357, 7}, + {0x1135D, 0x11363, 1}, + {0x11366, 0x1136C, 1}, + {0x11370, 0x11374, 1} + }; + } + + private static int[][] make_Mende_Kikakui() { + return new int[][] {{0x1E800, 0x1E8C4, 1}, {0x1E8C7, 0x1E8D6, 1}}; + } + + private static int[][] make_Meroitic_Cursive() { + return new int[][] {{0x109A0, 0x109B7, 1}, {0x109BC, 0x109CF, 1}, {0x109D2, 0x109FF, 1}}; + } + + private static int[][] make_Old_North_Arabian() { + return new int[][] {{0x10A80, 0x10A9F, 1}}; + } + + private static int[][] make_Nabataean() { + return new int[][] {{0x10880, 0x1089E, 1}, {0x108A7, 0x108AF, 1}}; + } + + private static int[][] make_Palmyrene() { + return new int[][] {{0x10860, 0x1087F, 1}}; + } + + private static int[][] make_Khudawadi() { + return new int[][] {{0x112B0, 0x112EA, 1}, {0x112F0, 0x112F9, 1}}; + } + + private static int[][] make_Warang_Citi() { + return new int[][] {{0x118A0, 0x118F2, 1}, {0x118FF, 0x118FF, 1}}; + } + + private static int[][] make_Mro() { + return new int[][] {{0x16A40, 0x16A5E, 1}, {0x16A60, 0x16A69, 1}, {0x16A6E, 0x16A6F, 1}}; + } + + private static int[][] make_Nushu() { + return new int[][] {{0x16FE1, 0x1B170, 16783}, {0x1B171, 0x1B2FB, 1}}; + } + + private static int[][] make_Sharada() { + return new int[][] {{0x11180, 0x111CD, 1}, {0x111D0, 0x111DF, 1}}; + } + + private static int[][] make_Sora_Sompeng() { + return new int[][] {{0x110D0, 0x110E8, 1}, {0x110F0, 0x110F9, 1}}; + } + + private static int[][] make_Takri() { + return new int[][] {{0x11680, 0x116B7, 1}, {0x116C0, 0x116C9, 1}}; + } + + private static int[][] make_Tangut() { + return new int[][] {{0x16FE0, 0x17000, 32}, {0x17001, 0x187EC, 1}, {0x18800, 0x18AF2, 1}}; + } + + private static int[][] make_Anatolian_Hieroglyphs() { + return new int[][] {{0x14400, 0x14646, 1}}; + } + + private static int[][] make_Khojki() { + return new int[][] {{0x11200, 0x11211, 1}, {0x11213, 0x1123E, 1}}; + } + + private static int[][] make_Tirhuta() { + return new int[][] {{0x11480, 0x114C7, 1}, {0x114D0, 0x114D9, 1}}; + } + + private static int[][] make_Caucasian_Albanian() { + return new int[][] {{0x10530, 0x10563, 1}, {0x1056F, 0x1056F, 1}}; + } + + private static int[][] make_Mahajani() { + return new int[][] {{0x11150, 0x11176, 1}}; + } + + private static int[][] make_Ahom() { + return new int[][] {{0x11700, 0x11719, 1}, {0x1171D, 0x1172B, 1}, {0x11730, 0x1173F, 1}}; + } + + private static int[][] make_Hatran() { + return new int[][] {{0x108E0, 0x108F2, 1}, {0x108F4, 0x108F5, 1}, {0x108FB, 0x108FF, 1}}; + } + + private static int[][] make_Modi() { + return new int[][] {{0x11600, 0x11644, 1}, {0x11650, 0x11659, 1}}; + } + + private static int[][] make_Multani() { + return new int[][] { + {0x11280, 0x11286, 1}, + {0x11288, 0x1128A, 2}, + {0x1128B, 0x1128D, 1}, + {0x1128F, 0x1129D, 1}, + {0x1129F, 0x112A9, 1} + }; + } + + private static int[][] make_Pau_Cin_Hau() { + return new int[][] {{0x11AC0, 0x11AF8, 1}}; + } + + private static int[][] make_Siddham() { + return new int[][] {{0x11580, 0x115B5, 1}, {0x115B8, 0x115DD, 1}}; + } + + private static int[][] make_Adlam() { + return new int[][] {{0x1E900, 0x1E94A, 1}, {0x1E950, 0x1E959, 1}, {0x1E95E, 0x1E95F, 1}}; + } + + private static int[][] make_Bhaiksuki() { + return new int[][] { + {0x11C00, 0x11C08, 1}, {0x11C0A, 0x11C36, 1}, {0x11C38, 0x11C45, 1}, {0x11C50, 0x11C6C, 1} + }; + } + + private static int[][] make_Marchen() { + return new int[][] {{0x11C70, 0x11C8F, 1}, {0x11C92, 0x11CA7, 1}, {0x11CA9, 0x11CB6, 1}}; + } + + private static int[][] make_Newa() { + return new int[][] {{0x11400, 0x11459, 1}, {0x1145B, 0x1145D, 2}}; + } + + private static int[][] make_Osage() { + return new int[][] {{0x104B0, 0x104D3, 1}, {0x104D8, 0x104FB, 1}}; + } + + private static int[][] make_Masaram_Gondi() { + return new int[][] { + {0x11D00, 0x11D06, 1}, + {0x11D08, 0x11D09, 1}, + {0x11D0B, 0x11D36, 1}, + {0x11D3A, 0x11D3C, 2}, + {0x11D3D, 0x11D3F, 2}, + {0x11D40, 0x11D47, 1}, + {0x11D50, 0x11D59, 1} + }; + } + + private static int[][] make_Soyombo() { + return new int[][] {{0x11A50, 0x11A83, 1}, {0x11A86, 0x11A9C, 1}, {0x11A9E, 0x11AA2, 1}}; + } + + private static int[][] make_Zanabazar_Square() { + return new int[][] {{0x11A00, 0x11A47, 1}}; + } + private static Map Categories() { Map map = new HashMap(); map.put("Lu", Lu); @@ -3972,12 +5011,9 @@ private static Map Scripts() { Map map = new HashMap(); map.put("Common", Common); map.put("Inherited", Inherited); - map.put("Bamum", Bamum); map.put("Arabic", Arabic); - map.put("Lisu", Lisu); map.put("Armenian", Armenian); map.put("Bengali", Bengali); - map.put("Old_South_Arabian", Old_South_Arabian); map.put("Bopomofo", Bopomofo); map.put("Cherokee", Cherokee); map.put("Coptic", Coptic); @@ -4039,14 +5075,20 @@ private static Map Scripts() { map.put("Brahmi", Brahmi); map.put("Cham", Cham); map.put("Egyptian_Hieroglyphs", Egyptian_Hieroglyphs); + map.put("Pahawh_Hmong", Pahawh_Hmong); + map.put("Old_Hungarian", Old_Hungarian); map.put("Javanese", Javanese); map.put("Kayah_Li", Kayah_Li); map.put("Lepcha", Lepcha); + map.put("Linear_A", Linear_A); map.put("Mandaic", Mandaic); + map.put("Meroitic_Hieroglyphs", Meroitic_Hieroglyphs); map.put("Nko", Nko); map.put("Old_Turkic", Old_Turkic); + map.put("Old_Permic", Old_Permic); map.put("Phags_Pa", Phags_Pa); map.put("Phoenician", Phoenician); + map.put("Miao", Miao); map.put("Vai", Vai); map.put("Cuneiform", Cuneiform); map.put("Unknown", Unknown); @@ -4057,15 +5099,58 @@ private static Map Scripts() { map.put("Ol_Chiki", Ol_Chiki); map.put("Rejang", Rejang); map.put("Saurashtra", Saurashtra); + map.put("SignWriting", SignWriting); map.put("Sundanese", Sundanese); map.put("Meetei_Mayek", Meetei_Mayek); map.put("Imperial_Aramaic", Imperial_Aramaic); map.put("Avestan", Avestan); + map.put("Chakma", Chakma); map.put("Kaithi", Kaithi); + map.put("Manichaean", Manichaean); map.put("Inscriptional_Pahlavi", Inscriptional_Pahlavi); + map.put("Psalter_Pahlavi", Psalter_Pahlavi); map.put("Inscriptional_Parthian", Inscriptional_Parthian); map.put("Samaritan", Samaritan); map.put("Tai_Viet", Tai_Viet); + map.put("Bamum", Bamum); + map.put("Lisu", Lisu); + map.put("Old_South_Arabian", Old_South_Arabian); + map.put("Bassa_Vah", Bassa_Vah); + map.put("Duployan", Duployan); + map.put("Elbasan", Elbasan); + map.put("Grantha", Grantha); + map.put("Mende_Kikakui", Mende_Kikakui); + map.put("Meroitic_Cursive", Meroitic_Cursive); + map.put("Old_North_Arabian", Old_North_Arabian); + map.put("Nabataean", Nabataean); + map.put("Palmyrene", Palmyrene); + map.put("Khudawadi", Khudawadi); + map.put("Warang_Citi", Warang_Citi); + map.put("Mro", Mro); + map.put("Nushu", Nushu); + map.put("Sharada", Sharada); + map.put("Sora_Sompeng", Sora_Sompeng); + map.put("Takri", Takri); + map.put("Tangut", Tangut); + map.put("Anatolian_Hieroglyphs", Anatolian_Hieroglyphs); + map.put("Khojki", Khojki); + map.put("Tirhuta", Tirhuta); + map.put("Caucasian_Albanian", Caucasian_Albanian); + map.put("Mahajani", Mahajani); + map.put("Ahom", Ahom); + map.put("Hatran", Hatran); + map.put("Modi", Modi); + map.put("Multani", Multani); + map.put("Pau_Cin_Hau", Pau_Cin_Hau); + map.put("Siddham", Siddham); + map.put("Adlam", Adlam); + map.put("Bhaiksuki", Bhaiksuki); + map.put("Marchen", Marchen); + map.put("Newa", Newa); + map.put("Osage", Osage); + map.put("Masaram_Gondi", Masaram_Gondi); + map.put("Soyombo", Soyombo); + map.put("Zanabazar_Square", Zanabazar_Square); return Collections.unmodifiableMap(map); } @@ -4126,14 +5211,16 @@ private static int[][] make_foldLu() { {0x0250, 0x0254, 1}, {0x0256, 0x0257, 1}, {0x0259, 0x025B, 2}, - {0x0260, 0x0263, 3}, - {0x0265, 0x0268, 3}, - {0x0269, 0x026B, 2}, + {0x025C, 0x0260, 4}, + {0x0261, 0x0265, 2}, + {0x0266, 0x0268, 2}, + {0x0269, 0x026C, 1}, {0x026F, 0x0271, 2}, {0x0272, 0x0275, 3}, {0x027D, 0x0283, 3}, - {0x0288, 0x028C, 1}, - {0x0292, 0x0345, 179}, + {0x0287, 0x028C, 1}, + {0x0292, 0x029D, 11}, + {0x029E, 0x0345, 167}, {0x0371, 0x0373, 2}, {0x0377, 0x037B, 4}, {0x037C, 0x037D, 1}, @@ -4142,14 +5229,16 @@ private static int[][] make_foldLu() { {0x03D0, 0x03D1, 1}, {0x03D5, 0x03D7, 1}, {0x03D9, 0x03EF, 2}, - {0x03F0, 0x03F2, 1}, + {0x03F0, 0x03F3, 1}, {0x03F5, 0x03FB, 3}, {0x0430, 0x045F, 1}, {0x0461, 0x0481, 2}, {0x048B, 0x04BF, 2}, {0x04C2, 0x04CE, 2}, - {0x04CF, 0x0527, 2}, + {0x04CF, 0x052F, 2}, {0x0561, 0x0586, 1}, + {0x13F8, 0x13FD, 1}, + {0x1C80, 0x1C88, 1}, {0x1D79, 0x1D7D, 4}, {0x1E01, 0x1E95, 2}, {0x1E9B, 0x1EA1, 6}, @@ -4173,17 +5262,27 @@ private static int[][] make_foldLu() { {0x2C73, 0x2C76, 3}, {0x2C81, 0x2CE3, 2}, {0x2CEC, 0x2CEE, 2}, - {0x2D00, 0x2D25, 1}, + {0x2CF3, 0x2D00, 13}, + {0x2D01, 0x2D25, 1}, + {0x2D27, 0x2D2D, 6}, {0xA641, 0xA66D, 2}, - {0xA681, 0xA697, 2}, + {0xA681, 0xA69B, 2}, {0xA723, 0xA72F, 2}, {0xA733, 0xA76F, 2}, {0xA77A, 0xA77C, 2}, {0xA77F, 0xA787, 2}, {0xA78C, 0xA791, 5}, - {0xA7A1, 0xA7A9, 2}, + {0xA793, 0xA797, 4}, + {0xA799, 0xA7A9, 2}, + {0xA7B5, 0xA7B7, 2}, + {0xAB53, 0xAB70, 29}, + {0xAB71, 0xABBF, 1}, {0xFF41, 0xFF5A, 1}, - {0x10428, 0x1044F, 1} + {0x10428, 0x1044F, 1}, + {0x104D8, 0x104FB, 1}, + {0x10CC0, 0x10CF2, 1}, + {0x118C0, 0x118DF, 1}, + {0x1E922, 0x1E943, 1} }; } @@ -4200,9 +5299,13 @@ private static int[][] make_foldLl() { {0x039C, 0x03A0, 4}, {0x03A1, 0x03A3, 2}, {0x03A6, 0x03A9, 3}, - {0x03F4, 0x1E60, 6764}, - {0x1E9E, 0x2126, 648}, - {0x212A, 0x212B, 1} + {0x03F4, 0x0412, 30}, + {0x0414, 0x041E, 10}, + {0x0421, 0x0422, 1}, + {0x042A, 0x0462, 56}, + {0x1E60, 0x1E9E, 62}, + {0x2126, 0x212A, 4}, + {0x212B, 0xA64A, 34079} }; } diff --git a/javatests/com/google/re2j/ParserTest.java b/javatests/com/google/re2j/ParserTest.java index 87cd152a..e567899a 100644 --- a/javatests/com/google/re2j/ParserTest.java +++ b/javatests/com/google/re2j/ParserTest.java @@ -172,12 +172,12 @@ public boolean applies(int r) { {"\\P{Braille}", "cc{0x0-0x27ff 0x2900-0x10ffff}"}, {"\\p{^Braille}", "cc{0x0-0x27ff 0x2900-0x10ffff}"}, {"\\P{^Braille}", "cc{0x2800-0x28ff}"}, - {"\\pZ", "cc{0x20 0xa0 0x1680 0x180e 0x2000-0x200a 0x2028-0x2029 0x202f 0x205f 0x3000}"}, + {"\\pZ", "cc{0x20 0xa0 0x1680 0x2000-0x200a 0x2028-0x2029 0x202f 0x205f 0x3000}"}, {"[\\p{Braille}]", "cc{0x2800-0x28ff}"}, {"[\\P{Braille}]", "cc{0x0-0x27ff 0x2900-0x10ffff}"}, {"[\\p{^Braille}]", "cc{0x0-0x27ff 0x2900-0x10ffff}"}, {"[\\P{^Braille}]", "cc{0x2800-0x28ff}"}, - {"[\\pZ]", "cc{0x20 0xa0 0x1680 0x180e 0x2000-0x200a 0x2028-0x2029 0x202f 0x205f 0x3000}"}, + {"[\\pZ]", "cc{0x20 0xa0 0x1680 0x2000-0x200a 0x2028-0x2029 0x202f 0x205f 0x3000}"}, {"\\p{Lu}", mkCharClass(IS_UPPER)}, {"[\\p{Lu}]", mkCharClass(IS_UPPER)}, {"(?i)[\\p{Lu}]", mkCharClass(IS_UPPER_FOLD)}, diff --git a/unicode/build.gradle b/unicode/build.gradle index 20297104..c2b615d9 100644 --- a/unicode/build.gradle +++ b/unicode/build.gradle @@ -12,6 +12,6 @@ repositories { dependencies { compile 'com.google.googlejavaformat:google-java-format:1.0' compile 'com.squareup:javapoet:1.12.1' - compile 'com.ibm.icu:icu4j:4.8.2' + compile 'com.ibm.icu:icu4j:60.1' compile 'com.google.guava:guava:29.0-jre' }