diff options
Diffstat (limited to 'localedata/tests-mbwc')
| -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 |
6 files changed, 305 insertions, 19 deletions
diff --git a/localedata/tests-mbwc/dat_iswalnum.c b/localedata/tests-mbwc/dat_iswalnum.c index 49833b84b1..54522efe64 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 40c4c4275b..4db02360b5 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 88b568b388..c184d4a148 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 0ab56d273e..f1f71b913a 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 a574a5906b..788d18f70e 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 2d17478121..3c9d1fcecd 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 @ */ |