mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-96 updated Japanese collation rules
X-SVN-Rev: 3173
This commit is contained in:
Vladimir Weinstein
parent
2aa5f518e8
commit
5f54a34a05
4 changed files with 122 additions and 28 deletions
|
|
@ -14,17 +14,60 @@ ja {
|
|||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
"<\u309C<\u309D,\u30FD<\u309E,\u30FE& Z <\u3042,\u3041,\u30A2,\u30A1<\u3044,\u3043"
|
||||
",\u30A4,\u30A3<\u3046,\u3045,\u30A6,\u30A5<\u3048,\u3047,\u30A8,\u30A7<\u304A,\u3049"
|
||||
",\u30AA,\u30A9<\u304B,\u30AB,\u30F5<\u304D,\u30AD<\u304F,\u30AF<\u3051,\u30B1,\u30F6"
|
||||
"<\u3053,\u30B3<\u3055,\u30B5<\u3057,\u30B7<\u3059,\u30B9<\u305B,\u30BB<\u305D,\u30BD"
|
||||
"<\u305F,\u30BF<\u3061,\u30C1<\u3064,\u3063,\u30C4,\u30C3<\u3066,\u30C6<\u3068,\u30C8"
|
||||
"<\u306A,\u30CA<\u306B,\u30CB<\u306C,\u30CC<\u306D,\u30CD<\u306E,\u30CE<\u306F,\u30CF"
|
||||
"<\u3072,\u30D2<\u3075,\u30D5<\u3078,\u30D8<\u307B,\u30DB<\u307E,\u30DE<\u307F,\u30DF"
|
||||
"<\u3080,\u30E0<\u3081,\u30E1<\u3082,\u30E2<\u3084,\u3083,\u30E4,\u30E3<\u3086,\u3085"
|
||||
",\u30E6,\u30E5<\u3088,\u3087,\u30E8,\u30E7<\u3089,\u30E9<\u308A,\u30EA<\u308B,\u30EB"
|
||||
"<\u308C,\u30EC<\u308D,\u30ED<\u308F,\u308E,\u30EF,\u30EE<\u3090,\u30F0<\u3091,\u30F1"
|
||||
"<\u3092,\u30F2<\u3093,\u30F3&\u30A2\u30A2 ,\u30A2\u30FC&\u30A1\u30A2 ,\u30A1\u30FC"
|
||||
"<\u309C"
|
||||
"<\u309D,\u30FD"
|
||||
"<\u309E,\u30FE"
|
||||
"& Z "
|
||||
"<\u30A1,\u3041,\u30A2,\u3042" //"<\u3042,\u3041,\u30A2,\u30A1"
|
||||
"<\u30A3,\u3043,\u30A4,\u3044" //"<\u3044,\u3043,\u30A4,\u30A3"
|
||||
"<\u30A5,\u3045,\u30A6,\u3046" //"<\u3046,\u3045,\u30A6,\u30A5"
|
||||
"<\u30A7,\u3047,\u30A8,\u3048" //"<\u3048,\u3047,\u30A8,\u30A7"
|
||||
"<\u30A9,\u3049,\u30AA,\u304A" //"<\u304A,\u3049,\u30AA,\u30A9"
|
||||
"<\u30F5,\u30AB,\u304B " //"<\u304B,\u30AB,\u30F5"
|
||||
"<\u30AD,\u304D" //"<\u304D,\u30AD"
|
||||
"<\u30AF,\u304F" //"<\u304F,\u30AF"
|
||||
"<\u30F6,\u30B1,\u3051" //"<\u3051,\u30B1,\u30F6"
|
||||
"<\u30B3,\u3053" //"<\u3053,\u30B3"
|
||||
"<\u30B5,\u3055" //"<\u3055,\u30B5"
|
||||
"<\u30B7,\u3057" //"<\u3057,\u30B7"
|
||||
"<\u30B9,\u3059" //"<\u3059,\u30B9"
|
||||
"<\u30BB,\u305B" //"<\u305B,\u30BB"
|
||||
"<\u30BD,\u305D" //"<\u305D,\u30BD"
|
||||
"<\u30BF,\u305F" //"<\u305F,\u30BF"
|
||||
"<\u30C1,\u3061" //"<\u3061,\u30C1"
|
||||
"<\u30C3,\u3063,\u30C4,\u3064" //"<\u3064,\u3063,\u30C4,\u30C3"
|
||||
"<\u30C6,\u3066" //"<\u3066,\u30C6"
|
||||
"<\u30C8,\u3068" //"<\u3068,\u30C8"
|
||||
"<\u30CA,\u306A" //"<\u306A,\u30CA"
|
||||
"<\u30CB,\u306B" //"<\u306B,\u30CB"
|
||||
"<\u30CC,\u306C" //"<\u306C,\u30CC"
|
||||
"<\u30CD,\u306D" //"<\u306D,\u30CD"
|
||||
"<\u30CE,\u306E" //"<\u306E,\u30CE"
|
||||
"<\u30CF,\u306F" //"<\u306F,\u30CF"
|
||||
"<\u30D2,\u3072" //"<\u3072,\u30D2"
|
||||
"<\u30D5,\u3075" //"<\u3075,\u30D5"
|
||||
"<\u30D8,\u3078" //"<\u3078,\u30D8"
|
||||
"<\u30DB,\u307B" //"<\u307B,\u30DB"
|
||||
"<\u30DE,\u307E" //"<\u307E,\u30DE"
|
||||
"<\u30DF,\u307F" //"<\u307F,\u30DF"
|
||||
"<\u30E0,\u3080" //"<\u3080,\u30E0"
|
||||
"<\u30E1,\u3081" //"<\u3081,\u30E1"
|
||||
"<\u30E2,\u3082" //"<\u3082,\u30E2"
|
||||
"<\u30E3,\u3083,\u30E4,\u3084 " //"<\u3084,\u3083,\u30E4,\u30E3"
|
||||
"<\u30E5,\u3085,\u30E6,\u3086" //"<\u3086,\u3085,\u30E6,\u30E5"
|
||||
"<\u30E7,\u3087,\u30E8,\u3088" //"<\u3088,\u3087,\u30E8,\u30E7"
|
||||
"<\u30E9,\u3089" //"<\u3089,\u30E9"
|
||||
"<\u30EA,\u308A" //"<\u308A,\u30EA"
|
||||
"<\u30EB,\u308B" //"<\u308B,\u30EB"
|
||||
"<\u30EC,\u308C" //"<\u308C,\u30EC"
|
||||
"<\u30ED,\u308D" //"<\u308D,\u30ED"
|
||||
"<\u30EE,\u308E,\u30EF,\u308F" //"<\u308F,\u308E,\u30EF,\u30EE"
|
||||
"<\u30F0,\u3090" //"<\u3090,\u30F0"
|
||||
"<\u30F1,\u3091" //"<\u3091,\u30F1"
|
||||
"<\u30F2,\u3092" //"<\u3092,\u30F2"
|
||||
"<\u30F3,\u3093" //"<\u3093,\u30F3"
|
||||
// end of changes, except one below\u2026
|
||||
"&\u30A2\u30A2 ,\u30A2\u30FC&\u30A1\u30A2 ,\u30A1\u30FC"
|
||||
"&\u30A4\u30A4 ,\u30A4\u30FC&\u30A3\u30A4 ,\u30A3\u30FC&\u30A6\u30A6 ,\u30A6\u30FC"
|
||||
"&\u30A5\u30A6 ,\u30A5\u30FC&\u30A8\u30A8 ,\u30A8\u30FC&\u30A7\u30A8 ,\u30A7\u30FC"
|
||||
"&\u30AA\u30AA ,\u30AA\u30FC&\u30A9\u30AA ,\u30A9\u30FC&\u30AB\u30A2 ,\u30AB\u30FC"
|
||||
|
|
@ -57,7 +100,11 @@ ja {
|
|||
"\u30F0\u3099\u30A4 ,\u30F0\u3099\u30FC&\u30F1\u3099\u30A8 ,\u30F1\u3099\u30FC&\u30F2"
|
||||
"\u3099\u30AA ,\u30F2\u3099\u30FC&\u30CF\u309A\u30A2 ,\u30CF\u309A\u30FC&\u30D2\u309A"
|
||||
"\u30A4 ,\u30D2\u309A\u30FC&\u30D5\u309A\u30A6 ,\u30D5\u309A\u30FC&\u30D8\u309A\u30A8"
|
||||
" ,\u30D8\u309A\u30FC&\u30DB\u309A\u30AA ,\u30DB\u309A\u30FC& \u30F3 <\u3001 <\u3002"
|
||||
" ,\u30D8\u309A\u30FC&\u30DB\u309A\u30AA ,\u30DB\u309A\u30FC"
|
||||
// the last change
|
||||
"& \u3093" //"& \u30F3"
|
||||
|
||||
" <\u3001 <\u3002"
|
||||
" <\u30FB <\u3003 <\u4EDD <\u3005 <\u3006 <\u3007 <\u30FC <\u2014 <\u2010 <\u301C"
|
||||
" <\u2016 <\u2026 <\u2025 <\u2018 <\u2019 <\u201C <\u201D <\u3014 <\u3015 <\u3008"
|
||||
" <\u3009 <\u300A <\u300B <\u300C <\u300D <\u300E <\u300F <\u3010 <\u3011 <\u2212"
|
||||
|
|
|
|||
|
|
@ -14,17 +14,60 @@ ja {
|
|||
Version { "1.0" }
|
||||
Override { "FALSE" }
|
||||
Sequence { "&\u0486;\u30FC;\u3099;\u309A;\u30FB,\u303F&\u2212 <\u309B"
|
||||
"<\u309C<\u309D,\u30FD<\u309E,\u30FE& Z <\u3042,\u3041,\u30A2,\u30A1<\u3044,\u3043"
|
||||
",\u30A4,\u30A3<\u3046,\u3045,\u30A6,\u30A5<\u3048,\u3047,\u30A8,\u30A7<\u304A,\u3049"
|
||||
",\u30AA,\u30A9<\u304B,\u30AB,\u30F5<\u304D,\u30AD<\u304F,\u30AF<\u3051,\u30B1,\u30F6"
|
||||
"<\u3053,\u30B3<\u3055,\u30B5<\u3057,\u30B7<\u3059,\u30B9<\u305B,\u30BB<\u305D,\u30BD"
|
||||
"<\u305F,\u30BF<\u3061,\u30C1<\u3064,\u3063,\u30C4,\u30C3<\u3066,\u30C6<\u3068,\u30C8"
|
||||
"<\u306A,\u30CA<\u306B,\u30CB<\u306C,\u30CC<\u306D,\u30CD<\u306E,\u30CE<\u306F,\u30CF"
|
||||
"<\u3072,\u30D2<\u3075,\u30D5<\u3078,\u30D8<\u307B,\u30DB<\u307E,\u30DE<\u307F,\u30DF"
|
||||
"<\u3080,\u30E0<\u3081,\u30E1<\u3082,\u30E2<\u3084,\u3083,\u30E4,\u30E3<\u3086,\u3085"
|
||||
",\u30E6,\u30E5<\u3088,\u3087,\u30E8,\u30E7<\u3089,\u30E9<\u308A,\u30EA<\u308B,\u30EB"
|
||||
"<\u308C,\u30EC<\u308D,\u30ED<\u308F,\u308E,\u30EF,\u30EE<\u3090,\u30F0<\u3091,\u30F1"
|
||||
"<\u3092,\u30F2<\u3093,\u30F3&\u30A2\u30A2 ,\u30A2\u30FC&\u30A1\u30A2 ,\u30A1\u30FC"
|
||||
"<\u309C"
|
||||
"<\u309D,\u30FD"
|
||||
"<\u309E,\u30FE"
|
||||
"& Z "
|
||||
"<\u30A1,\u3041,\u30A2,\u3042" //"<\u3042,\u3041,\u30A2,\u30A1"
|
||||
"<\u30A3,\u3043,\u30A4,\u3044" //"<\u3044,\u3043,\u30A4,\u30A3"
|
||||
"<\u30A5,\u3045,\u30A6,\u3046" //"<\u3046,\u3045,\u30A6,\u30A5"
|
||||
"<\u30A7,\u3047,\u30A8,\u3048" //"<\u3048,\u3047,\u30A8,\u30A7"
|
||||
"<\u30A9,\u3049,\u30AA,\u304A" //"<\u304A,\u3049,\u30AA,\u30A9"
|
||||
"<\u30F5,\u30AB,\u304B " //"<\u304B,\u30AB,\u30F5"
|
||||
"<\u30AD,\u304D" //"<\u304D,\u30AD"
|
||||
"<\u30AF,\u304F" //"<\u304F,\u30AF"
|
||||
"<\u30F6,\u30B1,\u3051" //"<\u3051,\u30B1,\u30F6"
|
||||
"<\u30B3,\u3053" //"<\u3053,\u30B3"
|
||||
"<\u30B5,\u3055" //"<\u3055,\u30B5"
|
||||
"<\u30B7,\u3057" //"<\u3057,\u30B7"
|
||||
"<\u30B9,\u3059" //"<\u3059,\u30B9"
|
||||
"<\u30BB,\u305B" //"<\u305B,\u30BB"
|
||||
"<\u30BD,\u305D" //"<\u305D,\u30BD"
|
||||
"<\u30BF,\u305F" //"<\u305F,\u30BF"
|
||||
"<\u30C1,\u3061" //"<\u3061,\u30C1"
|
||||
"<\u30C3,\u3063,\u30C4,\u3064" //"<\u3064,\u3063,\u30C4,\u30C3"
|
||||
"<\u30C6,\u3066" //"<\u3066,\u30C6"
|
||||
"<\u30C8,\u3068" //"<\u3068,\u30C8"
|
||||
"<\u30CA,\u306A" //"<\u306A,\u30CA"
|
||||
"<\u30CB,\u306B" //"<\u306B,\u30CB"
|
||||
"<\u30CC,\u306C" //"<\u306C,\u30CC"
|
||||
"<\u30CD,\u306D" //"<\u306D,\u30CD"
|
||||
"<\u30CE,\u306E" //"<\u306E,\u30CE"
|
||||
"<\u30CF,\u306F" //"<\u306F,\u30CF"
|
||||
"<\u30D2,\u3072" //"<\u3072,\u30D2"
|
||||
"<\u30D5,\u3075" //"<\u3075,\u30D5"
|
||||
"<\u30D8,\u3078" //"<\u3078,\u30D8"
|
||||
"<\u30DB,\u307B" //"<\u307B,\u30DB"
|
||||
"<\u30DE,\u307E" //"<\u307E,\u30DE"
|
||||
"<\u30DF,\u307F" //"<\u307F,\u30DF"
|
||||
"<\u30E0,\u3080" //"<\u3080,\u30E0"
|
||||
"<\u30E1,\u3081" //"<\u3081,\u30E1"
|
||||
"<\u30E2,\u3082" //"<\u3082,\u30E2"
|
||||
"<\u30E3,\u3083,\u30E4,\u3084 " //"<\u3084,\u3083,\u30E4,\u30E3"
|
||||
"<\u30E5,\u3085,\u30E6,\u3086" //"<\u3086,\u3085,\u30E6,\u30E5"
|
||||
"<\u30E7,\u3087,\u30E8,\u3088" //"<\u3088,\u3087,\u30E8,\u30E7"
|
||||
"<\u30E9,\u3089" //"<\u3089,\u30E9"
|
||||
"<\u30EA,\u308A" //"<\u308A,\u30EA"
|
||||
"<\u30EB,\u308B" //"<\u308B,\u30EB"
|
||||
"<\u30EC,\u308C" //"<\u308C,\u30EC"
|
||||
"<\u30ED,\u308D" //"<\u308D,\u30ED"
|
||||
"<\u30EE,\u308E,\u30EF,\u308F" //"<\u308F,\u308E,\u30EF,\u30EE"
|
||||
"<\u30F0,\u3090" //"<\u3090,\u30F0"
|
||||
"<\u30F1,\u3091" //"<\u3091,\u30F1"
|
||||
"<\u30F2,\u3092" //"<\u3092,\u30F2"
|
||||
"<\u30F3,\u3093" //"<\u3093,\u30F3"
|
||||
// end of changes, except one below\u2026
|
||||
"&\u30A2\u30A2 ,\u30A2\u30FC&\u30A1\u30A2 ,\u30A1\u30FC"
|
||||
"&\u30A4\u30A4 ,\u30A4\u30FC&\u30A3\u30A4 ,\u30A3\u30FC&\u30A6\u30A6 ,\u30A6\u30FC"
|
||||
"&\u30A5\u30A6 ,\u30A5\u30FC&\u30A8\u30A8 ,\u30A8\u30FC&\u30A7\u30A8 ,\u30A7\u30FC"
|
||||
"&\u30AA\u30AA ,\u30AA\u30FC&\u30A9\u30AA ,\u30A9\u30FC&\u30AB\u30A2 ,\u30AB\u30FC"
|
||||
|
|
@ -57,7 +100,11 @@ ja {
|
|||
"\u30F0\u3099\u30A4 ,\u30F0\u3099\u30FC&\u30F1\u3099\u30A8 ,\u30F1\u3099\u30FC&\u30F2"
|
||||
"\u3099\u30AA ,\u30F2\u3099\u30FC&\u30CF\u309A\u30A2 ,\u30CF\u309A\u30FC&\u30D2\u309A"
|
||||
"\u30A4 ,\u30D2\u309A\u30FC&\u30D5\u309A\u30A6 ,\u30D5\u309A\u30FC&\u30D8\u309A\u30A8"
|
||||
" ,\u30D8\u309A\u30FC&\u30DB\u309A\u30AA ,\u30DB\u309A\u30FC& \u30F3 <\u3001 <\u3002"
|
||||
" ,\u30D8\u309A\u30FC&\u30DB\u309A\u30AA ,\u30DB\u309A\u30FC"
|
||||
// the last change
|
||||
"& \u3093" //"& \u30F3"
|
||||
|
||||
" <\u3001 <\u3002"
|
||||
" <\u30FB <\u3003 <\u4EDD <\u3005 <\u3006 <\u3007 <\u30FC <\u2014 <\u2010 <\u301C"
|
||||
" <\u2016 <\u2026 <\u2025 <\u2018 <\u2019 <\u201C <\u201D <\u3014 <\u3015 <\u3008"
|
||||
" <\u3009 <\u300A <\u300B <\u300C <\u300D <\u300E <\u300F <\u3010 <\u3011 <\u2212"
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ const static UCollationResult results[] = {
|
|||
UCOL_GREATER,
|
||||
UCOL_EQUAL,
|
||||
UCOL_LESS,
|
||||
UCOL_GREATER,
|
||||
UCOL_LESS,
|
||||
UCOL_LESS,
|
||||
UCOL_LESS,
|
||||
UCOL_GREATER,
|
||||
UCOL_LESS,
|
||||
UCOL_LESS /* 11 */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -71,9 +71,9 @@ const Collator::EComparisonResult CollationKanaTest::results[] = {
|
|||
Collator::GREATER,
|
||||
Collator::EQUAL,
|
||||
Collator::LESS,
|
||||
Collator::GREATER,
|
||||
Collator::LESS,
|
||||
Collator::LESS,
|
||||
Collator::LESS,
|
||||
Collator::GREATER,
|
||||
Collator::LESS,
|
||||
Collator::LESS // 11
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue