--- a/jdk/make/data/characterdata/CharacterData01.java.template Tue Jul 14 16:29:08 2015 -0700
+++ b/jdk/make/data/characterdata/CharacterData01.java.template Wed Jul 15 11:05:51 2015 +0900
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -244,81 +244,118 @@
case 0x10132: retval = 80000; break; // AEGEAN NUMBER EIGHTY THOUSAND
case 0x10133: retval = 90000; break; // AEGEAN NUMBER NINETY THOUSAND
case 0x10323: retval = 50; break; // OLD ITALIC NUMERAL FIFTY
-
- case 0x010144: retval = 50; break; // ACROPHONIC ATTIC FIFTY
- case 0x010145: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED
- case 0x010146: retval = 5000; break; // ACROPHONIC ATTIC FIVE THOUSAND
- case 0x010147: retval = 50000; break; // ACROPHONIC ATTIC FIFTY THOUSAND
- case 0x01014A: retval = 50; break; // ACROPHONIC ATTIC FIFTY TALENTS
- case 0x01014B: retval = 100; break; // ACROPHONIC ATTIC ONE HUNDRED TALENTS
- case 0x01014C: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED TALENTS
- case 0x01014D: retval = 1000; break; // ACROPHONIC ATTIC ONE THOUSAND TALENTS
- case 0x01014E: retval = 5000; break; // ACROPHONIC ATTIC FIVE THOUSAND TALENTS
- case 0x010151: retval = 50; break; // ACROPHONIC ATTIC FIFTY STATERS
- case 0x010152: retval = 100; break; // ACROPHONIC ATTIC ONE HUNDRED STATERS
- case 0x010153: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED STATERS
- case 0x010154: retval = 1000; break; // ACROPHONIC ATTIC ONE THOUSAND STATERS
- case 0x010155: retval = 10000; break; // ACROPHONIC ATTIC TEN THOUSAND STATERS
- case 0x010156: retval = 50000; break; // ACROPHONIC ATTIC FIFTY THOUSAND STATERS
- case 0x010166: retval = 50; break; // ACROPHONIC TROEZENIAN FIFTY
- case 0x010167: retval = 50; break; // ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM
- case 0x010168: retval = 50; break; // ACROPHONIC HERMIONIAN FIFTY
- case 0x010169: retval = 50; break; // ACROPHONIC THESPIAN FIFTY
- case 0x01016A: retval = 100; break; // ACROPHONIC THESPIAN ONE HUNDRED
- case 0x01016B: retval = 300; break; // ACROPHONIC THESPIAN THREE HUNDRED
- case 0x01016C: retval = 500; break; // ACROPHONIC EPIDAUREAN FIVE HUNDRED
- case 0x01016D: retval = 500; break; // ACROPHONIC TROEZENIAN FIVE HUNDRED
- case 0x01016E: retval = 500; break; // ACROPHONIC THESPIAN FIVE HUNDRED
- case 0x01016F: retval = 500; break; // ACROPHONIC CARYSTIAN FIVE HUNDRED
- case 0x010170: retval = 500; break; // ACROPHONIC NAXIAN FIVE HUNDRED
- case 0x010171: retval = 1000; break; // ACROPHONIC THESPIAN ONE THOUSAND
- case 0x010172: retval = 5000; break; // ACROPHONIC THESPIAN FIVE THOUSAND
- case 0x010174: retval = 50; break; // ACROPHONIC STRATIAN FIFTY MNAS
- case 0x010341: retval = 90; break; // GOTHIC LETTER NINETY
- case 0x01034A: retval = 900; break; // GOTHIC LETTER NINE HUNDRED
- case 0x0103D5: retval = 100; break; // OLD PERSIAN NUMBER HUNDRED
- case 0x01085D: retval = 100; break; // IMPERIAL ARAMAIC NUMBER ONE HUNDRED
- case 0x01085E: retval = 1000; break; // IMPERIAL ARAMAIC NUMBER ONE THOUSAND
- case 0x01085F: retval = 10000; break; // IMPERIAL ARAMAIC NUMBER TEN THOUSAND
- case 0x010919: retval = 100; break; // PHOENICIAN NUMBER ONE HUNDRED
- case 0x010A46: retval = 100; break; // KHAROSHTHI NUMBER ONE HUNDRED
- case 0x010A47: retval = 1000; break; // KHAROSHTHI NUMBER ONE THOUSAND
- case 0x010A7E: retval = 50; break; // OLD SOUTH ARABIAN NUMBER FIFTY
- case 0x010B5E: retval = 100; break; // INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED
- case 0x010B5F: retval = 1000; break; // INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
- case 0x010B7E: retval = 100; break; // INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED
- case 0x010B7F: retval = 1000; break; // INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
- case 0x010E6C: retval = 40; break; // RUMI NUMBER FORTY
- case 0x010E6D: retval = 50; break; // RUMI NUMBER FIFTY
- case 0x010E6E: retval = 60; break; // RUMI NUMBER SIXTY
- case 0x010E6F: retval = 70; break; // RUMI NUMBER SEVENTY
- case 0x010E70: retval = 80; break; // RUMI NUMBER EIGHTY
- case 0x010E71: retval = 90; break; // RUMI NUMBER NINETY
- case 0x010E72: retval = 100; break; // RUMI NUMBER ONE HUNDRED
- case 0x010E73: retval = 200; break; // RUMI NUMBER TWO HUNDRED
- case 0x010E74: retval = 300; break; // RUMI NUMBER THREE HUNDRED
- case 0x010E75: retval = 400; break; // RUMI NUMBER FOUR HUNDRED
- case 0x010E76: retval = 500; break; // RUMI NUMBER FIVE HUNDRED
- case 0x010E77: retval = 600; break; // RUMI NUMBER SIX HUNDRED
- case 0x010E78: retval = 700; break; // RUMI NUMBER SEVEN HUNDRED
- case 0x010E79: retval = 800; break; // RUMI NUMBER EIGHT HUNDRED
- case 0x010E7A: retval = 900; break; // RUMI NUMBER NINE HUNDRED
- case 0x01105E: retval = 40; break; // BRAHMI NUMBER FORTY
- case 0x01105F: retval = 50; break; // BRAHMI NUMBER FIFTY
- case 0x011060: retval = 60; break; // BRAHMI NUMBER SIXTY
- case 0x011061: retval = 70; break; // BRAHMI NUMBER SEVENTY
- case 0x011062: retval = 80; break; // BRAHMI NUMBER EIGHTY
- case 0x011063: retval = 90; break; // BRAHMI NUMBER NINETY
- case 0x011064: retval = 100; break; // BRAHMI NUMBER ONE HUNDRED
- case 0x011065: retval = 1000; break; // BRAHMI NUMBER ONE THOUSAND
- case 0x012432: retval = 216000; break; // CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH
- case 0x012433: retval = 432000; break; // CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN
- case 0x01D36C: retval = 40; break; // COUNTING ROD TENS DIGIT FOUR
- case 0x01D36D: retval = 50; break; // COUNTING ROD TENS DIGIT FIVE
- case 0x01D36E: retval = 60; break; // COUNTING ROD TENS DIGIT SIX
- case 0x01D36F: retval = 70; break; // COUNTING ROD TENS DIGIT SEVEN
- case 0x01D370: retval = 80; break; // COUNTING ROD TENS DIGIT EIGHT
- case 0x01D371: retval = 90; break; // COUNTING ROD TENS DIGIT NINE
+ case 0x10144: retval = 50; break; // ACROPHONIC ATTIC FIFTY
+ case 0x10145: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED
+ case 0x10146: retval = 5000; break; // ACROPHONIC ATTIC FIVE THOUSAND
+ case 0x10147: retval = 50000; break; // ACROPHONIC ATTIC FIFTY THOUSAND
+ case 0x1014A: retval = 50; break; // ACROPHONIC ATTIC FIFTY TALENTS
+ case 0x1014B: retval = 100; break; // ACROPHONIC ATTIC ONE HUNDRED TALENTS
+ case 0x1014C: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED TALENTS
+ case 0x1014D: retval = 1000; break; // ACROPHONIC ATTIC ONE THOUSAND TALENTS
+ case 0x1014E: retval = 5000; break; // ACROPHONIC ATTIC FIVE THOUSAND TALENTS
+ case 0x10151: retval = 50; break; // ACROPHONIC ATTIC FIFTY STATERS
+ case 0x10152: retval = 100; break; // ACROPHONIC ATTIC ONE HUNDRED STATERS
+ case 0x10153: retval = 500; break; // ACROPHONIC ATTIC FIVE HUNDRED STATERS
+ case 0x10154: retval = 1000; break; // ACROPHONIC ATTIC ONE THOUSAND STATERS
+ case 0x10155: retval = 10000; break; // ACROPHONIC ATTIC TEN THOUSAND STATERS
+ case 0x10156: retval = 50000; break; // ACROPHONIC ATTIC FIFTY THOUSAND STATERS
+ case 0x10166: retval = 50; break; // ACROPHONIC TROEZENIAN FIFTY
+ case 0x10167: retval = 50; break; // ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM
+ case 0x10168: retval = 50; break; // ACROPHONIC HERMIONIAN FIFTY
+ case 0x10169: retval = 50; break; // ACROPHONIC THESPIAN FIFTY
+ case 0x1016A: retval = 100; break; // ACROPHONIC THESPIAN ONE HUNDRED
+ case 0x1016B: retval = 300; break; // ACROPHONIC THESPIAN THREE HUNDRED
+ case 0x1016C: retval = 500; break; // ACROPHONIC EPIDAUREAN FIVE HUNDRED
+ case 0x1016D: retval = 500; break; // ACROPHONIC TROEZENIAN FIVE HUNDRED
+ case 0x1016E: retval = 500; break; // ACROPHONIC THESPIAN FIVE HUNDRED
+ case 0x1016F: retval = 500; break; // ACROPHONIC CARYSTIAN FIVE HUNDRED
+ case 0x10170: retval = 500; break; // ACROPHONIC NAXIAN FIVE HUNDRED
+ case 0x10171: retval = 1000; break; // ACROPHONIC THESPIAN ONE THOUSAND
+ case 0x10172: retval = 5000; break; // ACROPHONIC THESPIAN FIVE THOUSAND
+ case 0x10174: retval = 50; break; // ACROPHONIC STRATIAN FIFTY MNAS
+ case 0x102ED: retval = 40; break; // COPTIC EPACT NUMBER FORTY
+ case 0x102EE: retval = 50; break; // COPTIC EPACT NUMBER FIFTY
+ case 0x102EF: retval = 60; break; // COPTIC EPACT NUMBER SIXTY
+ case 0x102F0: retval = 70; break; // COPTIC EPACT NUMBER SEVENTY
+ case 0x102F1: retval = 80; break; // COPTIC EPACT NUMBER EIGHTY
+ case 0x102F2: retval = 90; break; // COPTIC EPACT NUMBER NINETY
+ case 0x102F3: retval = 100; break; // COPTIC EPACT NUMBER ONE HUNDRED
+ case 0x102F4: retval = 200; break; // COPTIC EPACT NUMBER TWO HUNDRED
+ case 0x102F5: retval = 300; break; // COPTIC EPACT NUMBER THREE HUNDRED
+ case 0x102F6: retval = 400; break; // COPTIC EPACT NUMBER FOUR HUNDRED
+ case 0x102F7: retval = 500; break; // COPTIC EPACT NUMBER FIVE HUNDRED
+ case 0x102F8: retval = 600; break; // COPTIC EPACT NUMBER SIX HUNDRED
+ case 0x102F9: retval = 700; break; // COPTIC EPACT NUMBER SEVEN HUNDRED
+ case 0x102FA: retval = 800; break; // COPTIC EPACT NUMBER EIGHT HUNDRED
+ case 0x102FB: retval = 900; break; // COPTIC EPACT NUMBER NINE HUNDRED
+ case 0x10341: retval = 90; break; // GOTHIC LETTER NINETY
+ case 0x1034A: retval = 900; break; // GOTHIC LETTER NINE HUNDRED
+ case 0x103D5: retval = 100; break; // OLD PERSIAN NUMBER HUNDRED
+ case 0x1085D: retval = 100; break; // IMPERIAL ARAMAIC NUMBER ONE HUNDRED
+ case 0x1085E: retval = 1000; break; // IMPERIAL ARAMAIC NUMBER ONE THOUSAND
+ case 0x1085F: retval = 10000; break; // IMPERIAL ARAMAIC NUMBER TEN THOUSAND
+ case 0x108AF: retval = 100; break; // NABATAEAN NUMBER ONE HUNDRED
+ case 0x10919: retval = 100; break; // PHOENICIAN NUMBER ONE HUNDRED
+ case 0x10A46: retval = 100; break; // KHAROSHTHI NUMBER ONE HUNDRED
+ case 0x10A47: retval = 1000; break; // KHAROSHTHI NUMBER ONE THOUSAND
+ case 0x10A7E: retval = 50; break; // OLD SOUTH ARABIAN NUMBER FIFTY
+ case 0x10AEF: retval = 100; break; // MANICHAEAN NUMBER ONE HUNDRED
+ case 0x10B5E: retval = 100; break; // INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED
+ case 0x10B5F: retval = 1000; break; // INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
+ case 0x10B7E: retval = 100; break; // INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED
+ case 0x10B7F: retval = 1000; break; // INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
+ case 0x10BAF: retval = 100; break; // PSALTER PAHLAVI NUMBER ONE HUNDRED
+ case 0x10E6C: retval = 40; break; // RUMI NUMBER FORTY
+ case 0x10E6D: retval = 50; break; // RUMI NUMBER FIFTY
+ case 0x10E6E: retval = 60; break; // RUMI NUMBER SIXTY
+ case 0x10E6F: retval = 70; break; // RUMI NUMBER SEVENTY
+ case 0x10E70: retval = 80; break; // RUMI NUMBER EIGHTY
+ case 0x10E71: retval = 90; break; // RUMI NUMBER NINETY
+ case 0x10E72: retval = 100; break; // RUMI NUMBER ONE HUNDRED
+ case 0x10E73: retval = 200; break; // RUMI NUMBER TWO HUNDRED
+ case 0x10E74: retval = 300; break; // RUMI NUMBER THREE HUNDRED
+ case 0x10E75: retval = 400; break; // RUMI NUMBER FOUR HUNDRED
+ case 0x10E76: retval = 500; break; // RUMI NUMBER FIVE HUNDRED
+ case 0x10E77: retval = 600; break; // RUMI NUMBER SIX HUNDRED
+ case 0x10E78: retval = 700; break; // RUMI NUMBER SEVEN HUNDRED
+ case 0x10E79: retval = 800; break; // RUMI NUMBER EIGHT HUNDRED
+ case 0x10E7A: retval = 900; break; // RUMI NUMBER NINE HUNDRED
+ case 0x1105E: retval = 40; break; // BRAHMI NUMBER FORTY
+ case 0x1105F: retval = 50; break; // BRAHMI NUMBER FIFTY
+ case 0x11060: retval = 60; break; // BRAHMI NUMBER SIXTY
+ case 0x11061: retval = 70; break; // BRAHMI NUMBER SEVENTY
+ case 0x11062: retval = 80; break; // BRAHMI NUMBER EIGHTY
+ case 0x11063: retval = 90; break; // BRAHMI NUMBER NINETY
+ case 0x11064: retval = 100; break; // BRAHMI NUMBER ONE HUNDRED
+ case 0x11065: retval = 1000; break; // BRAHMI NUMBER ONE THOUSAND
+ case 0x111ED: retval = 40; break; // SINHALA ARCHAIC NUMBER FORTY
+ case 0x111EE: retval = 50; break; // SINHALA ARCHAIC NUMBER FIFTY
+ case 0x111EF: retval = 60; break; // SINHALA ARCHAIC NUMBER SIXTY
+ case 0x111F0: retval = 70; break; // SINHALA ARCHAIC NUMBER SEVENTY
+ case 0x111F1: retval = 80; break; // SINHALA ARCHAIC NUMBER EIGHTY
+ case 0x111F2: retval = 90; break; // SINHALA ARCHAIC NUMBER NINETY
+ case 0x111F3: retval = 100; break; // SINHALA ARCHAIC NUMBER ONE HUNDRED
+ case 0x111F4: retval = 1000; break; // SINHALA ARCHAIC NUMBER ONE THOUSAND
+ case 0x118ED: retval = 40; break; // WARANG CITI NUMBER FORTY
+ case 0x118EE: retval = 50; break; // WARANG CITI NUMBER FIFTY
+ case 0x118EF: retval = 60; break; // WARANG CITI NUMBER SIXTY
+ case 0x118F0: retval = 70; break; // WARANG CITI NUMBER SEVENTY
+ case 0x118F1: retval = 80; break; // WARANG CITI NUMBER EIGHTY
+ case 0x118F2: retval = 90; break; // WARANG CITI NUMBER NINETY
+ case 0x12432: retval = 216000; break; // CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH
+ case 0x12433: retval = 432000; break; // CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN
+ case 0x12467: retval = 40; break; // CUNEIFORM NUMERIC SIGN ELAMITE FORTY
+ case 0x12468: retval = 50; break; // CUNEIFORM NUMERIC SIGN ELAMITE FIFTY
+ case 0x16B5C: retval = 100; break; // PAHAWH HMONG NUMBER HUNDREDS
+ case 0x16B5D: retval = 10000; break; // PAHAWH HMONG NUMBER TEN THOUSANDS
+ case 0x16B5E: retval = 1000000; break; // PAHAWH HMONG NUMBER MILLIONS
+ case 0x16B5F: retval = 100000000; break;// PAHAWH HMONG NUMBER HUNDRED MILLIONS
+ case 0x1D36C: retval = 40; break; // COUNTING ROD TENS DIGIT FOUR
+ case 0x1D36D: retval = 50; break; // COUNTING ROD TENS DIGIT FIVE
+ case 0x1D36E: retval = 60; break; // COUNTING ROD TENS DIGIT SIX
+ case 0x1D36F: retval = 70; break; // COUNTING ROD TENS DIGIT SEVEN
+ case 0x1D370: retval = 80; break; // COUNTING ROD TENS DIGIT EIGHT
+ case 0x1D371: retval = 90; break; // COUNTING ROD TENS DIGIT NINE
default: retval = -2; break;
}