diff options
| -rw-r--r-- | localedata/ChangeLog | 29 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 1 | ||||
| -rw-r--r-- | localedata/locales/sr_YU@cyrillic | 141 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswalnum.c | 58 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswalpha.c | 64 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswctype.c | 100 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswgraph.c | 38 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswprint.c | 38 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswpunct.c | 26 |
9 files changed, 476 insertions, 19 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index bcd2678..6d1b7af 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,32 @@ +2000-10-27 Bruno Haible <haible@clisp.cons.org> + + * locales/sr_YU@cyrillic: New file. Based on a locale file by + Anton Zinoviev <anton@lml.bas.bg>. + * SUPPORTED: Add sr_YU@cyrillic. + +2000-10-27 Bruno Haible <haible@clisp.cons.org> + + * locales/ar_SA: Use Unicode aware LC_CTYPE information from "i18n". + * locales/be_BY: Likewise. + * locales/bg_BG: Likewise. + * locales/el_GR: Likewise. + * locales/ja_JP: Likewise. + * locales/ko_KR: Likewise. + * locales/mk_MK: Likewise. + * locales/ru_RU: Likewise. + * locales/ru_UA: Likewise. + * locales/th_TH: Likewise. + * locales/tr_TR: Likewise. + * locales/uk_UA: Likewise. + * locales/zh_CN: Likewise. + * tests-mbwc/dat_iswalnum.c: Update for changed character properties + in the ja_JP.EUC-JP locale. + * tests-mbwc/dat_iswalpha.c: Likewise. + * tests-mbwc/dat_iswctype.c: Likewise. + * tests-mbwc/dat_iswgraph.c: Likewise. + * tests-mbwc/dat_iswprint.c: Likewise. + * tests-mbwc/dat_iswpunct.c: Likewise. + 2000-10-26 Ulrich Drepper <drepper@redhat.com> * fr_CA,2.13.in: Removed. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index a596e1c..c125d33 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -125,6 +125,7 @@ sk_SK ISO-8859-2 sl_SI ISO-8859-2 sq_AL ISO-8859-1 sr_YU ISO-8859-2 +sr_YU@cyrillic ISO-8859-5 sv_FI ISO-8859-1 sv_FI@euro ISO-8859-15 sv_SE ISO-8859-1 diff --git a/localedata/locales/sr_YU@cyrillic b/localedata/locales/sr_YU@cyrillic new file mode 100644 index 0000000..e22e28e --- /dev/null +++ b/localedata/locales/sr_YU@cyrillic @@ -0,0 +1,141 @@ +comment_char % +escape_char / +% +% Serbian Language Locale for Yugoslavia +% Source: USM/MZT +% Address: +% +% Contact: +% Email: +% Tel: +% Fax: none +% Language: sr +% Territory: YU +% Revision: 4.4 +% Date: 1997-04-17 +% Application: general +% Users: general +% Repertoiremap: mnemonic.ds +% Charset: ISO-8859-5 +% Distribution and use is free, also +% for commercial purposes. + +LC_IDENTIFICATION +title "Serbian locale for Yugoslavia" +source "USM/MZT" +address "" +contact "" +email "bug-glibc@gnu.org" +tel "" +fax "" +language "Serbian" +territory "Yugoslavia" +revision "1.0" +date "2000-10-27" +% +category "sr_YU@cyrillic:2000";LC_IDENTIFICATION +category "sr_YU@cyrillic:2000";LC_CTYPE +category "sr_YU@cyrillic:2000";LC_COLLATE +category "sr_YU@cyrillic:2000";LC_TIME +category "sr_YU@cyrillic:2000";LC_NUMERIC +category "sr_YU@cyrillic:2000";LC_MONETARY +category "sr_YU@cyrillic:2000";LC_MESSAGES +category "sr_YU@cyrillic:2000";LC_PAPER +category "sr_YU@cyrillic:2000";LC_NAME +category "sr_YU@cyrillic:2000";LC_ADDRESS +category "sr_YU@cyrillic:2000";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_COLLATE +copy "sr_YU" +END LC_COLLATE + +LC_CTYPE +copy "i18n" +END LC_CTYPE + +LC_MESSAGES +yesexpr "<U005B><U0414><U0434><U0059><U0079><U005D><U002E><U002A>" +noexpr "<U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>" +END LC_MESSAGES + +LC_MONETARY +int_curr_symbol "<U0059><U0055><U004E><U0020>" +currency_symbol "<U0434><U0438><U043D>" +mon_decimal_point "<U002C>" +mon_thousands_sep "<U0020>" +mon_grouping 3;3 +positive_sign "" +negative_sign "<U002D>" +int_frac_digits 0 +frac_digits 0 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +END LC_MONETARY + +LC_NUMERIC +copy "sr_YU" +END LC_NUMERIC + +LC_TIME + +abday "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";/ + "<U0443><U0442><U043E>";"<U0441><U0440><U0435>";/ + "<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/ + "<U0441><U0443><U0431>" +day "<U043D><U0435><U0434><U0435><U0459><U0061>";/ + "<U043F><U043E><U043D><U0435><U0434><U0435><U0459><U0430><U043A>";/ + "<U0443><U0442><U043E><U0440><U0430><U043A>";/ + "<U0441><U0440><U0435><U0434><U0430>";/ + "<U0447><U0435><U0442><U0432><U0440><U0442><U0430><U043A>";/ + "<U043F><U0435><U0442><U0430><U043A>";/ + "<U0441><U0443><U0431><U043E><U0442><U0430>" +abmon "<U0458><U0430><U043D>";"<U0444><U0435><U0431>";/ + "<U043C><U0430><U0440>";"<U0430><U043F><U0440>";/ + "<U043C><U0430><U0458>";"<U0458><U0443><U043D>";/ + "<U0458><U0443><U043B>";"<U0430><U0432><U0433>";/ + "<U0441><U0435><U043F>";"<U043E><U043A><U0442>";/ + "<U043D><U043E><U0432>";"<U0434><U0435><U0446>" +mon "<U0458><U0430><U043D><U0443><U0430><U0440>";/ + "<U0444><U0435><U0431><U0440><U0443><U0430><U0440>";/ + "<U043C><U0430><U0440><U0442>";/ + "<U0430><U043F><U0440><U0438><U043B>";/ + "<U043C><U0430><U0458>";/ + "<U0458><U0443><U043D>";/ + "<U0458><U0443><U043B>";/ + "<U0430><U0432><U0433><U0443><U0441><U0442>";/ + "<U0441><U0435><U043F><U0442><U0435><U043C><U0431><U0430><U0440>";/ + "<U043E><U043A><U0442><U043E><U0431><U0430><U0440>";/ + "<U043D><U043E><U0432><U0435><U043C><U0431><U0430><U0440>";/ + "<U0434><U0435><U0446><U0435><U043C><U0431><U0430><U0440>" +d_t_fmt "<U002B><U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" +d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059><U002E>" +t_fmt "<U0025><U0054>" +am_pm "";"" +t_fmt_ampm "" +END LC_TIME + +LC_PAPER +copy "sr_YU" +END LC_PAPER + +LC_TELEPHONE +copy "sr_YU" +END LC_TELEPHONE + +LC_MEASUREMENT +copy "sr_YU" +END LC_MEASUREMENT + +LC_NAME +copy "sr_YU" +END LC_NAME + +LC_ADDRESS +copy "sr_YU" +END LC_ADDRESS diff --git a/localedata/tests-mbwc/dat_iswalnum.c b/localedata/tests-mbwc/dat_iswalnum.c index 49833b8..54522ef 100644 --- a/localedata/tests-mbwc/dat_iswalnum.c +++ b/localedata/tests-mbwc/dat_iswalnum.c @@ -103,33 +103,65 @@ TST_ISW_LOC (ALNUM, alnum) = { { { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ +#else + { { 0x3029 }, { 0,0,0 } }, /* Hangzhou NUM9 */ +#endif { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ +#else + { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,0,0 } }, /* HIRAGANA u" */ +#endif { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ +#ifdef SHOJI_IS_RIGHT { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ +#else + { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,0,0 } }, /* KATAKANA wo" */ +#endif { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#else + { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ +#endif { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#ifdef SHOJI_IS_RIGHT { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#else + { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#endif { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ @@ -140,11 +172,19 @@ TST_ISW_LOC (ALNUM, alnum) = { { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ +#ifdef SHOJI_IS_RIGHT + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ +#else + { { 0xFF66 }, { 0,0,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,0,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,0,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,0,0 } }, /* HALF KATA MI */ +#endif { is_last: 1 } /* last element */ } }, diff --git a/localedata/tests-mbwc/dat_iswalpha.c b/localedata/tests-mbwc/dat_iswalpha.c index 40c4c42..4db0236 100644 --- a/localedata/tests-mbwc/dat_iswalpha.c +++ b/localedata/tests-mbwc/dat_iswalpha.c @@ -72,36 +72,72 @@ TST_ISW_LOC (ALPHA, alpha) = { { { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ +#else + { { 0x3029 }, { 0,0,0 } }, /* Hangzhou NUM9 */ +#endif { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ - { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ + { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ +#else + { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ + { { 0x3094 }, { 0,0,0 } }, /* HIRAGANA u" */ +#endif { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ +#ifdef SHOJI_IS_RIGHT { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ - { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ + { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ +#else + { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ + { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ + { { 0x30FA }, { 0,0,0 } }, /* KATAKANA wo" */ +#endif { { 0x30FB }, { 0,1,0 } }, /* KATAKANA MID.DOT */ - { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT + { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#else + { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ +#endif { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#ifdef SHOJI_IS_RIGHT { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x4E07 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x9000 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x9006 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ - { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ - { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#else + { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4E06 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ + { { 0x9007 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#endif { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0xFF0F }, { 0,1,0 } }, /* FULL SLASH */ +#ifdef SHOJI_IS_RIGHT { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ +#else + { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ +#endif { { 0xFF20 }, { 0,1,0 } }, /* FULL @ */ { { 0xFF3A }, { 0,0,0 } }, /* FULL Z */ { { 0xFF40 }, { 0,1,0 } }, /* FULL GRAVE ACC. */ @@ -109,11 +145,19 @@ TST_ISW_LOC (ALPHA, alpha) = { { { 0xFF5E }, { 0,1,0 } }, /* FULL ~ (tilde) */ { { 0xFF61 }, { 0,1,0 } }, /* HALF IDEO.STOP. . */ { { 0xFF65 }, { 0,1,0 } }, /* HALF KATA MID.DOT */ - { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ - { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ +#ifdef SHOJI_IS_RIGHT + { { 0xFF66 }, { 0,1,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,1,0 } }, /* HALF KATA tu */ { { 0xFF70 }, { 0,1,0 } }, /* HALF KATA PL - */ - { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ - { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ + { { 0xFF71 }, { 0,1,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,1,0 } }, /* HALF KATA MI */ +#else + { { 0xFF66 }, { 0,0,0 } }, /* HALF KATA WO */ + { { 0xFF6F }, { 0,0,0 } }, /* HALF KATA tu */ + { { 0xFF70 }, { 0,0,0 } }, /* HALF KATA PL - */ + { { 0xFF71 }, { 0,0,0 } }, /* HALF KATA A */ + { { 0xFF9E }, { 0,0,0 } }, /* HALF KATA MI */ +#endif { is_last: 1 } /* last element */ } }, diff --git a/localedata/tests-mbwc/dat_iswctype.c b/localedata/tests-mbwc/dat_iswctype.c index 88b568b..c184d4a 100644 --- a/localedata/tests-mbwc/dat_iswctype.c +++ b/localedata/tests-mbwc/dat_iswctype.c @@ -389,22 +389,42 @@ TST_ISWCTYPE tst_iswctype_loc [] = { { { Tiswctype, TST_LOC_eucJP }, { +#ifdef SHOJI_IS_RIGHT { { 0x3029, "alnum" }, { 0,1,0 } }, /* Hangzhou NUM9 */ +#else + { { 0x3029, "alnum" }, { 0,0,0 } }, /* Hangzhou NUM9 */ +#endif { { 0xFE4F, "alnum" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0xFF19, "alnum" }, { 0,0,0 } }, /* FULL 9 */ { { 0xFF20, "alnum" }, { 0,1,0 } }, /* FULL @ */ { { 0xFF3A, "alnum" }, { 0,0,0 } }, /* FULL Z */ { { 0xFF40, "alnum" }, { 0,1,0 } }, /* FULL GRAVE ACC. */ { { 0xFF5A, "alnum" }, { 0,0,0 } }, /* FULL z */ +#ifdef SHOJI_IS_RIGHT { { 0xFF71, "alnum" }, { 0,1,0 } }, /* HALF KATA A */ +#else + { { 0xFF71, "alnum" }, { 0,0,0 } }, /* HALF KATA A */ +#endif +#ifdef SHOJI_IS_RIGHT { { 0x3029, "alpha" }, { 0,1,0 } }, /* Hangzhou NUM9 */ +#else + { { 0x3029, "alpha" }, { 0,0,0 } }, /* Hangzhou NUM9 */ +#endif { { 0xFE4F, "alpha" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0xFF19, "alpha" }, { 0,1,0 } }, /* FULL 9 */ +#else + { { 0xFF19, "alpha" }, { 0,0,0 } }, /* FULL 9 */ +#endif { { 0xFF20, "alpha" }, { 0,1,0 } }, /* FULL @ */ { { 0xFF3A, "alpha" }, { 0,0,0 } }, /* FULL Z */ { { 0xFF40, "alpha" }, { 0,1,0 } }, /* FULL GRAVE ACC. */ { { 0xFF5A, "alpha" }, { 0,0,0 } }, /* FULL z */ +#ifdef SHOJI_IS_RIGHT { { 0xFF71, "alpha" }, { 0,1,0 } }, /* HALF KATA A */ +#else + { { 0xFF71, "alpha" }, { 0,0,0 } }, /* HALF KATA A */ +#endif { { 0x0080, "cntrl" }, { 0,0,0 } }, /* CNTRL */ { { 0x3000, "cntrl" }, { 0,1,0 } }, /* IDEO. SPACE */ { { 0x3029, "digit" }, { 0,1,0 } }, /* Hangzhou NUM9 */ @@ -413,42 +433,83 @@ TST_ISWCTYPE tst_iswctype_loc [] = { { { 0x33FE, "digit" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ { { 0xFF19, "digit" }, { 0,1,0 } }, /* FULL 9 */ { { 0x3000, "graph" }, { 0,1,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020, "graph" }, { 0,1,0 } }, /* POSTAL MARK FACE */ { { 0x3029, "graph" }, { 0,1,0 } }, /* Hangzhou NUM9 */ { { 0x302F, "graph" }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037, "graph" }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F, "graph" }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#else + { { 0x3020, "graph" }, { 0,0,0 } }, /* POSTAL MARK FACE */ + { { 0x3029, "graph" }, { 0,0,0 } }, /* Hangzhou NUM9 */ + { { 0x302F, "graph" }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "graph" }, { 0,0,0 } }, /* Separator Symbol */ + { { 0x303F, "graph" }, { 0,0,0 } }, /* IDEO. HALF SPACE */ +#endif /* 29: */ { { 0x3041, "graph" }, { 0,0,0 } }, /* HIRAGANA a */ /* Non jis: */ +#ifdef SHOJI_IS_RIGHT { { 0x3094, "graph" }, { 0,1,0 } }, /* HIRAGANA u" */ +#else + { { 0x3094, "graph" }, { 0,0,0 } }, /* HIRAGANA u" */ +#endif /* Non jis: */ +#ifdef SHOJI_IS_RIGHT { { 0x3099, "graph" }, { 0,1,0 } }, /* SOUND MARK */ +#else + { { 0x3099, "graph" }, { 0,0,0 } }, /* SOUND MARK */ +#endif { { 0x309E, "graph" }, { 0,0,0 } }, /* ITERATION MARK */ /* 33: */ { { 0x30A1, "graph" }, { 0,0,0 } }, /* KATAKANA a */ /* Non jis: */ +#ifdef SHOJI_IS_RIGHT { { 0x30FA, "graph" }, { 0,1,0 } }, /* KATAKANA wo" */ +#else + { { 0x30FA, "graph" }, { 0,0,0 } }, /* KATAKANA wo" */ +#endif { { 0x30FB, "graph" }, { 0,0,0 } }, /* KATAKANA MID.DOT */ { { 0x30FE, "graph" }, { 0,0,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT { { 0x3191, "graph" }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243, "graph" }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB, "graph" }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE, "graph" }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE, "graph" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#else + { { 0x3191, "graph" }, { 0,0,0 } }, /* KANBUN REV.MARK */ + { { 0x3243, "graph" }, { 0,0,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB, "graph" }, { 0,0,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE, "graph" }, { 0,0,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE, "graph" }, { 0,0,0 } }, /* CJK IDEO.TEL.31th */ +#endif { { 0x4E00, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4E05, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x4E06, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x4E06, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x4E07, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9000, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9006, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x9007, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x9007, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif /* 51 */ { { 0x9FA5, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* Non jis: */ +#ifdef SHOJI_IS_RIGHT { { 0xFE4F, "graph" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#else + { { 0xFE4F, "graph" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#endif { { 0xFF0F, "graph" }, { 0,0,0 } }, /* FULL SLASH */ { { 0xFF19, "graph" }, { 0,0,0 } }, /* FULL 9 */ { { 0xFF20, "graph" }, { 0,0,0 } }, /* FULL @ */ @@ -464,43 +525,82 @@ TST_ISWCTYPE tst_iswctype_loc [] = { { { 0xFF71, "graph" }, { 0,0,0 } }, /* HALF KATA A */ { { 0xFF9E, "graph" }, { 0,0,0 } }, /* HALF KATA MI */ { { 0x3000, "print" }, { 0,0,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020, "print" }, { 0,1,0 } }, /* POSTAL MARK FACE */ { { 0x3029, "print" }, { 0,1,0 } }, /* Hangzhou NUM9 */ { { 0x302F, "print" }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037, "print" }, { 0,1,0 } }, /* Separator Symbol */ +#else + { { 0x3020, "print" }, { 0,0,0 } }, /* POSTAL MARK FACE */ + { { 0x3029, "print" }, { 0,0,0 } }, /* Hangzhou NUM9 */ + { { 0x302F, "print" }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "print" }, { 0,0,0 } }, /* Separator Symbol */ +#endif { { 0x4E00, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4E05, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x4E06, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x4E06, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x4E07, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9000, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9006, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x9007, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x9007, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif /* 81: */ { { 0x9FA5, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* Non jis: */ +#ifdef SHOJI_IS_RIGHT { { 0xFE4F, "print" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#else + { { 0xFE4F, "print" }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#endif { { 0x3000, "punct" }, { 0,1,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020, "punct" }, { 0,1,0 } }, /* POSTAL MARK FACE */ { { 0x302F, "punct" }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037, "punct" }, { 0,1,0 } }, /* FEED Separator */ { { 0x303F, "punct" }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#else + { { 0x3020, "punct" }, { 0,0,0 } }, /* POSTAL MARK FACE */ + { { 0x302F, "punct" }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037, "punct" }, { 0,0,0 } }, /* FEED Separator */ + { { 0x303F, "punct" }, { 0,0,0 } }, /* IDEO. HALF SPACE */ +#endif { { 0x3041, "punct" }, { 0,1,0 } }, /* HIRAGANA a */ { { 0x3094, "punct" }, { 0,1,0 } }, /* HIRAGANA u" */ /* 90: */ +#ifdef SHOJI_IS_RIGHT { { 0x3099, "punct" }, { 0,1,0 } }, /* SOUND MARK */ +#else + { { 0x3099, "punct" }, { 0,0,0 } }, /* SOUND MARK */ +#endif { { 0x309E, "punct" }, { 0,1,0 } }, /* ITERATION MARK */ { { 0x30A1, "punct" }, { 0,1,0 } }, /* KATAKANA a */ { { 0x30FA, "punct" }, { 0,1,0 } }, /* KATAKANA wo" */ { { 0x30FB, "punct" }, { 0,0,0 } }, /* KATAKANA MID.DOT */ /* 95: */ { { 0x30FE, "punct" }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT { { 0x3191, "punct" }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243, "punct" }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB, "punct" }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE, "punct" }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE, "punct" }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#else + { { 0x3191, "punct" }, { 0,0,0 } }, /* KANBUN REV.MARK */ + { { 0x3243, "punct" }, { 0,0,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB, "punct" }, { 0,0,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE, "punct" }, { 0,0,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE, "punct" }, { 0,0,0 } }, /* CJK IDEO.TEL.31th */ +#endif { { 0x9007, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA5, "punct" }, { 0,1,0 } }, /* CJK UNI.IDEO. */ diff --git a/localedata/tests-mbwc/dat_iswgraph.c b/localedata/tests-mbwc/dat_iswgraph.c index 0ab56d2..f1f71b9 100644 --- a/localedata/tests-mbwc/dat_iswgraph.c +++ b/localedata/tests-mbwc/dat_iswgraph.c @@ -75,35 +75,73 @@ TST_ISW_LOC (GRAPH, graph) = { { TST_ISW_REC( eucJP, graph ) { { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#else + { { 0x3020 }, { 0,0,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,0,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,0,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,0,0 } }, /* IDEO. HALF SPACE */ +#endif { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ +#ifdef SHOJI_IS_RIGHT { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ /* non jis */ { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ +#else + { { 0x3094 }, { 0,0,0 } }, /* HIRAGANA u" */ /* non jis */ + { { 0x3099 }, { 0,0,0 } }, /* SOUND MARK */ +#endif { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ /* 10 */ { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ +#ifdef SHOJI_IS_RIGHT { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ /* non jis */ +#else + { { 0x30FA }, { 0,0,0 } }, /* KATAKANA wo" */ /* non jis */ +#endif { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#else + { { 0x3191 }, { 0,0,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,0,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,0,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,0,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,0,0 } }, /* CJK IDEO.TEL.31th */ +#endif { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x4E06 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x9007 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0xFE4F }, { 0,1,0 } }, /* CJK Wave Low Line */ /* 30 */ +#else + { { 0xFE4F }, { 0,0,0 } }, /* CJK Wave Low Line */ /* 30 */ +#endif { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ diff --git a/localedata/tests-mbwc/dat_iswprint.c b/localedata/tests-mbwc/dat_iswprint.c index a574a59..788d18f 100644 --- a/localedata/tests-mbwc/dat_iswprint.c +++ b/localedata/tests-mbwc/dat_iswprint.c @@ -78,35 +78,73 @@ TST_ISW_LOC (PRINT, print) = { { TST_ISW_REC (eucJP, print) { { { 0x3000 }, { 0,0,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#else + { { 0x3020 }, { 0,0,0 } }, /* POSTAL MARK FACE */ + { { 0x3029 }, { 0,0,0 } }, /* Hangzhou NUM9 */ + { { 0x302F }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,0,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,0,0 } }, /* IDEO. HALF SPACE */ +#endif { { 0x3041 }, { 0,0,0 } }, /* HIRAGANA a */ +#ifdef SHOJI_IS_RIGHT { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ /* non jis */ { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ +#else + { { 0x3094 }, { 0,0,0 } }, /* HIRAGANA u" */ /* non jis */ + { { 0x3099 }, { 0,0,0 } }, /* SOUND MARK */ +#endif { { 0x309E }, { 0,0,0 } }, /* ITERATION MARK */ /* 10 */ { { 0x30A1 }, { 0,0,0 } }, /* KATAKANA a */ +#ifdef SHOJI_IS_RIGHT { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ /* non jis */ +#else + { { 0x30FA }, { 0,0,0 } }, /* KATAKANA wo" */ /* non jis */ +#endif { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ { { 0x30FE }, { 0,0,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#else + { { 0x3191 }, { 0,0,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,0,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,0,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,0,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,0,0 } }, /* CJK IDEO.TEL.31th */ +#endif { { 0x4E00 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* 20 */ { { 0x4E05 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x4E06 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x4E07 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x4FFF }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9000 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ { { 0x9006 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ +#else + { { 0x9007 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ + { { 0x9FA4 }, { 0,0,0 } }, /* CJK UNI.IDEO.NON-J */ +#endif { { 0x9FA5 }, { 0,0,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0xFE4F }, { 0,1,0 } }, /* WAVE LOW LINE */ /* 30 */ +#else + { { 0xFE4F }, { 0,0,0 } }, /* WAVE LOW LINE */ /* 30 */ +#endif { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ { { 0xFF19 }, { 0,0,0 } }, /* FULL 9 */ { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ diff --git a/localedata/tests-mbwc/dat_iswpunct.c b/localedata/tests-mbwc/dat_iswpunct.c index 2d17478..3c9d1fc 100644 --- a/localedata/tests-mbwc/dat_iswpunct.c +++ b/localedata/tests-mbwc/dat_iswpunct.c @@ -75,24 +75,46 @@ TST_ISW_LOC (PUNCT, punct) = { { TST_ISW_REC (eucJP, punct) { { { 0x3000 }, { 0,1,0 } }, /* IDEO. SPACE */ +#ifdef SHOJI_IS_RIGHT { { 0x3020 }, { 0,1,0 } }, /* POSTAL MARK FACE */ +#else + { { 0x3020 }, { 0,0,0 } }, /* POSTAL MARK FACE */ +#endif { { 0x3029 }, { 0,1,0 } }, /* Hangzhou NUM9 */ +#ifdef SHOJI_IS_RIGHT { { 0x302F }, { 0,1,0 } }, /* Diacritics(Hangul) */ { { 0x3037 }, { 0,1,0 } }, /* Separator Symbol */ { { 0x303F }, { 0,1,0 } }, /* IDEO. HALF SPACE */ +#else + { { 0x302F }, { 0,0,0 } }, /* Diacritics(Hangul) */ + { { 0x3037 }, { 0,0,0 } }, /* Separator Symbol */ + { { 0x303F }, { 0,0,0 } }, /* IDEO. HALF SPACE */ +#endif { { 0x3041 }, { 0,1,0 } }, /* HIRAGANA a */ { { 0x3094 }, { 0,1,0 } }, /* HIRAGANA u" */ +#ifdef SHOJI_IS_RIGHT { { 0x3099 }, { 0,1,0 } }, /* SOUND MARK */ +#else + { { 0x3099 }, { 0,0,0 } }, /* SOUND MARK */ +#endif { { 0x309E }, { 0,1,0 } }, /* ITERATION MARK */ /* 10 */ { { 0x30A1 }, { 0,1,0 } }, /* KATAKANA a */ { { 0x30FA }, { 0,1,0 } }, /* KATAKANA wo" */ { { 0x30FB }, { 0,0,0 } }, /* KATAKANA MID.DOT */ { { 0x30FE }, { 0,1,0 } }, /* KATAKANA ITERATION */ +#ifdef SHOJI_IS_RIGHT { { 0x3191 }, { 0,1,0 } }, /* KANBUN REV.MARK */ { { 0x3243 }, { 0,1,0 } }, /* IDEO. MARK (reach) */ { { 0x32CB }, { 0,1,0 } }, /* IDEO.TEL.SYM.DEC12 */ { { 0x32FE }, { 0,1,0 } }, /* MARU KATAKANA wo */ { { 0x33FE }, { 0,1,0 } }, /* CJK IDEO.TEL.31th */ +#else + { { 0x3191 }, { 0,0,0 } }, /* KANBUN REV.MARK */ + { { 0x3243 }, { 0,0,0 } }, /* IDEO. MARK (reach) */ + { { 0x32CB }, { 0,0,0 } }, /* IDEO.TEL.SYM.DEC12 */ + { { 0x32FE }, { 0,0,0 } }, /* MARU KATAKANA wo */ + { { 0x33FE }, { 0,0,0 } }, /* CJK IDEO.TEL.31th */ +#endif { { 0x4E00 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ /* 20 */ { { 0x4E05 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ { { 0x4E06 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ @@ -103,7 +125,11 @@ TST_ISW_LOC (PUNCT, punct) = { { { 0x9007 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA4 }, { 0,1,0 } }, /* CJK UNI.IDEO.NON-J */ { { 0x9FA5 }, { 0,1,0 } }, /* CJK UNI.IDEO. */ +#ifdef SHOJI_IS_RIGHT { { 0xFE4F }, { 0,1,0 } }, /* CJK UNI.IDEO. */ /* 30 */ +#else + { { 0xFE4F }, { 0,0,0 } }, /* CJK UNI.IDEO. */ /* 30 */ +#endif { { 0xFF0F }, { 0,0,0 } }, /* FULL SLASH */ { { 0xFF19 }, { 0,1,0 } }, /* FULL 9 */ { { 0xFF20 }, { 0,0,0 } }, /* FULL @ */ |