--- a/jdk/make/data/characterdata/CharacterData00.java.template Mon Oct 19 17:35:18 2015 -0700
+++ b/jdk/make/data/characterdata/CharacterData00.java.template Tue Oct 20 19:34:04 2015 +0900
@@ -136,101 +136,179 @@
if ((val & $$maskLowerCase) != 0) {
if ((val & $$maskCaseOffset) == $$maskCaseOffset) {
switch(ch) {
- // map the offset overflow chars
- case 0x0130 : mapChar = 0x0069; break;
- case 0x2126 : mapChar = 0x03C9; break;
- case 0x212A : mapChar = 0x006B; break;
- case 0x212B : mapChar = 0x00E5; break;
- // map the titlecase chars with both a 1:M uppercase map
- // and a lowercase map
- case 0x1F88 : mapChar = 0x1F80; break;
- case 0x1F89 : mapChar = 0x1F81; break;
- case 0x1F8A : mapChar = 0x1F82; break;
- case 0x1F8B : mapChar = 0x1F83; break;
- case 0x1F8C : mapChar = 0x1F84; break;
- case 0x1F8D : mapChar = 0x1F85; break;
- case 0x1F8E : mapChar = 0x1F86; break;
- case 0x1F8F : mapChar = 0x1F87; break;
- case 0x1F98 : mapChar = 0x1F90; break;
- case 0x1F99 : mapChar = 0x1F91; break;
- case 0x1F9A : mapChar = 0x1F92; break;
- case 0x1F9B : mapChar = 0x1F93; break;
- case 0x1F9C : mapChar = 0x1F94; break;
- case 0x1F9D : mapChar = 0x1F95; break;
- case 0x1F9E : mapChar = 0x1F96; break;
- case 0x1F9F : mapChar = 0x1F97; break;
- case 0x1FA8 : mapChar = 0x1FA0; break;
- case 0x1FA9 : mapChar = 0x1FA1; break;
- case 0x1FAA : mapChar = 0x1FA2; break;
- case 0x1FAB : mapChar = 0x1FA3; break;
- case 0x1FAC : mapChar = 0x1FA4; break;
- case 0x1FAD : mapChar = 0x1FA5; break;
- case 0x1FAE : mapChar = 0x1FA6; break;
- case 0x1FAF : mapChar = 0x1FA7; break;
- case 0x1FBC : mapChar = 0x1FB3; break;
- case 0x1FCC : mapChar = 0x1FC3; break;
- case 0x1FFC : mapChar = 0x1FF3; break;
-
- case 0x023A : mapChar = 0x2C65; break;
- case 0x023E : mapChar = 0x2C66; break;
- case 0x10A0 : mapChar = 0x2D00; break;
- case 0x10A1 : mapChar = 0x2D01; break;
- case 0x10A2 : mapChar = 0x2D02; break;
- case 0x10A3 : mapChar = 0x2D03; break;
- case 0x10A4 : mapChar = 0x2D04; break;
- case 0x10A5 : mapChar = 0x2D05; break;
- case 0x10A6 : mapChar = 0x2D06; break;
- case 0x10A7 : mapChar = 0x2D07; break;
- case 0x10A8 : mapChar = 0x2D08; break;
- case 0x10A9 : mapChar = 0x2D09; break;
- case 0x10AA : mapChar = 0x2D0A; break;
- case 0x10AB : mapChar = 0x2D0B; break;
- case 0x10AC : mapChar = 0x2D0C; break;
- case 0x10AD : mapChar = 0x2D0D; break;
- case 0x10AE : mapChar = 0x2D0E; break;
- case 0x10AF : mapChar = 0x2D0F; break;
- case 0x10B0 : mapChar = 0x2D10; break;
- case 0x10B1 : mapChar = 0x2D11; break;
- case 0x10B2 : mapChar = 0x2D12; break;
- case 0x10B3 : mapChar = 0x2D13; break;
- case 0x10B4 : mapChar = 0x2D14; break;
- case 0x10B5 : mapChar = 0x2D15; break;
- case 0x10B6 : mapChar = 0x2D16; break;
- case 0x10B7 : mapChar = 0x2D17; break;
- case 0x10B8 : mapChar = 0x2D18; break;
- case 0x10B9 : mapChar = 0x2D19; break;
- case 0x10BA : mapChar = 0x2D1A; break;
- case 0x10BB : mapChar = 0x2D1B; break;
- case 0x10BC : mapChar = 0x2D1C; break;
- case 0x10BD : mapChar = 0x2D1D; break;
- case 0x10BE : mapChar = 0x2D1E; break;
- case 0x10BF : mapChar = 0x2D1F; break;
- case 0x10C0 : mapChar = 0x2D20; break;
- case 0x10C1 : mapChar = 0x2D21; break;
- case 0x10C2 : mapChar = 0x2D22; break;
- case 0x10C3 : mapChar = 0x2D23; break;
- case 0x10C4 : mapChar = 0x2D24; break;
- case 0x10C5 : mapChar = 0x2D25; break;
- case 0x10C7 : mapChar = 0x2D27; break;
- case 0x10CD : mapChar = 0x2D2D; break;
- case 0x1E9E : mapChar = 0x00DF; break;
- case 0x2C62 : mapChar = 0x026B; break;
- case 0x2C63 : mapChar = 0x1D7D; break;
- case 0x2C64 : mapChar = 0x027D; break;
- case 0x2C6D : mapChar = 0x0251; break;
- case 0x2C6E : mapChar = 0x0271; break;
- case 0x2C6F : mapChar = 0x0250; break;
- case 0x2C70 : mapChar = 0x0252; break;
- case 0x2C7E : mapChar = 0x023F; break;
- case 0x2C7F : mapChar = 0x0240; break;
- case 0xA77D : mapChar = 0x1D79; break;
- case 0xA78D : mapChar = 0x0265; break;
- case 0xA7AA : mapChar = 0x0266; break;
- case 0xA7AB : mapChar = 0x025C; break;
- case 0xA7AC : mapChar = 0x0261; break;
- case 0xA7AD : mapChar = 0x026C; break;
- case 0xA7B0 : mapChar = 0x029E; break;
- case 0xA7B1 : mapChar = 0x0287; break;
+ case 0x0130: mapChar = 0x0069; break;
+ case 0x023A: mapChar = 0x2C65; break;
+ case 0x023E: mapChar = 0x2C66; break;
+ case 0x10A0: mapChar = 0x2D00; break;
+ case 0x10A1: mapChar = 0x2D01; break;
+ case 0x10A2: mapChar = 0x2D02; break;
+ case 0x10A3: mapChar = 0x2D03; break;
+ case 0x10A4: mapChar = 0x2D04; break;
+ case 0x10A5: mapChar = 0x2D05; break;
+ case 0x10A6: mapChar = 0x2D06; break;
+ case 0x10A7: mapChar = 0x2D07; break;
+ case 0x10A8: mapChar = 0x2D08; break;
+ case 0x10A9: mapChar = 0x2D09; break;
+ case 0x10AA: mapChar = 0x2D0A; break;
+ case 0x10AB: mapChar = 0x2D0B; break;
+ case 0x10AC: mapChar = 0x2D0C; break;
+ case 0x10AD: mapChar = 0x2D0D; break;
+ case 0x10AE: mapChar = 0x2D0E; break;
+ case 0x10AF: mapChar = 0x2D0F; break;
+ case 0x10B0: mapChar = 0x2D10; break;
+ case 0x10B1: mapChar = 0x2D11; break;
+ case 0x10B2: mapChar = 0x2D12; break;
+ case 0x10B3: mapChar = 0x2D13; break;
+ case 0x10B4: mapChar = 0x2D14; break;
+ case 0x10B5: mapChar = 0x2D15; break;
+ case 0x10B6: mapChar = 0x2D16; break;
+ case 0x10B7: mapChar = 0x2D17; break;
+ case 0x10B8: mapChar = 0x2D18; break;
+ case 0x10B9: mapChar = 0x2D19; break;
+ case 0x10BA: mapChar = 0x2D1A; break;
+ case 0x10BB: mapChar = 0x2D1B; break;
+ case 0x10BC: mapChar = 0x2D1C; break;
+ case 0x10BD: mapChar = 0x2D1D; break;
+ case 0x10BE: mapChar = 0x2D1E; break;
+ case 0x10BF: mapChar = 0x2D1F; break;
+ case 0x10C0: mapChar = 0x2D20; break;
+ case 0x10C1: mapChar = 0x2D21; break;
+ case 0x10C2: mapChar = 0x2D22; break;
+ case 0x10C3: mapChar = 0x2D23; break;
+ case 0x10C4: mapChar = 0x2D24; break;
+ case 0x10C5: mapChar = 0x2D25; break;
+ case 0x10C7: mapChar = 0x2D27; break;
+ case 0x10CD: mapChar = 0x2D2D; break;
+ case 0x13A0: mapChar = 0xAB70; break;
+ case 0x13A1: mapChar = 0xAB71; break;
+ case 0x13A2: mapChar = 0xAB72; break;
+ case 0x13A3: mapChar = 0xAB73; break;
+ case 0x13A4: mapChar = 0xAB74; break;
+ case 0x13A5: mapChar = 0xAB75; break;
+ case 0x13A6: mapChar = 0xAB76; break;
+ case 0x13A7: mapChar = 0xAB77; break;
+ case 0x13A8: mapChar = 0xAB78; break;
+ case 0x13A9: mapChar = 0xAB79; break;
+ case 0x13AA: mapChar = 0xAB7A; break;
+ case 0x13AB: mapChar = 0xAB7B; break;
+ case 0x13AC: mapChar = 0xAB7C; break;
+ case 0x13AD: mapChar = 0xAB7D; break;
+ case 0x13AE: mapChar = 0xAB7E; break;
+ case 0x13AF: mapChar = 0xAB7F; break;
+ case 0x13B0: mapChar = 0xAB80; break;
+ case 0x13B1: mapChar = 0xAB81; break;
+ case 0x13B2: mapChar = 0xAB82; break;
+ case 0x13B3: mapChar = 0xAB83; break;
+ case 0x13B4: mapChar = 0xAB84; break;
+ case 0x13B5: mapChar = 0xAB85; break;
+ case 0x13B6: mapChar = 0xAB86; break;
+ case 0x13B7: mapChar = 0xAB87; break;
+ case 0x13B8: mapChar = 0xAB88; break;
+ case 0x13B9: mapChar = 0xAB89; break;
+ case 0x13BA: mapChar = 0xAB8A; break;
+ case 0x13BB: mapChar = 0xAB8B; break;
+ case 0x13BC: mapChar = 0xAB8C; break;
+ case 0x13BD: mapChar = 0xAB8D; break;
+ case 0x13BE: mapChar = 0xAB8E; break;
+ case 0x13BF: mapChar = 0xAB8F; break;
+ case 0x13C0: mapChar = 0xAB90; break;
+ case 0x13C1: mapChar = 0xAB91; break;
+ case 0x13C2: mapChar = 0xAB92; break;
+ case 0x13C3: mapChar = 0xAB93; break;
+ case 0x13C4: mapChar = 0xAB94; break;
+ case 0x13C5: mapChar = 0xAB95; break;
+ case 0x13C6: mapChar = 0xAB96; break;
+ case 0x13C7: mapChar = 0xAB97; break;
+ case 0x13C8: mapChar = 0xAB98; break;
+ case 0x13C9: mapChar = 0xAB99; break;
+ case 0x13CA: mapChar = 0xAB9A; break;
+ case 0x13CB: mapChar = 0xAB9B; break;
+ case 0x13CC: mapChar = 0xAB9C; break;
+ case 0x13CD: mapChar = 0xAB9D; break;
+ case 0x13CE: mapChar = 0xAB9E; break;
+ case 0x13CF: mapChar = 0xAB9F; break;
+ case 0x13D0: mapChar = 0xABA0; break;
+ case 0x13D1: mapChar = 0xABA1; break;
+ case 0x13D2: mapChar = 0xABA2; break;
+ case 0x13D3: mapChar = 0xABA3; break;
+ case 0x13D4: mapChar = 0xABA4; break;
+ case 0x13D5: mapChar = 0xABA5; break;
+ case 0x13D6: mapChar = 0xABA6; break;
+ case 0x13D7: mapChar = 0xABA7; break;
+ case 0x13D8: mapChar = 0xABA8; break;
+ case 0x13D9: mapChar = 0xABA9; break;
+ case 0x13DA: mapChar = 0xABAA; break;
+ case 0x13DB: mapChar = 0xABAB; break;
+ case 0x13DC: mapChar = 0xABAC; break;
+ case 0x13DD: mapChar = 0xABAD; break;
+ case 0x13DE: mapChar = 0xABAE; break;
+ case 0x13DF: mapChar = 0xABAF; break;
+ case 0x13E0: mapChar = 0xABB0; break;
+ case 0x13E1: mapChar = 0xABB1; break;
+ case 0x13E2: mapChar = 0xABB2; break;
+ case 0x13E3: mapChar = 0xABB3; break;
+ case 0x13E4: mapChar = 0xABB4; break;
+ case 0x13E5: mapChar = 0xABB5; break;
+ case 0x13E6: mapChar = 0xABB6; break;
+ case 0x13E7: mapChar = 0xABB7; break;
+ case 0x13E8: mapChar = 0xABB8; break;
+ case 0x13E9: mapChar = 0xABB9; break;
+ case 0x13EA: mapChar = 0xABBA; break;
+ case 0x13EB: mapChar = 0xABBB; break;
+ case 0x13EC: mapChar = 0xABBC; break;
+ case 0x13ED: mapChar = 0xABBD; break;
+ case 0x13EE: mapChar = 0xABBE; break;
+ case 0x13EF: mapChar = 0xABBF; break;
+ case 0x1E9E: mapChar = 0x00DF; break;
+ case 0x1F88: mapChar = 0x1F80; break;
+ case 0x1F89: mapChar = 0x1F81; break;
+ case 0x1F8A: mapChar = 0x1F82; break;
+ case 0x1F8B: mapChar = 0x1F83; break;
+ case 0x1F8C: mapChar = 0x1F84; break;
+ case 0x1F8D: mapChar = 0x1F85; break;
+ case 0x1F8E: mapChar = 0x1F86; break;
+ case 0x1F8F: mapChar = 0x1F87; break;
+ case 0x1F98: mapChar = 0x1F90; break;
+ case 0x1F99: mapChar = 0x1F91; break;
+ case 0x1F9A: mapChar = 0x1F92; break;
+ case 0x1F9B: mapChar = 0x1F93; break;
+ case 0x1F9C: mapChar = 0x1F94; break;
+ case 0x1F9D: mapChar = 0x1F95; break;
+ case 0x1F9E: mapChar = 0x1F96; break;
+ case 0x1F9F: mapChar = 0x1F97; break;
+ case 0x1FA8: mapChar = 0x1FA0; break;
+ case 0x1FA9: mapChar = 0x1FA1; break;
+ case 0x1FAA: mapChar = 0x1FA2; break;
+ case 0x1FAB: mapChar = 0x1FA3; break;
+ case 0x1FAC: mapChar = 0x1FA4; break;
+ case 0x1FAD: mapChar = 0x1FA5; break;
+ case 0x1FAE: mapChar = 0x1FA6; break;
+ case 0x1FAF: mapChar = 0x1FA7; break;
+ case 0x1FBC: mapChar = 0x1FB3; break;
+ case 0x1FCC: mapChar = 0x1FC3; break;
+ case 0x1FFC: mapChar = 0x1FF3; break;
+ case 0x2126: mapChar = 0x03C9; break;
+ case 0x212A: mapChar = 0x006B; break;
+ case 0x212B: mapChar = 0x00E5; break;
+ case 0x2C62: mapChar = 0x026B; break;
+ case 0x2C63: mapChar = 0x1D7D; break;
+ case 0x2C64: mapChar = 0x027D; break;
+ case 0x2C6D: mapChar = 0x0251; break;
+ case 0x2C6E: mapChar = 0x0271; break;
+ case 0x2C6F: mapChar = 0x0250; break;
+ case 0x2C70: mapChar = 0x0252; break;
+ case 0x2C7E: mapChar = 0x023F; break;
+ case 0x2C7F: mapChar = 0x0240; break;
+ case 0xA77D: mapChar = 0x1D79; break;
+ case 0xA78D: mapChar = 0x0265; break;
+ case 0xA7AA: mapChar = 0x0266; break;
+ case 0xA7AB: mapChar = 0x025C; break;
+ case 0xA7AC: mapChar = 0x0261; break;
+ case 0xA7AD: mapChar = 0x026C; break;
+ case 0xA7B0: mapChar = 0x029E; break;
+ case 0xA7B1: mapChar = 0x0287; break;
+ case 0xA7B2: mapChar = 0x029D; break;
+ case 0xA7B3: mapChar = 0xAB53; break;
// default mapChar is already set, so no
// need to redo it here.
// default : mapChar = ch;
@@ -251,98 +329,176 @@
if ((val & $$maskUpperCase) != 0) {
if ((val & $$maskCaseOffset) == $$maskCaseOffset) {
switch(ch) {
- // map chars with overflow offsets
- case 0x00B5 : mapChar = 0x039C; break;
- case 0x017F : mapChar = 0x0053; break;
- case 0x1FBE : mapChar = 0x0399; break;
- // map char that have both a 1:1 and 1:M map
- case 0x1F80 : mapChar = 0x1F88; break;
- case 0x1F81 : mapChar = 0x1F89; break;
- case 0x1F82 : mapChar = 0x1F8A; break;
- case 0x1F83 : mapChar = 0x1F8B; break;
- case 0x1F84 : mapChar = 0x1F8C; break;
- case 0x1F85 : mapChar = 0x1F8D; break;
- case 0x1F86 : mapChar = 0x1F8E; break;
- case 0x1F87 : mapChar = 0x1F8F; break;
- case 0x1F90 : mapChar = 0x1F98; break;
- case 0x1F91 : mapChar = 0x1F99; break;
- case 0x1F92 : mapChar = 0x1F9A; break;
- case 0x1F93 : mapChar = 0x1F9B; break;
- case 0x1F94 : mapChar = 0x1F9C; break;
- case 0x1F95 : mapChar = 0x1F9D; break;
- case 0x1F96 : mapChar = 0x1F9E; break;
- case 0x1F97 : mapChar = 0x1F9F; break;
- case 0x1FA0 : mapChar = 0x1FA8; break;
- case 0x1FA1 : mapChar = 0x1FA9; break;
- case 0x1FA2 : mapChar = 0x1FAA; break;
- case 0x1FA3 : mapChar = 0x1FAB; break;
- case 0x1FA4 : mapChar = 0x1FAC; break;
- case 0x1FA5 : mapChar = 0x1FAD; break;
- case 0x1FA6 : mapChar = 0x1FAE; break;
- case 0x1FA7 : mapChar = 0x1FAF; break;
- case 0x1FB3 : mapChar = 0x1FBC; break;
- case 0x1FC3 : mapChar = 0x1FCC; break;
- case 0x1FF3 : mapChar = 0x1FFC; break;
-
- case 0x023F : mapChar = 0x2C7E; break;
- case 0x0240 : mapChar = 0x2C7F; break;
- case 0x0250 : mapChar = 0x2C6F; break;
- case 0x0251 : mapChar = 0x2C6D; break;
- case 0x0252 : mapChar = 0x2C70; break;
- case 0x025C : mapChar = 0xA7AB; break;
- case 0x0261 : mapChar = 0xA7AC; break;
- case 0x0265 : mapChar = 0xA78D; break;
- case 0x0266 : mapChar = 0xA7AA; break;
- case 0x026B : mapChar = 0x2C62; break;
- case 0x026C : mapChar = 0xA7AD; break;
- case 0x0271 : mapChar = 0x2C6E; break;
- case 0x0287 : mapChar = 0xA7B1; break;
- case 0x029E : mapChar = 0xA7B0; break;
- case 0x027D : mapChar = 0x2C64; break;
- case 0x1D79 : mapChar = 0xA77D; break;
- case 0x1D7D : mapChar = 0x2C63; break;
- case 0x2C65 : mapChar = 0x023A; break;
- case 0x2C66 : mapChar = 0x023E; break;
- case 0x2D00 : mapChar = 0x10A0; break;
- case 0x2D01 : mapChar = 0x10A1; break;
- case 0x2D02 : mapChar = 0x10A2; break;
- case 0x2D03 : mapChar = 0x10A3; break;
- case 0x2D04 : mapChar = 0x10A4; break;
- case 0x2D05 : mapChar = 0x10A5; break;
- case 0x2D06 : mapChar = 0x10A6; break;
- case 0x2D07 : mapChar = 0x10A7; break;
- case 0x2D08 : mapChar = 0x10A8; break;
- case 0x2D09 : mapChar = 0x10A9; break;
- case 0x2D0A : mapChar = 0x10AA; break;
- case 0x2D0B : mapChar = 0x10AB; break;
- case 0x2D0C : mapChar = 0x10AC; break;
- case 0x2D0D : mapChar = 0x10AD; break;
- case 0x2D0E : mapChar = 0x10AE; break;
- case 0x2D0F : mapChar = 0x10AF; break;
- case 0x2D10 : mapChar = 0x10B0; break;
- case 0x2D11 : mapChar = 0x10B1; break;
- case 0x2D12 : mapChar = 0x10B2; break;
- case 0x2D13 : mapChar = 0x10B3; break;
- case 0x2D14 : mapChar = 0x10B4; break;
- case 0x2D15 : mapChar = 0x10B5; break;
- case 0x2D16 : mapChar = 0x10B6; break;
- case 0x2D17 : mapChar = 0x10B7; break;
- case 0x2D18 : mapChar = 0x10B8; break;
- case 0x2D19 : mapChar = 0x10B9; break;
- case 0x2D1A : mapChar = 0x10BA; break;
- case 0x2D1B : mapChar = 0x10BB; break;
- case 0x2D1C : mapChar = 0x10BC; break;
- case 0x2D1D : mapChar = 0x10BD; break;
- case 0x2D1E : mapChar = 0x10BE; break;
- case 0x2D1F : mapChar = 0x10BF; break;
- case 0x2D20 : mapChar = 0x10C0; break;
- case 0x2D21 : mapChar = 0x10C1; break;
- case 0x2D22 : mapChar = 0x10C2; break;
- case 0x2D23 : mapChar = 0x10C3; break;
- case 0x2D24 : mapChar = 0x10C4; break;
- case 0x2D25 : mapChar = 0x10C5; break;
- case 0x2D27 : mapChar = 0x10C7; break;
- case 0x2D2D : mapChar = 0x10CD; break;
+ case 0x017F: mapChar = 0x0053; break;
+ case 0x023F: mapChar = 0x2C7E; break;
+ case 0x0240: mapChar = 0x2C7F; break;
+ case 0x0250: mapChar = 0x2C6F; break;
+ case 0x0251: mapChar = 0x2C6D; break;
+ case 0x0252: mapChar = 0x2C70; break;
+ case 0x025C: mapChar = 0xA7AB; break;
+ case 0x0261: mapChar = 0xA7AC; break;
+ case 0x0265: mapChar = 0xA78D; break;
+ case 0x0266: mapChar = 0xA7AA; break;
+ case 0x026B: mapChar = 0x2C62; break;
+ case 0x026C: mapChar = 0xA7AD; break;
+ case 0x0271: mapChar = 0x2C6E; break;
+ case 0x027D: mapChar = 0x2C64; break;
+ case 0x0287: mapChar = 0xA7B1; break;
+ case 0x029D: mapChar = 0xA7B2; break;
+ case 0x029E: mapChar = 0xA7B0; break;
+ case 0x1D79: mapChar = 0xA77D; break;
+ case 0x1D7D: mapChar = 0x2C63; break;
+ case 0x1F80: mapChar = 0x1F88; break;
+ case 0x1F81: mapChar = 0x1F89; break;
+ case 0x1F82: mapChar = 0x1F8A; break;
+ case 0x1F83: mapChar = 0x1F8B; break;
+ case 0x1F84: mapChar = 0x1F8C; break;
+ case 0x1F85: mapChar = 0x1F8D; break;
+ case 0x1F86: mapChar = 0x1F8E; break;
+ case 0x1F87: mapChar = 0x1F8F; break;
+ case 0x1F90: mapChar = 0x1F98; break;
+ case 0x1F91: mapChar = 0x1F99; break;
+ case 0x1F92: mapChar = 0x1F9A; break;
+ case 0x1F93: mapChar = 0x1F9B; break;
+ case 0x1F94: mapChar = 0x1F9C; break;
+ case 0x1F95: mapChar = 0x1F9D; break;
+ case 0x1F96: mapChar = 0x1F9E; break;
+ case 0x1F97: mapChar = 0x1F9F; break;
+ case 0x1FA0: mapChar = 0x1FA8; break;
+ case 0x1FA1: mapChar = 0x1FA9; break;
+ case 0x1FA2: mapChar = 0x1FAA; break;
+ case 0x1FA3: mapChar = 0x1FAB; break;
+ case 0x1FA4: mapChar = 0x1FAC; break;
+ case 0x1FA5: mapChar = 0x1FAD; break;
+ case 0x1FA6: mapChar = 0x1FAE; break;
+ case 0x1FA7: mapChar = 0x1FAF; break;
+ case 0x1FB3: mapChar = 0x1FBC; break;
+ case 0x1FBE: mapChar = 0x0399; break;
+ case 0x1FC3: mapChar = 0x1FCC; break;
+ case 0x1FF3: mapChar = 0x1FFC; break;
+ case 0x2C65: mapChar = 0x023A; break;
+ case 0x2C66: mapChar = 0x023E; break;
+ case 0x2D00: mapChar = 0x10A0; break;
+ case 0x2D01: mapChar = 0x10A1; break;
+ case 0x2D02: mapChar = 0x10A2; break;
+ case 0x2D03: mapChar = 0x10A3; break;
+ case 0x2D04: mapChar = 0x10A4; break;
+ case 0x2D05: mapChar = 0x10A5; break;
+ case 0x2D06: mapChar = 0x10A6; break;
+ case 0x2D07: mapChar = 0x10A7; break;
+ case 0x2D08: mapChar = 0x10A8; break;
+ case 0x2D09: mapChar = 0x10A9; break;
+ case 0x2D0A: mapChar = 0x10AA; break;
+ case 0x2D0B: mapChar = 0x10AB; break;
+ case 0x2D0C: mapChar = 0x10AC; break;
+ case 0x2D0D: mapChar = 0x10AD; break;
+ case 0x2D0E: mapChar = 0x10AE; break;
+ case 0x2D0F: mapChar = 0x10AF; break;
+ case 0x2D10: mapChar = 0x10B0; break;
+ case 0x2D11: mapChar = 0x10B1; break;
+ case 0x2D12: mapChar = 0x10B2; break;
+ case 0x2D13: mapChar = 0x10B3; break;
+ case 0x2D14: mapChar = 0x10B4; break;
+ case 0x2D15: mapChar = 0x10B5; break;
+ case 0x2D16: mapChar = 0x10B6; break;
+ case 0x2D17: mapChar = 0x10B7; break;
+ case 0x2D18: mapChar = 0x10B8; break;
+ case 0x2D19: mapChar = 0x10B9; break;
+ case 0x2D1A: mapChar = 0x10BA; break;
+ case 0x2D1B: mapChar = 0x10BB; break;
+ case 0x2D1C: mapChar = 0x10BC; break;
+ case 0x2D1D: mapChar = 0x10BD; break;
+ case 0x2D1E: mapChar = 0x10BE; break;
+ case 0x2D1F: mapChar = 0x10BF; break;
+ case 0x2D20: mapChar = 0x10C0; break;
+ case 0x2D21: mapChar = 0x10C1; break;
+ case 0x2D22: mapChar = 0x10C2; break;
+ case 0x2D23: mapChar = 0x10C3; break;
+ case 0x2D24: mapChar = 0x10C4; break;
+ case 0x2D25: mapChar = 0x10C5; break;
+ case 0x2D27: mapChar = 0x10C7; break;
+ case 0x2D2D: mapChar = 0x10CD; break;
+ case 0xAB53: mapChar = 0xA7B3; break;
+ case 0xAB70: mapChar = 0x13A0; break;
+ case 0xAB71: mapChar = 0x13A1; break;
+ case 0xAB72: mapChar = 0x13A2; break;
+ case 0xAB73: mapChar = 0x13A3; break;
+ case 0xAB74: mapChar = 0x13A4; break;
+ case 0xAB75: mapChar = 0x13A5; break;
+ case 0xAB76: mapChar = 0x13A6; break;
+ case 0xAB77: mapChar = 0x13A7; break;
+ case 0xAB78: mapChar = 0x13A8; break;
+ case 0xAB79: mapChar = 0x13A9; break;
+ case 0xAB7A: mapChar = 0x13AA; break;
+ case 0xAB7B: mapChar = 0x13AB; break;
+ case 0xAB7C: mapChar = 0x13AC; break;
+ case 0xAB7D: mapChar = 0x13AD; break;
+ case 0xAB7E: mapChar = 0x13AE; break;
+ case 0xAB7F: mapChar = 0x13AF; break;
+ case 0xAB80: mapChar = 0x13B0; break;
+ case 0xAB81: mapChar = 0x13B1; break;
+ case 0xAB82: mapChar = 0x13B2; break;
+ case 0xAB83: mapChar = 0x13B3; break;
+ case 0xAB84: mapChar = 0x13B4; break;
+ case 0xAB85: mapChar = 0x13B5; break;
+ case 0xAB86: mapChar = 0x13B6; break;
+ case 0xAB87: mapChar = 0x13B7; break;
+ case 0xAB88: mapChar = 0x13B8; break;
+ case 0xAB89: mapChar = 0x13B9; break;
+ case 0xAB8A: mapChar = 0x13BA; break;
+ case 0xAB8B: mapChar = 0x13BB; break;
+ case 0xAB8C: mapChar = 0x13BC; break;
+ case 0xAB8D: mapChar = 0x13BD; break;
+ case 0xAB8E: mapChar = 0x13BE; break;
+ case 0xAB8F: mapChar = 0x13BF; break;
+ case 0xAB90: mapChar = 0x13C0; break;
+ case 0xAB91: mapChar = 0x13C1; break;
+ case 0xAB92: mapChar = 0x13C2; break;
+ case 0xAB93: mapChar = 0x13C3; break;
+ case 0xAB94: mapChar = 0x13C4; break;
+ case 0xAB95: mapChar = 0x13C5; break;
+ case 0xAB96: mapChar = 0x13C6; break;
+ case 0xAB97: mapChar = 0x13C7; break;
+ case 0xAB98: mapChar = 0x13C8; break;
+ case 0xAB99: mapChar = 0x13C9; break;
+ case 0xAB9A: mapChar = 0x13CA; break;
+ case 0xAB9B: mapChar = 0x13CB; break;
+ case 0xAB9C: mapChar = 0x13CC; break;
+ case 0xAB9D: mapChar = 0x13CD; break;
+ case 0xAB9E: mapChar = 0x13CE; break;
+ case 0xAB9F: mapChar = 0x13CF; break;
+ case 0xABA0: mapChar = 0x13D0; break;
+ case 0xABA1: mapChar = 0x13D1; break;
+ case 0xABA2: mapChar = 0x13D2; break;
+ case 0xABA3: mapChar = 0x13D3; break;
+ case 0xABA4: mapChar = 0x13D4; break;
+ case 0xABA5: mapChar = 0x13D5; break;
+ case 0xABA6: mapChar = 0x13D6; break;
+ case 0xABA7: mapChar = 0x13D7; break;
+ case 0xABA8: mapChar = 0x13D8; break;
+ case 0xABA9: mapChar = 0x13D9; break;
+ case 0xABAA: mapChar = 0x13DA; break;
+ case 0xABAB: mapChar = 0x13DB; break;
+ case 0xABAC: mapChar = 0x13DC; break;
+ case 0xABAD: mapChar = 0x13DD; break;
+ case 0xABAE: mapChar = 0x13DE; break;
+ case 0xABAF: mapChar = 0x13DF; break;
+ case 0xABB0: mapChar = 0x13E0; break;
+ case 0xABB1: mapChar = 0x13E1; break;
+ case 0xABB2: mapChar = 0x13E2; break;
+ case 0xABB3: mapChar = 0x13E3; break;
+ case 0xABB4: mapChar = 0x13E4; break;
+ case 0xABB5: mapChar = 0x13E5; break;
+ case 0xABB6: mapChar = 0x13E6; break;
+ case 0xABB7: mapChar = 0x13E7; break;
+ case 0xABB8: mapChar = 0x13E8; break;
+ case 0xABB9: mapChar = 0x13E9; break;
+ case 0xABBA: mapChar = 0x13EA; break;
+ case 0xABBB: mapChar = 0x13EB; break;
+ case 0xABBC: mapChar = 0x13EC; break;
+ case 0xABBD: mapChar = 0x13ED; break;
+ case 0xABBE: mapChar = 0x13EE; break;
+ case 0xABBF: mapChar = 0x13EF; break;
// ch must have a 1:M case mapping, but we
// can't handle it here. Return ch.
// since mapChar is already set, no need
@@ -420,6 +576,8 @@
switch (ch) {
case 0x0BF1: retval = 100; break; // TAMIL NUMBER ONE HUNDRED
case 0x0BF2: retval = 1000; break; // TAMIL NUMBER ONE THOUSAND
+ case 0x0D71: retval = 100; break; // MALAYALAM NUMBER ONE HUNDRED
+ case 0x0D72: retval = 1000; break; // MALAYALAM NUMBER ONE THOUSAND
case 0x1375: retval = 40; break; // ETHIOPIC NUMBER FORTY
case 0x1376: retval = 50; break; // ETHIOPIC NUMBER FIFTY
case 0x1377: retval = 60; break; // ETHIOPIC NUMBER SIXTY
@@ -440,14 +598,15 @@
case 0x2180: retval = 1000; break; // ROMAN NUMERAL ONE THOUSAND C D
case 0x2181: retval = 5000; break; // ROMAN NUMERAL FIVE THOUSAND
case 0x2182: retval = 10000; break; // ROMAN NUMERAL TEN THOUSAND
-
- case 0x324B: retval = 40; break;
- case 0x324C: retval = 50; break;
- case 0x324D: retval = 60; break;
- case 0x324E: retval = 70; break;
- case 0x324F: retval = 80; break;
- case 0x325C: retval = 32; break;
-
+ case 0x2186: retval = 50; break; // ROMAN NUMERAL FIFTY EARLY FORM
+ case 0x2187: retval = 50000; break; // ROMAN NUMERAL FIFTY THOUSAND
+ case 0x2188: retval = 100000; break; // ROMAN NUMERAL ONE HUNDRED THOUSAND
+ case 0x324B: retval = 40; break; // CIRCLED NUMBER FORTY ON BLACK SQUARE
+ case 0x324C: retval = 50; break; // CIRCLED NUMBER FIFTY ON BLACK SQUARE
+ case 0x324D: retval = 60; break; // CIRCLED NUMBER SIXTY ON BLACK SQUARE
+ case 0x324E: retval = 70; break; // CIRCLED NUMBER SEVENTY ON BLACK SQUARE
+ case 0x324F: retval = 80; break; // CIRCLED NUMBER EIGHTY ON BLACK SQUARE
+ case 0x325C: retval = 32; break; // CIRCLED NUMBER THIRTY TWO
case 0x325D: retval = 33; break; // CIRCLED NUMBER THIRTY THREE
case 0x325E: retval = 34; break; // CIRCLED NUMBER THIRTY FOUR
case 0x325F: retval = 35; break; // CIRCLED NUMBER THIRTY FIVE
@@ -466,13 +625,6 @@
case 0x32BD: retval = 48; break; // CIRCLED NUMBER FORTY EIGHT
case 0x32BE: retval = 49; break; // CIRCLED NUMBER FORTY NINE
case 0x32BF: retval = 50; break; // CIRCLED NUMBER FIFTY
-
- case 0x0D71: retval = 100; break; // MALAYALAM NUMBER ONE HUNDRED
- case 0x0D72: retval = 1000; break; // MALAYALAM NUMBER ONE THOUSAND
- case 0x2186: retval = 50; break; // ROMAN NUMERAL FIFTY EARLY FORM
- case 0x2187: retval = 50000; break; // ROMAN NUMERAL FIFTY THOUSAND
- case 0x2188: retval = 100000; break; // ROMAN NUMERAL ONE HUNDRED THOUSAND
-
default: retval = -2; break;
}
break;
@@ -553,70 +705,149 @@
}
else {
switch(ch) {
- // map overflow characters
- case 0x00B5 : mapChar = 0x039C; break;
- case 0x017F : mapChar = 0x0053; break;
- case 0x1FBE : mapChar = 0x0399; break;
-
- case 0x023F : mapChar = 0x2C7E; break;
- case 0x0240 : mapChar = 0x2C7F; break;
- case 0x0250 : mapChar = 0x2C6F; break;
- case 0x0251 : mapChar = 0x2C6D; break;
- case 0x0252 : mapChar = 0x2C70; break;
- case 0x025C : mapChar = 0xA7AB; break;
- case 0x0261 : mapChar = 0xA7AC; break;
- case 0x0265 : mapChar = 0xA78D; break;
- case 0x0266 : mapChar = 0xA7AA; break;
- case 0x026B : mapChar = 0x2C62; break;
- case 0x026C : mapChar = 0xA7AD; break;
- case 0x0271 : mapChar = 0x2C6E; break;
- case 0x027D : mapChar = 0x2C64; break;
- case 0x0287 : mapChar = 0xA7B1; break;
- case 0x029E : mapChar = 0xA7B0; break;
- case 0x1D79 : mapChar = 0xA77D; break;
- case 0x1D7D : mapChar = 0x2C63; break;
- case 0x2C65 : mapChar = 0x023A; break;
- case 0x2C66 : mapChar = 0x023E; break;
- case 0x2D00 : mapChar = 0x10A0; break;
- case 0x2D01 : mapChar = 0x10A1; break;
- case 0x2D02 : mapChar = 0x10A2; break;
- case 0x2D03 : mapChar = 0x10A3; break;
- case 0x2D04 : mapChar = 0x10A4; break;
- case 0x2D05 : mapChar = 0x10A5; break;
- case 0x2D06 : mapChar = 0x10A6; break;
- case 0x2D07 : mapChar = 0x10A7; break;
- case 0x2D08 : mapChar = 0x10A8; break;
- case 0x2D09 : mapChar = 0x10A9; break;
- case 0x2D0A : mapChar = 0x10AA; break;
- case 0x2D0B : mapChar = 0x10AB; break;
- case 0x2D0C : mapChar = 0x10AC; break;
- case 0x2D0D : mapChar = 0x10AD; break;
- case 0x2D0E : mapChar = 0x10AE; break;
- case 0x2D0F : mapChar = 0x10AF; break;
- case 0x2D10 : mapChar = 0x10B0; break;
- case 0x2D11 : mapChar = 0x10B1; break;
- case 0x2D12 : mapChar = 0x10B2; break;
- case 0x2D13 : mapChar = 0x10B3; break;
- case 0x2D14 : mapChar = 0x10B4; break;
- case 0x2D15 : mapChar = 0x10B5; break;
- case 0x2D16 : mapChar = 0x10B6; break;
- case 0x2D17 : mapChar = 0x10B7; break;
- case 0x2D18 : mapChar = 0x10B8; break;
- case 0x2D19 : mapChar = 0x10B9; break;
- case 0x2D1A : mapChar = 0x10BA; break;
- case 0x2D1B : mapChar = 0x10BB; break;
- case 0x2D1C : mapChar = 0x10BC; break;
- case 0x2D1D : mapChar = 0x10BD; break;
- case 0x2D1E : mapChar = 0x10BE; break;
- case 0x2D1F : mapChar = 0x10BF; break;
- case 0x2D20 : mapChar = 0x10C0; break;
- case 0x2D21 : mapChar = 0x10C1; break;
- case 0x2D22 : mapChar = 0x10C2; break;
- case 0x2D23 : mapChar = 0x10C3; break;
- case 0x2D24 : mapChar = 0x10C4; break;
- case 0x2D25 : mapChar = 0x10C5; break;
- case 0x2D27 : mapChar = 0x10C7; break;
- case 0x2D2D : mapChar = 0x10CD; break;
+ case 0x017F: mapChar = 0x0053; break;
+ case 0x023F: mapChar = 0x2C7E; break;
+ case 0x0240: mapChar = 0x2C7F; break;
+ case 0x0250: mapChar = 0x2C6F; break;
+ case 0x0251: mapChar = 0x2C6D; break;
+ case 0x0252: mapChar = 0x2C70; break;
+ case 0x025C: mapChar = 0xA7AB; break;
+ case 0x0261: mapChar = 0xA7AC; break;
+ case 0x0265: mapChar = 0xA78D; break;
+ case 0x0266: mapChar = 0xA7AA; break;
+ case 0x026B: mapChar = 0x2C62; break;
+ case 0x026C: mapChar = 0xA7AD; break;
+ case 0x0271: mapChar = 0x2C6E; break;
+ case 0x027D: mapChar = 0x2C64; break;
+ case 0x0287: mapChar = 0xA7B1; break;
+ case 0x029D: mapChar = 0xA7B2; break;
+ case 0x029E: mapChar = 0xA7B0; break;
+ case 0x1D79: mapChar = 0xA77D; break;
+ case 0x1D7D: mapChar = 0x2C63; break;
+ case 0x1FBE: mapChar = 0x0399; break;
+ case 0x2C65: mapChar = 0x023A; break;
+ case 0x2C66: mapChar = 0x023E; break;
+ case 0x2D00: mapChar = 0x10A0; break;
+ case 0x2D01: mapChar = 0x10A1; break;
+ case 0x2D02: mapChar = 0x10A2; break;
+ case 0x2D03: mapChar = 0x10A3; break;
+ case 0x2D04: mapChar = 0x10A4; break;
+ case 0x2D05: mapChar = 0x10A5; break;
+ case 0x2D06: mapChar = 0x10A6; break;
+ case 0x2D07: mapChar = 0x10A7; break;
+ case 0x2D08: mapChar = 0x10A8; break;
+ case 0x2D09: mapChar = 0x10A9; break;
+ case 0x2D0A: mapChar = 0x10AA; break;
+ case 0x2D0B: mapChar = 0x10AB; break;
+ case 0x2D0C: mapChar = 0x10AC; break;
+ case 0x2D0D: mapChar = 0x10AD; break;
+ case 0x2D0E: mapChar = 0x10AE; break;
+ case 0x2D0F: mapChar = 0x10AF; break;
+ case 0x2D10: mapChar = 0x10B0; break;
+ case 0x2D11: mapChar = 0x10B1; break;
+ case 0x2D12: mapChar = 0x10B2; break;
+ case 0x2D13: mapChar = 0x10B3; break;
+ case 0x2D14: mapChar = 0x10B4; break;
+ case 0x2D15: mapChar = 0x10B5; break;
+ case 0x2D16: mapChar = 0x10B6; break;
+ case 0x2D17: mapChar = 0x10B7; break;
+ case 0x2D18: mapChar = 0x10B8; break;
+ case 0x2D19: mapChar = 0x10B9; break;
+ case 0x2D1A: mapChar = 0x10BA; break;
+ case 0x2D1B: mapChar = 0x10BB; break;
+ case 0x2D1C: mapChar = 0x10BC; break;
+ case 0x2D1D: mapChar = 0x10BD; break;
+ case 0x2D1E: mapChar = 0x10BE; break;
+ case 0x2D1F: mapChar = 0x10BF; break;
+ case 0x2D20: mapChar = 0x10C0; break;
+ case 0x2D21: mapChar = 0x10C1; break;
+ case 0x2D22: mapChar = 0x10C2; break;
+ case 0x2D23: mapChar = 0x10C3; break;
+ case 0x2D24: mapChar = 0x10C4; break;
+ case 0x2D25: mapChar = 0x10C5; break;
+ case 0x2D27: mapChar = 0x10C7; break;
+ case 0x2D2D: mapChar = 0x10CD; break;
+ case 0xAB53: mapChar = 0xA7B3; break;
+ case 0xAB70: mapChar = 0x13A0; break;
+ case 0xAB71: mapChar = 0x13A1; break;
+ case 0xAB72: mapChar = 0x13A2; break;
+ case 0xAB73: mapChar = 0x13A3; break;
+ case 0xAB74: mapChar = 0x13A4; break;
+ case 0xAB75: mapChar = 0x13A5; break;
+ case 0xAB76: mapChar = 0x13A6; break;
+ case 0xAB77: mapChar = 0x13A7; break;
+ case 0xAB78: mapChar = 0x13A8; break;
+ case 0xAB79: mapChar = 0x13A9; break;
+ case 0xAB7A: mapChar = 0x13AA; break;
+ case 0xAB7B: mapChar = 0x13AB; break;
+ case 0xAB7C: mapChar = 0x13AC; break;
+ case 0xAB7D: mapChar = 0x13AD; break;
+ case 0xAB7E: mapChar = 0x13AE; break;
+ case 0xAB7F: mapChar = 0x13AF; break;
+ case 0xAB80: mapChar = 0x13B0; break;
+ case 0xAB81: mapChar = 0x13B1; break;
+ case 0xAB82: mapChar = 0x13B2; break;
+ case 0xAB83: mapChar = 0x13B3; break;
+ case 0xAB84: mapChar = 0x13B4; break;
+ case 0xAB85: mapChar = 0x13B5; break;
+ case 0xAB86: mapChar = 0x13B6; break;
+ case 0xAB87: mapChar = 0x13B7; break;
+ case 0xAB88: mapChar = 0x13B8; break;
+ case 0xAB89: mapChar = 0x13B9; break;
+ case 0xAB8A: mapChar = 0x13BA; break;
+ case 0xAB8B: mapChar = 0x13BB; break;
+ case 0xAB8C: mapChar = 0x13BC; break;
+ case 0xAB8D: mapChar = 0x13BD; break;
+ case 0xAB8E: mapChar = 0x13BE; break;
+ case 0xAB8F: mapChar = 0x13BF; break;
+ case 0xAB90: mapChar = 0x13C0; break;
+ case 0xAB91: mapChar = 0x13C1; break;
+ case 0xAB92: mapChar = 0x13C2; break;
+ case 0xAB93: mapChar = 0x13C3; break;
+ case 0xAB94: mapChar = 0x13C4; break;
+ case 0xAB95: mapChar = 0x13C5; break;
+ case 0xAB96: mapChar = 0x13C6; break;
+ case 0xAB97: mapChar = 0x13C7; break;
+ case 0xAB98: mapChar = 0x13C8; break;
+ case 0xAB99: mapChar = 0x13C9; break;
+ case 0xAB9A: mapChar = 0x13CA; break;
+ case 0xAB9B: mapChar = 0x13CB; break;
+ case 0xAB9C: mapChar = 0x13CC; break;
+ case 0xAB9D: mapChar = 0x13CD; break;
+ case 0xAB9E: mapChar = 0x13CE; break;
+ case 0xAB9F: mapChar = 0x13CF; break;
+ case 0xABA0: mapChar = 0x13D0; break;
+ case 0xABA1: mapChar = 0x13D1; break;
+ case 0xABA2: mapChar = 0x13D2; break;
+ case 0xABA3: mapChar = 0x13D3; break;
+ case 0xABA4: mapChar = 0x13D4; break;
+ case 0xABA5: mapChar = 0x13D5; break;
+ case 0xABA6: mapChar = 0x13D6; break;
+ case 0xABA7: mapChar = 0x13D7; break;
+ case 0xABA8: mapChar = 0x13D8; break;
+ case 0xABA9: mapChar = 0x13D9; break;
+ case 0xABAA: mapChar = 0x13DA; break;
+ case 0xABAB: mapChar = 0x13DB; break;
+ case 0xABAC: mapChar = 0x13DC; break;
+ case 0xABAD: mapChar = 0x13DD; break;
+ case 0xABAE: mapChar = 0x13DE; break;
+ case 0xABAF: mapChar = 0x13DF; break;
+ case 0xABB0: mapChar = 0x13E0; break;
+ case 0xABB1: mapChar = 0x13E1; break;
+ case 0xABB2: mapChar = 0x13E2; break;
+ case 0xABB3: mapChar = 0x13E3; break;
+ case 0xABB4: mapChar = 0x13E4; break;
+ case 0xABB5: mapChar = 0x13E5; break;
+ case 0xABB6: mapChar = 0x13E6; break;
+ case 0xABB7: mapChar = 0x13E7; break;
+ case 0xABB8: mapChar = 0x13E8; break;
+ case 0xABB9: mapChar = 0x13E9; break;
+ case 0xABBA: mapChar = 0x13EA; break;
+ case 0xABBB: mapChar = 0x13EB; break;
+ case 0xABBC: mapChar = 0x13EC; break;
+ case 0xABBD: mapChar = 0x13ED; break;
+ case 0xABBE: mapChar = 0x13EE; break;
+ case 0xABBF: mapChar = 0x13EF; break;
default : mapChar = Character.ERROR; break;
}
}