diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
index 380024aec4..2049876e21 100644
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -607,7 +607,7 @@ TOKEN :
   < IDENTIFIER: <LETTER> (<PART_LETTER>)* >
 |
   < #LETTER:
-      [  // all chars for which Character.isIdentifierStart is true
+      [  // all chars for which Character.isJavaIdentifierStart is true
          "$",
          "A"-"Z",
          "_",
@@ -618,55 +618,67 @@ TOKEN :
          "\u00ba",
          "\u00c0"-"\u00d6",
          "\u00d8"-"\u00f6",
-         "\u00f8"-"\u021f",
-         "\u0222"-"\u0233",
-         "\u0250"-"\u02ad",
-         "\u02b0"-"\u02b8",
-         "\u02bb"-"\u02c1",
-         "\u02d0"-"\u02d1",
+         "\u00f8"-"\u02c1",
+         "\u02c6"-"\u02d1",
          "\u02e0"-"\u02e4",
+         "\u02ec",
          "\u02ee",
-         "\u037a",
+         "\u0370"-"\u0374",
+         "\u0376"-"\u0377",
+         "\u037a"-"\u037d",
+         "\u037f",
          "\u0386",
          "\u0388"-"\u038a",
          "\u038c",
          "\u038e"-"\u03a1",
-         "\u03a3"-"\u03ce",
-         "\u03d0"-"\u03d7",
-         "\u03da"-"\u03f3",
-         "\u0400"-"\u0481",
-         "\u048c"-"\u04c4",
-         "\u04c7"-"\u04c8",
-         "\u04cb"-"\u04cc",
-         "\u04d0"-"\u04f5",
-         "\u04f8"-"\u04f9",
+         "\u03a3"-"\u03f5",
+         "\u03f7"-"\u0481",
+         "\u048a"-"\u052f",
          "\u0531"-"\u0556",
          "\u0559",
          "\u0561"-"\u0587",
+         "\u058f",
          "\u05d0"-"\u05ea",
          "\u05f0"-"\u05f2",
-         "\u0621"-"\u063a",
-         "\u0640"-"\u064a",
+         "\u060b",
+         "\u0620"-"\u064a",
+         "\u066e"-"\u066f",
          "\u0671"-"\u06d3",
          "\u06d5",
          "\u06e5"-"\u06e6",
+         "\u06ee"-"\u06ef",
          "\u06fa"-"\u06fc",
+         "\u06ff",
          "\u0710",
-         "\u0712"-"\u072c",
-         "\u0780"-"\u07a5",
-         "\u0905"-"\u0939",
+         "\u0712"-"\u072f",
+         "\u074d"-"\u07a5",
+         "\u07b1",
+         "\u07ca"-"\u07ea",
+         "\u07f4"-"\u07f5",
+         "\u07fa",
+         "\u0800"-"\u0815",
+         "\u081a",
+         "\u0824",
+         "\u0828",
+         "\u0840"-"\u0858",
+         "\u08a0"-"\u08b4",
+         "\u0904"-"\u0939",
          "\u093d",
          "\u0950",
          "\u0958"-"\u0961",
+         "\u0971"-"\u0980",
          "\u0985"-"\u098c",
          "\u098f"-"\u0990",
          "\u0993"-"\u09a8",
          "\u09aa"-"\u09b0",
          "\u09b2",
          "\u09b6"-"\u09b9",
+         "\u09bd",
+         "\u09ce",
          "\u09dc"-"\u09dd",
          "\u09df"-"\u09e1",
          "\u09f0"-"\u09f3",
+         "\u09fb",
          "\u0a05"-"\u0a0a",
          "\u0a0f"-"\u0a10",
          "\u0a13"-"\u0a28",
@@ -677,8 +689,7 @@ TOKEN :
          "\u0a59"-"\u0a5c",
          "\u0a5e",
          "\u0a72"-"\u0a74",
-         "\u0a85"-"\u0a8b",
-         "\u0a8d",
+         "\u0a85"-"\u0a8d",
          "\u0a8f"-"\u0a91",
          "\u0a93"-"\u0aa8",
          "\u0aaa"-"\u0ab0",
@@ -686,16 +697,20 @@ TOKEN :
          "\u0ab5"-"\u0ab9",
          "\u0abd",
          "\u0ad0",
-         "\u0ae0",
+         "\u0ae0"-"\u0ae1",
+         "\u0af1",
+         "\u0af9",
          "\u0b05"-"\u0b0c",
          "\u0b0f"-"\u0b10",
          "\u0b13"-"\u0b28",
          "\u0b2a"-"\u0b30",
          "\u0b32"-"\u0b33",
-         "\u0b36"-"\u0b39",
+         "\u0b35"-"\u0b39",
          "\u0b3d",
          "\u0b5c"-"\u0b5d",
          "\u0b5f"-"\u0b61",
+         "\u0b71",
+         "\u0b83",
          "\u0b85"-"\u0b8a",
          "\u0b8e"-"\u0b90",
          "\u0b92"-"\u0b95",
@@ -704,26 +719,32 @@ TOKEN :
          "\u0b9e"-"\u0b9f",
          "\u0ba3"-"\u0ba4",
          "\u0ba8"-"\u0baa",
-         "\u0bae"-"\u0bb5",
-         "\u0bb7"-"\u0bb9",
+         "\u0bae"-"\u0bb9",
+         "\u0bd0",
+         "\u0bf9",
          "\u0c05"-"\u0c0c",
          "\u0c0e"-"\u0c10",
          "\u0c12"-"\u0c28",
-         "\u0c2a"-"\u0c33",
-         "\u0c35"-"\u0c39",
+         "\u0c2a"-"\u0c39",
+         "\u0c3d",
+         "\u0c58"-"\u0c5a",
          "\u0c60"-"\u0c61",
          "\u0c85"-"\u0c8c",
          "\u0c8e"-"\u0c90",
          "\u0c92"-"\u0ca8",
          "\u0caa"-"\u0cb3",
          "\u0cb5"-"\u0cb9",
+         "\u0cbd",
          "\u0cde",
          "\u0ce0"-"\u0ce1",
+         "\u0cf1"-"\u0cf2",
          "\u0d05"-"\u0d0c",
          "\u0d0e"-"\u0d10",
-         "\u0d12"-"\u0d28",
-         "\u0d2a"-"\u0d39",
-         "\u0d60"-"\u0d61",
+         "\u0d12"-"\u0d3a",
+         "\u0d3d",
+         "\u0d4e",
+         "\u0d5f"-"\u0d61",
+         "\u0d7a"-"\u0d7f",
          "\u0d85"-"\u0d96",
          "\u0d9a"-"\u0db1",
          "\u0db3"-"\u0dbb",
@@ -748,57 +769,82 @@ TOKEN :
          "\u0ebd",
          "\u0ec0"-"\u0ec4",
          "\u0ec6",
-         "\u0edc"-"\u0edd",
+         "\u0edc"-"\u0edf",
          "\u0f00",
          "\u0f40"-"\u0f47",
-         "\u0f49"-"\u0f6a",
-         "\u0f88"-"\u0f8b",
-         "\u1000"-"\u1021",
-         "\u1023"-"\u1027",
-         "\u1029"-"\u102a",
+         "\u0f49"-"\u0f6c",
+         "\u0f88"-"\u0f8c",
+         "\u1000"-"\u102a",
+         "\u103f",
          "\u1050"-"\u1055",
+         "\u105a"-"\u105d",
+         "\u1061",
+         "\u1065"-"\u1066",
+         "\u106e"-"\u1070",
+         "\u1075"-"\u1081",
+         "\u108e",
          "\u10a0"-"\u10c5",
-         "\u10d0"-"\u10f6",
-         "\u1100"-"\u1159",
-         "\u115f"-"\u11a2",
-         "\u11a8"-"\u11f9",
-         "\u1200"-"\u1206",
-         "\u1208"-"\u1246",
-         "\u1248",
+         "\u10c7",
+         "\u10cd",
+         "\u10d0"-"\u10fa",
+         "\u10fc"-"\u1248",
          "\u124a"-"\u124d",
          "\u1250"-"\u1256",
          "\u1258",
          "\u125a"-"\u125d",
-         "\u1260"-"\u1286",
-         "\u1288",
+         "\u1260"-"\u1288",
          "\u128a"-"\u128d",
-         "\u1290"-"\u12ae",
-         "\u12b0",
+         "\u1290"-"\u12b0",
          "\u12b2"-"\u12b5",
          "\u12b8"-"\u12be",
          "\u12c0",
          "\u12c2"-"\u12c5",
-         "\u12c8"-"\u12ce",
-         "\u12d0"-"\u12d6",
-         "\u12d8"-"\u12ee",
-         "\u12f0"-"\u130e",
-         "\u1310",
+         "\u12c8"-"\u12d6",
+         "\u12d8"-"\u1310",
          "\u1312"-"\u1315",
-         "\u1318"-"\u131e",
-         "\u1320"-"\u1346",
-         "\u1348"-"\u135a",
-         "\u13a0"-"\u13f4",
+         "\u1318"-"\u135a",
+         "\u1380"-"\u138f",
+         "\u13a0"-"\u13f5",
+         "\u13f8"-"\u13fd",
          "\u1401"-"\u166c",
-         "\u166f"-"\u1676",
+         "\u166f"-"\u167f",
          "\u1681"-"\u169a",
          "\u16a0"-"\u16ea",
+         "\u16ee"-"\u16f8",
+         "\u1700"-"\u170c",
+         "\u170e"-"\u1711",
+         "\u1720"-"\u1731",
+         "\u1740"-"\u1751",
+         "\u1760"-"\u176c",
+         "\u176e"-"\u1770",
          "\u1780"-"\u17b3",
-         "\u17db",
+         "\u17d7",
+         "\u17db"-"\u17dc",
          "\u1820"-"\u1877",
          "\u1880"-"\u18a8",
-         "\u1e00"-"\u1e9b",
-         "\u1ea0"-"\u1ef9",
-         "\u1f00"-"\u1f15",
+         "\u18aa",
+         "\u18b0"-"\u18f5",
+         "\u1900"-"\u191e",
+         "\u1950"-"\u196d",
+         "\u1970"-"\u1974",
+         "\u1980"-"\u19ab",
+         "\u19b0"-"\u19c9",
+         "\u1a00"-"\u1a16",
+         "\u1a20"-"\u1a54",
+         "\u1aa7",
+         "\u1b05"-"\u1b33",
+         "\u1b45"-"\u1b4b",
+         "\u1b83"-"\u1ba0",
+         "\u1bae"-"\u1baf",
+         "\u1bba"-"\u1be5",
+         "\u1c00"-"\u1c23",
+         "\u1c4d"-"\u1c4f",
+         "\u1c5a"-"\u1c7d",
+         "\u1ce9"-"\u1cec",
+         "\u1cee"-"\u1cf1",
+         "\u1cf5"-"\u1cf6",
+         "\u1d00"-"\u1dbf",
+         "\u1e00"-"\u1f15",
          "\u1f18"-"\u1f1d",
          "\u1f20"-"\u1f45",
          "\u1f48"-"\u1f4d",
@@ -818,8 +864,11 @@ TOKEN :
          "\u1ff2"-"\u1ff4",
          "\u1ff6"-"\u1ffc",
          "\u203f"-"\u2040",
+         "\u2054",
+         "\u2071",
          "\u207f",
-         "\u20a0"-"\u20af",
+         "\u2090"-"\u209c",
+         "\u20a0"-"\u20be",
          "\u2102",
          "\u2107",
          "\u210a"-"\u2113",
@@ -829,24 +878,102 @@ TOKEN :
          "\u2126",
          "\u2128",
          "\u212a"-"\u212d",
-         "\u212f"-"\u2131",
-         "\u2133"-"\u2139",
-         "\u2160"-"\u2183",
+         "\u212f"-"\u2139",
+         "\u213c"-"\u213f",
+         "\u2145"-"\u2149",
+         "\u214e",
+         "\u2160"-"\u2188",
+         "\u2c00"-"\u2c2e",
+         "\u2c30"-"\u2c5e",
+         "\u2c60"-"\u2ce4",
+         "\u2ceb"-"\u2cee",
+         "\u2cf2"-"\u2cf3",
+         "\u2d00"-"\u2d25",
+         "\u2d27",
+         "\u2d2d",
+         "\u2d30"-"\u2d67",
+         "\u2d6f",
+         "\u2d80"-"\u2d96",
+         "\u2da0"-"\u2da6",
+         "\u2da8"-"\u2dae",
+         "\u2db0"-"\u2db6",
+         "\u2db8"-"\u2dbe",
+         "\u2dc0"-"\u2dc6",
+         "\u2dc8"-"\u2dce",
+         "\u2dd0"-"\u2dd6",
+         "\u2dd8"-"\u2dde",
+         "\u2e2f",
          "\u3005"-"\u3007",
          "\u3021"-"\u3029",
          "\u3031"-"\u3035",
-         "\u3038"-"\u303a",
-         "\u3041"-"\u3094",
-         "\u309d"-"\u309e",
-         "\u30a1"-"\u30fe",
-         "\u3105"-"\u312c",
+         "\u3038"-"\u303c",
+         "\u3041"-"\u3096",
+         "\u309d"-"\u309f",
+         "\u30a1"-"\u30fa",
+         "\u30fc"-"\u30ff",
+         "\u3105"-"\u312d",
          "\u3131"-"\u318e",
-         "\u31a0"-"\u31b7",
+         "\u31a0"-"\u31ba",
+         "\u31f0"-"\u31ff",
          "\u3400"-"\u4db5",
-         "\u4e00"-"\u9fa5",
+         "\u4e00"-"\u9fd5",
          "\ua000"-"\ua48c",
+         "\ua4d0"-"\ua4fd",
+         "\ua500"-"\ua60c",
+         "\ua610"-"\ua61f",
+         "\ua62a"-"\ua62b",
+         "\ua640"-"\ua66e",
+         "\ua67f"-"\ua69d",
+         "\ua6a0"-"\ua6ef",
+         "\ua717"-"\ua71f",
+         "\ua722"-"\ua788",
+         "\ua78b"-"\ua7ad",
+         "\ua7b0"-"\ua7b7",
+         "\ua7f7"-"\ua801",
+         "\ua803"-"\ua805",
+         "\ua807"-"\ua80a",
+         "\ua80c"-"\ua822",
+         "\ua838",
+         "\ua840"-"\ua873",
+         "\ua882"-"\ua8b3",
+         "\ua8f2"-"\ua8f7",
+         "\ua8fb",
+         "\ua8fd",
+         "\ua90a"-"\ua925",
+         "\ua930"-"\ua946",
+         "\ua960"-"\ua97c",
+         "\ua984"-"\ua9b2",
+         "\ua9cf",
+         "\ua9e0"-"\ua9e4",
+         "\ua9e6"-"\ua9ef",
+         "\ua9fa"-"\ua9fe",
+         "\uaa00"-"\uaa28",
+         "\uaa40"-"\uaa42",
+         "\uaa44"-"\uaa4b",
+         "\uaa60"-"\uaa76",
+         "\uaa7a",
+         "\uaa7e"-"\uaaaf",
+         "\uaab1",
+         "\uaab5"-"\uaab6",
+         "\uaab9"-"\uaabd",
+         "\uaac0",
+         "\uaac2",
+         "\uaadb"-"\uaadd",
+         "\uaae0"-"\uaaea",
+         "\uaaf2"-"\uaaf4",
+         "\uab01"-"\uab06",
+         "\uab09"-"\uab0e",
+         "\uab11"-"\uab16",
+         "\uab20"-"\uab26",
+         "\uab28"-"\uab2e",
+         "\uab30"-"\uab5a",
+         "\uab5c"-"\uab65",
+         "\uab70"-"\uabe2",
          "\uac00"-"\ud7a3",
-         "\uf900"-"\ufa2d",
+         "\ud7b0"-"\ud7c6",
+         "\ud7cb"-"\ud7fb",
+         "\uf900"-"\ufa6d",
+         "\ufa70"-"\ufad9",
          "\ufb00"-"\ufb06",
          "\ufb13"-"\ufb17",
          "\ufb1d",
@@ -860,18 +987,17 @@ TOKEN :
          "\ufbd3"-"\ufd3d",
          "\ufd50"-"\ufd8f",
          "\ufd92"-"\ufdc7",
-         "\ufdf0"-"\ufdfb",
+         "\ufdf0"-"\ufdfc",
          "\ufe33"-"\ufe34",
          "\ufe4d"-"\ufe4f",
          "\ufe69",
-         "\ufe70"-"\ufe72",
-         "\ufe74",
+         "\ufe70"-"\ufe74",
          "\ufe76"-"\ufefc",
          "\uff04",
          "\uff21"-"\uff3a",
          "\uff3f",
          "\uff41"-"\uff5a",
-         "\uff65"-"\uffbe",
+         "\uff66"-"\uffbe",
          "\uffc2"-"\uffc7",
          "\uffca"-"\uffcf",
          "\uffd2"-"\uffd7",
@@ -882,7 +1008,7 @@ TOKEN :
   >
 |
   < #PART_LETTER:
-      [  // all chars for which Character.isIdentifierPart is true
+      [  // all chars for which Character.isJavaIdentifierPart is true
          "\u0000"-"\u0008",
          "\u000e"-"\u001b",
          "$",
@@ -893,79 +1019,74 @@ TOKEN :
          "\u007f"-"\u009f",
          "\u00a2"-"\u00a5",
          "\u00aa",
+         "\u00ad",
          "\u00b5",
          "\u00ba",
          "\u00c0"-"\u00d6",
          "\u00d8"-"\u00f6",
-         "\u00f8"-"\u021f",
-         "\u0222"-"\u0233",
-         "\u0250"-"\u02ad",
-         "\u02b0"-"\u02b8",
-         "\u02bb"-"\u02c1",
-         "\u02d0"-"\u02d1",
+         "\u00f8"-"\u02c1",
+         "\u02c6"-"\u02d1",
          "\u02e0"-"\u02e4",
+         "\u02ec",
          "\u02ee",
-         "\u0300"-"\u034e",
-         "\u0360"-"\u0362",
-         "\u037a",
+         "\u0300"-"\u0374",
+         "\u0376"-"\u0377",
+         "\u037a"-"\u037d",
+         "\u037f",
          "\u0386",
          "\u0388"-"\u038a",
          "\u038c",
          "\u038e"-"\u03a1",
-         "\u03a3"-"\u03ce",
-         "\u03d0"-"\u03d7",
-         "\u03da"-"\u03f3",
-         "\u0400"-"\u0481",
-         "\u0483"-"\u0486",
-         "\u048c"-"\u04c4",
-         "\u04c7"-"\u04c8",
-         "\u04cb"-"\u04cc",
-         "\u04d0"-"\u04f5",
-         "\u04f8"-"\u04f9",
+         "\u03a3"-"\u03f5",
+         "\u03f7"-"\u0481",
+         "\u0483"-"\u0487",
+         "\u048a"-"\u052f",
          "\u0531"-"\u0556",
          "\u0559",
          "\u0561"-"\u0587",
-         "\u0591"-"\u05a1",
-         "\u05a3"-"\u05b9",
-         "\u05bb"-"\u05bd",
+         "\u058f",
+         "\u0591"-"\u05bd",
          "\u05bf",
          "\u05c1"-"\u05c2",
-         "\u05c4",
+         "\u05c4"-"\u05c5",
+         "\u05c7",
          "\u05d0"-"\u05ea",
          "\u05f0"-"\u05f2",
-         "\u0621"-"\u063a",
-         "\u0640"-"\u0655",
-         "\u0660"-"\u0669",
-         "\u0670"-"\u06d3",
-         "\u06d5"-"\u06dc",
+         "\u0600"-"\u0605",
+         "\u060b",
+         "\u0610"-"\u061a",
+         "\u061c",
+         "\u0620"-"\u0669",
+         "\u066e"-"\u06d3",
+         "\u06d5"-"\u06dd",
          "\u06df"-"\u06e8",
-         "\u06ea"-"\u06ed",
-         "\u06f0"-"\u06fc",
-         "\u070f"-"\u072c",
-         "\u0730"-"\u074a",
-         "\u0780"-"\u07b0",
-         "\u0901"-"\u0903",
-         "\u0905"-"\u0939",
-         "\u093c"-"\u094d",
-         "\u0950"-"\u0954",
-         "\u0958"-"\u0963",
+         "\u06ea"-"\u06fc",
+         "\u06ff",
+         "\u070f"-"\u074a",
+         "\u074d"-"\u07b1",
+         "\u07c0"-"\u07f5",
+         "\u07fa",
+         "\u0800"-"\u082d",
+         "\u0840"-"\u085b",
+         "\u08a0"-"\u08b4",
+         "\u08e3"-"\u0963",
          "\u0966"-"\u096f",
-         "\u0981"-"\u0983",
+         "\u0971"-"\u0983",
          "\u0985"-"\u098c",
          "\u098f"-"\u0990",
          "\u0993"-"\u09a8",
          "\u09aa"-"\u09b0",
          "\u09b2",
          "\u09b6"-"\u09b9",
-         "\u09bc",
-         "\u09be"-"\u09c4",
+         "\u09bc"-"\u09c4",
          "\u09c7"-"\u09c8",
-         "\u09cb"-"\u09cd",
+         "\u09cb"-"\u09ce",
          "\u09d7",
          "\u09dc"-"\u09dd",
          "\u09df"-"\u09e3",
          "\u09e6"-"\u09f3",
-         "\u0a02",
+         "\u09fb",
+         "\u0a01"-"\u0a03",
          "\u0a05"-"\u0a0a",
          "\u0a0f"-"\u0a10",
          "\u0a13"-"\u0a28",
@@ -977,12 +1098,12 @@ TOKEN :
          "\u0a3e"-"\u0a42",
          "\u0a47"-"\u0a48",
          "\u0a4b"-"\u0a4d",
+         "\u0a51",
          "\u0a59"-"\u0a5c",
          "\u0a5e",
-         "\u0a66"-"\u0a74",
+         "\u0a66"-"\u0a75",
          "\u0a81"-"\u0a83",
-         "\u0a85"-"\u0a8b",
-         "\u0a8d",
+         "\u0a85"-"\u0a8d",
          "\u0a8f"-"\u0a91",
          "\u0a93"-"\u0aa8",
          "\u0aaa"-"\u0ab0",
@@ -992,22 +1113,25 @@ TOKEN :
          "\u0ac7"-"\u0ac9",
          "\u0acb"-"\u0acd",
          "\u0ad0",
-         "\u0ae0",
+         "\u0ae0"-"\u0ae3",
          "\u0ae6"-"\u0aef",
+         "\u0af1",
+         "\u0af9",
          "\u0b01"-"\u0b03",
          "\u0b05"-"\u0b0c",
          "\u0b0f"-"\u0b10",
          "\u0b13"-"\u0b28",
          "\u0b2a"-"\u0b30",
          "\u0b32"-"\u0b33",
-         "\u0b36"-"\u0b39",
-         "\u0b3c"-"\u0b43",
+         "\u0b35"-"\u0b39",
+         "\u0b3c"-"\u0b44",
          "\u0b47"-"\u0b48",
          "\u0b4b"-"\u0b4d",
          "\u0b56"-"\u0b57",
          "\u0b5c"-"\u0b5d",
-         "\u0b5f"-"\u0b61",
+         "\u0b5f"-"\u0b63",
          "\u0b66"-"\u0b6f",
+         "\u0b71",
          "\u0b82"-"\u0b83",
          "\u0b85"-"\u0b8a",
          "\u0b8e"-"\u0b90",
@@ -1017,49 +1141,51 @@ TOKEN :
          "\u0b9e"-"\u0b9f",
          "\u0ba3"-"\u0ba4",
          "\u0ba8"-"\u0baa",
-         "\u0bae"-"\u0bb5",
-         "\u0bb7"-"\u0bb9",
+         "\u0bae"-"\u0bb9",
          "\u0bbe"-"\u0bc2",
          "\u0bc6"-"\u0bc8",
          "\u0bca"-"\u0bcd",
+         "\u0bd0",
          "\u0bd7",
-         "\u0be7"-"\u0bef",
-         "\u0c01"-"\u0c03",
+         "\u0be6"-"\u0bef",
+         "\u0bf9",
+         "\u0c00"-"\u0c03",
          "\u0c05"-"\u0c0c",
          "\u0c0e"-"\u0c10",
          "\u0c12"-"\u0c28",
-         "\u0c2a"-"\u0c33",
-         "\u0c35"-"\u0c39",
-         "\u0c3e"-"\u0c44",
+         "\u0c2a"-"\u0c39",
+         "\u0c3d"-"\u0c44",
          "\u0c46"-"\u0c48",
          "\u0c4a"-"\u0c4d",
          "\u0c55"-"\u0c56",
-         "\u0c60"-"\u0c61",
+         "\u0c58"-"\u0c5a",
+         "\u0c60"-"\u0c63",
          "\u0c66"-"\u0c6f",
-         "\u0c82"-"\u0c83",
+         "\u0c81"-"\u0c83",
          "\u0c85"-"\u0c8c",
          "\u0c8e"-"\u0c90",
          "\u0c92"-"\u0ca8",
          "\u0caa"-"\u0cb3",
          "\u0cb5"-"\u0cb9",
-         "\u0cbe"-"\u0cc4",
+         "\u0cbc"-"\u0cc4",
          "\u0cc6"-"\u0cc8",
          "\u0cca"-"\u0ccd",
          "\u0cd5"-"\u0cd6",
          "\u0cde",
-         "\u0ce0"-"\u0ce1",
+         "\u0ce0"-"\u0ce3",
          "\u0ce6"-"\u0cef",
-         "\u0d02"-"\u0d03",
+         "\u0cf1"-"\u0cf2",
+         "\u0d01"-"\u0d03",
          "\u0d05"-"\u0d0c",
          "\u0d0e"-"\u0d10",
-         "\u0d12"-"\u0d28",
-         "\u0d2a"-"\u0d39",
-         "\u0d3e"-"\u0d43",
+         "\u0d12"-"\u0d3a",
+         "\u0d3d"-"\u0d44",
          "\u0d46"-"\u0d48",
-         "\u0d4a"-"\u0d4d",
+         "\u0d4a"-"\u0d4e",
          "\u0d57",
-         "\u0d60"-"\u0d61",
+         "\u0d5f"-"\u0d63",
          "\u0d66"-"\u0d6f",
+         "\u0d7a"-"\u0d7f",
          "\u0d82"-"\u0d83",
          "\u0d85"-"\u0d96",
          "\u0d9a"-"\u0db1",
@@ -1070,6 +1196,7 @@ TOKEN :
          "\u0dcf"-"\u0dd4",
          "\u0dd6",
          "\u0dd8"-"\u0ddf",
+         "\u0de6"-"\u0def",
          "\u0df2"-"\u0df3",
          "\u0e01"-"\u0e3a",
          "\u0e3f"-"\u0e4e",
@@ -1091,7 +1218,7 @@ TOKEN :
          "\u0ec6",
          "\u0ec8"-"\u0ecd",
          "\u0ed0"-"\u0ed9",
-         "\u0edc"-"\u0edd",
+         "\u0edc"-"\u0edf",
          "\u0f00",
          "\u0f18"-"\u0f19",
          "\u0f20"-"\u0f29",
@@ -1099,65 +1226,85 @@ TOKEN :
          "\u0f37",
          "\u0f39",
          "\u0f3e"-"\u0f47",
-         "\u0f49"-"\u0f6a",
+         "\u0f49"-"\u0f6c",
          "\u0f71"-"\u0f84",
-         "\u0f86"-"\u0f8b",
-         "\u0f90"-"\u0f97",
+         "\u0f86"-"\u0f97",
          "\u0f99"-"\u0fbc",
          "\u0fc6",
-         "\u1000"-"\u1021",
-         "\u1023"-"\u1027",
-         "\u1029"-"\u102a",
-         "\u102c"-"\u1032",
-         "\u1036"-"\u1039",
-         "\u1040"-"\u1049",
-         "\u1050"-"\u1059",
+         "\u1000"-"\u1049",
+         "\u1050"-"\u109d",
          "\u10a0"-"\u10c5",
-         "\u10d0"-"\u10f6",
-         "\u1100"-"\u1159",
-         "\u115f"-"\u11a2",
-         "\u11a8"-"\u11f9",
-         "\u1200"-"\u1206",
-         "\u1208"-"\u1246",
-         "\u1248",
+         "\u10c7",
+         "\u10cd",
+         "\u10d0"-"\u10fa",
+         "\u10fc"-"\u1248",
          "\u124a"-"\u124d",
          "\u1250"-"\u1256",
          "\u1258",
          "\u125a"-"\u125d",
-         "\u1260"-"\u1286",
-         "\u1288",
+         "\u1260"-"\u1288",
          "\u128a"-"\u128d",
-         "\u1290"-"\u12ae",
-         "\u12b0",
+         "\u1290"-"\u12b0",
          "\u12b2"-"\u12b5",
          "\u12b8"-"\u12be",
          "\u12c0",
          "\u12c2"-"\u12c5",
-         "\u12c8"-"\u12ce",
-         "\u12d0"-"\u12d6",
-         "\u12d8"-"\u12ee",
-         "\u12f0"-"\u130e",
-         "\u1310",
+         "\u12c8"-"\u12d6",
+         "\u12d8"-"\u1310",
          "\u1312"-"\u1315",
-         "\u1318"-"\u131e",
-         "\u1320"-"\u1346",
-         "\u1348"-"\u135a",
-         "\u1369"-"\u1371",
-         "\u13a0"-"\u13f4",
+         "\u1318"-"\u135a",
+         "\u135d"-"\u135f",
+         "\u1380"-"\u138f",
+         "\u13a0"-"\u13f5",
+         "\u13f8"-"\u13fd",
          "\u1401"-"\u166c",
-         "\u166f"-"\u1676",
+         "\u166f"-"\u167f",
          "\u1681"-"\u169a",
          "\u16a0"-"\u16ea",
+         "\u16ee"-"\u16f8",
+         "\u1700"-"\u170c",
+         "\u170e"-"\u1714",
+         "\u1720"-"\u1734",
+         "\u1740"-"\u1753",
+         "\u1760"-"\u176c",
+         "\u176e"-"\u1770",
+         "\u1772"-"\u1773",
          "\u1780"-"\u17d3",
-         "\u17db",
+         "\u17d7",
+         "\u17db"-"\u17dd",
          "\u17e0"-"\u17e9",
          "\u180b"-"\u180e",
          "\u1810"-"\u1819",
          "\u1820"-"\u1877",
-         "\u1880"-"\u18a9",
-         "\u1e00"-"\u1e9b",
-         "\u1ea0"-"\u1ef9",
-         "\u1f00"-"\u1f15",
+         "\u1880"-"\u18aa",
+         "\u18b0"-"\u18f5",
+         "\u1900"-"\u191e",
+         "\u1920"-"\u192b",
+         "\u1930"-"\u193b",
+         "\u1946"-"\u196d",
+         "\u1970"-"\u1974",
+         "\u1980"-"\u19ab",
+         "\u19b0"-"\u19c9",
+         "\u19d0"-"\u19d9",
+         "\u1a00"-"\u1a1b",
+         "\u1a20"-"\u1a5e",
+         "\u1a60"-"\u1a7c",
+         "\u1a7f"-"\u1a89",
+         "\u1a90"-"\u1a99",
+         "\u1aa7",
+         "\u1ab0"-"\u1abd",
+         "\u1b00"-"\u1b4b",
+         "\u1b50"-"\u1b59",
+         "\u1b6b"-"\u1b73",
+         "\u1b80"-"\u1bf3",
+         "\u1c00"-"\u1c37",
+         "\u1c40"-"\u1c49",
+         "\u1c4d"-"\u1c7d",
+         "\u1cd0"-"\u1cd2",
+         "\u1cd4"-"\u1cf6",
+         "\u1cf8"-"\u1cf9",
+         "\u1d00"-"\u1df5",
+         "\u1dfc"-"\u1f15",
          "\u1f18"-"\u1f1d",
          "\u1f20"-"\u1f45",
          "\u1f48"-"\u1f4d",
@@ -1176,14 +1323,19 @@ TOKEN :
          "\u1fe0"-"\u1fec",
          "\u1ff2"-"\u1ff4",
          "\u1ff6"-"\u1ffc",
-         "\u200c"-"\u200f",
+         "\u200b"-"\u200f",
          "\u202a"-"\u202e",
          "\u203f"-"\u2040",
-         "\u206a"-"\u206f",
+         "\u2054",
+         "\u2060"-"\u2064",
+         "\u2066"-"\u206f",
+         "\u2071",
          "\u207f",
-         "\u20a0"-"\u20af",
+         "\u2090"-"\u209c",
+         "\u20a0"-"\u20be",
          "\u20d0"-"\u20dc",
          "\u20e1",
+         "\u20e5"-"\u20f0",
          "\u2102",
          "\u2107",
          "\u210a"-"\u2113",
@@ -1193,25 +1345,94 @@ TOKEN :
          "\u2126",
          "\u2128",
          "\u212a"-"\u212d",
-         "\u212f"-"\u2131",
-         "\u2133"-"\u2139",
-         "\u2160"-"\u2183",
+         "\u212f"-"\u2139",
+         "\u213c"-"\u213f",
+         "\u2145"-"\u2149",
+         "\u214e",
+         "\u2160"-"\u2188",
+         "\u2c00"-"\u2c2e",
+         "\u2c30"-"\u2c5e",
+         "\u2c60"-"\u2ce4",
+         "\u2ceb"-"\u2cf3",
+         "\u2d00"-"\u2d25",
+         "\u2d27",
+         "\u2d2d",
+         "\u2d30"-"\u2d67",
+         "\u2d6f",
+         "\u2d7f"-"\u2d96",
+         "\u2da0"-"\u2da6",
+         "\u2da8"-"\u2dae",
+         "\u2db0"-"\u2db6",
+         "\u2db8"-"\u2dbe",
+         "\u2dc0"-"\u2dc6",
+         "\u2dc8"-"\u2dce",
+         "\u2dd0"-"\u2dd6",
+         "\u2dd8"-"\u2dde",
+         "\u2de0"-"\u2dff",
+         "\u2e2f",
          "\u3005"-"\u3007",
          "\u3021"-"\u302f",
          "\u3031"-"\u3035",
-         "\u3038"-"\u303a",
-         "\u3041"-"\u3094",
+         "\u3038"-"\u303c",
+         "\u3041"-"\u3096",
          "\u3099"-"\u309a",
-         "\u309d"-"\u309e",
-         "\u30a1"-"\u30fe",
-         "\u3105"-"\u312c",
+         "\u309d"-"\u309f",
+         "\u30a1"-"\u30fa",
+         "\u30fc"-"\u30ff",
+         "\u3105"-"\u312d",
          "\u3131"-"\u318e",
-         "\u31a0"-"\u31b7",
+         "\u31a0"-"\u31ba",
+         "\u31f0"-"\u31ff",
          "\u3400"-"\u4db5",
-         "\u4e00"-"\u9fa5",
+         "\u4e00"-"\u9fd5",
          "\ua000"-"\ua48c",
+         "\ua4d0"-"\ua4fd",
+         "\ua500"-"\ua60c",
+         "\ua610"-"\ua62b",
+         "\ua640"-"\ua66f",
+         "\ua674"-"\ua67d",
+         "\ua67f"-"\ua6f1",
+         "\ua717"-"\ua71f",
+         "\ua722"-"\ua788",
+         "\ua78b"-"\ua7ad",
+         "\ua7b0"-"\ua7b7",
+         "\ua7f7"-"\ua827",
+         "\ua838",
+         "\ua840"-"\ua873",
+         "\ua880"-"\ua8c4",
+         "\ua8d0"-"\ua8d9",
+         "\ua8e0"-"\ua8f7",
+         "\ua8fb",
+         "\ua8fd",
+         "\ua900"-"\ua92d",
+         "\ua930"-"\ua953",
+         "\ua960"-"\ua97c",
+         "\ua980"-"\ua9c0",
+         "\ua9cf"-"\ua9d9",
+         "\ua9e0"-"\ua9fe",
+         "\uaa00"-"\uaa36",
+         "\uaa40"-"\uaa4d",
+         "\uaa50"-"\uaa59",
+         "\uaa60"-"\uaa76",
+         "\uaa7a"-"\uaac2",
+         "\uaadb"-"\uaadd",
+         "\uaae0"-"\uaaef",
+         "\uaaf2"-"\uaaf6",
+         "\uab01"-"\uab06",
+         "\uab09"-"\uab0e",
+         "\uab11"-"\uab16",
+         "\uab20"-"\uab26",
+         "\uab28"-"\uab2e",
+         "\uab30"-"\uab5a",
+         "\uab5c"-"\uab65",
+         "\uab70"-"\uabea",
+         "\uabec"-"\uabed",
+         "\uabf0"-"\uabf9",
          "\uac00"-"\ud7a3",
-         "\uf900"-"\ufa2d",
+         "\ud7b0"-"\ud7c6",
+         "\ud7cb"-"\ud7fb",
+         "\uf900"-"\ufa6d",
+         "\ufa70"-"\ufad9",
          "\ufb00"-"\ufb06",
          "\ufb13"-"\ufb17",
          "\ufb1d"-"\ufb28",
@@ -1224,13 +1445,13 @@ TOKEN :
          "\ufbd3"-"\ufd3d",
          "\ufd50"-"\ufd8f",
          "\ufd92"-"\ufdc7",
-         "\ufdf0"-"\ufdfb",
-         "\ufe20"-"\ufe23",
+         "\ufdf0"-"\ufdfc",
+         "\ufe00"-"\ufe0f",
+         "\ufe20"-"\ufe2f",
          "\ufe33"-"\ufe34",
          "\ufe4d"-"\ufe4f",
          "\ufe69",
-         "\ufe70"-"\ufe72",
-         "\ufe74",
+         "\ufe70"-"\ufe74",
          "\ufe76"-"\ufefc",
          "\ufeff",
          "\uff04",
@@ -1238,7 +1459,7 @@ TOKEN :
          "\uff21"-"\uff3a",
          "\uff3f",
          "\uff41"-"\uff5a",
-         "\uff65"-"\uffbe",
+         "\uff66"-"\uffbe",
          "\uffc2"-"\uffc7",
          "\uffca"-"\uffcf",
          "\uffd2"-"\uffd7",