From 271e3be381caeda89b33a8ba2b1c6f705d5379c4 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Thu, 4 Oct 2018 14:12:34 -0700 Subject: [PATCH] 8211398: Square character support for the Japanese new era Reviewed-by: rriggs --- make/data/unicodedata/UnicodeData.txt | 1 + .../share/classes/java/lang/Character.java | 4 ++-- test/jdk/java/lang/Character/Scripts.txt | 1 + test/jdk/java/lang/Character/UnicodeData.txt | 1 + test/jdk/java/lang/Character/charprop00.bin | Bin 1048617 -> 1048617 bytes 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/make/data/unicodedata/UnicodeData.txt b/make/data/unicodedata/UnicodeData.txt index d89c64f526a..e9814761e70 100644 --- a/make/data/unicodedata/UnicodeData.txt +++ b/make/data/unicodedata/UnicodeData.txt @@ -11729,6 +11729,7 @@ 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; +32FF;SQUARE ERA NAME NEWERA;So;0;L; 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;; 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java index f655f89165e..0ed379442f6 100644 --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -5385,7 +5385,7 @@ class Character implements java.io.Serializable, Comparable { 0x3260, // 3260..327E; HANGUL 0x327F, // 327F..32CF; COMMON 0x32D0, // 32D0..32FE; KATAKANA - 0x32FF, // 32FF ; UNKNOWN + 0x32FF, // 32FF ; COMMON 0x3300, // 3300..3357; KATAKANA 0x3358, // 3358..33FF; COMMON 0x3400, // 3400..4DB5; HAN @@ -6902,7 +6902,7 @@ class Character implements java.io.Serializable, Comparable { HANGUL, // 3260..327E COMMON, // 327F..32CF KATAKANA, // 32D0..32FE - UNKNOWN, // 32FF + COMMON, // 32FF KATAKANA, // 3300..3357 COMMON, // 3358..33FF HAN, // 3400..4DB5 diff --git a/test/jdk/java/lang/Character/Scripts.txt b/test/jdk/java/lang/Character/Scripts.txt index 80430b32a8f..794ef91a888 100644 --- a/test/jdk/java/lang/Character/Scripts.txt +++ b/test/jdk/java/lang/Character/Scripts.txt @@ -402,6 +402,7 @@ 328A..32B0 ; Common # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT 32B1..32BF ; Common # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY 32C0..32CF ; Common # So [16] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..LIMITED LIABILITY SIGN +32FF ; Common # So SQUARE ERA NAME NEWERA 3358..33FF ; Common # So [168] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..SQUARE GAL 4DC0..4DFF ; Common # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION A700..A716 ; Common # Sk [23] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR diff --git a/test/jdk/java/lang/Character/UnicodeData.txt b/test/jdk/java/lang/Character/UnicodeData.txt index d89c64f526a..e9814761e70 100644 --- a/test/jdk/java/lang/Character/UnicodeData.txt +++ b/test/jdk/java/lang/Character/UnicodeData.txt @@ -11729,6 +11729,7 @@ 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; +32FF;SQUARE ERA NAME NEWERA;So;0;L; 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;; 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; diff --git a/test/jdk/java/lang/Character/charprop00.bin b/test/jdk/java/lang/Character/charprop00.bin index fb3f2658b3aefc78ffc60ac54a6bf436bee71bfe..5174850ce6992b53bcbac8c3359ce8b45b4f5009 100644 GIT binary patch delta 87 zcmZ44;IOj6fpg7U2G$Y=ZbPF+&Q?ywR!*j^oXnyI%uF0I?TQA>K+FQftU$~L#Oy%K a0mPg@%mu{UK+FTgygK+FQftU$~L#Oy%K a0mPg@%mu{UK+FTgyg