From 74238b8ee7150094715513a9cc36ef2db79370c9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 18 Jul 2000 20:32:25 +0000 Subject: [PATCH] Mark U0000 as cntrl and U00A0 not as space. --- localedata/locales/i18n | 4 ++-- localedata/locales/ja_JP | 16 ++++++++-------- localedata/tests-mbwc/dat_iswcntrl.c | 4 ---- localedata/tests-mbwc/dat_iswctype.c | 7 +------ localedata/tests-mbwc/dat_iswspace.c | 2 +- localedata/tst-ctype-de_DE.ISO-8859-1.in | 2 +- localedata/tst-ctype.c | 4 ++-- localedata/tst-ctype.sh | 2 +- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/localedata/locales/i18n b/localedata/locales/i18n index dcc77a9..0e27d7e 100644 --- a/localedata/locales/i18n +++ b/localedata/locales/i18n @@ -284,13 +284,13 @@ space / % ISO/IEC 6429/ ..;/ % TABLE 1 BASIC LATIN/ - ;;/ + ;/ % TABLE 35 GENERAL PUNCTUATION/ ..;..;/ % TABLE 50 CJK SYMBOLS AND PUNCTUATION, HIRAGANA/ % -cntrl ..;.. +cntrl ..;.. % punct / ..;..;..;..;/ diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP index 3dcce1d..bab7cc0 100644 --- a/localedata/locales/ja_JP +++ b/localedata/locales/ja_JP @@ -142,14 +142,14 @@ blank ; space ;;;;/ ;; -cntrl ;;;;;;;;/ - ;;;;;;;;/ - ;;;;;;;;/ - ;;;;;;;;/ - ;;;;;;;;/ - ;;;;;;;;/ - ;;;;;;;;/ - ;;;;; +cntrl ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;; punct ;;;/ ;;;;/ diff --git a/localedata/tests-mbwc/dat_iswcntrl.c b/localedata/tests-mbwc/dat_iswcntrl.c index 4eac814e..89d5021 100644 --- a/localedata/tests-mbwc/dat_iswcntrl.c +++ b/localedata/tests-mbwc/dat_iswcntrl.c @@ -46,11 +46,7 @@ TST_ISW_LOC (CNTRL, cntrl) = { { TST_ISW_REC (enUS, cntrl) { { { WEOF }, { 0,0,1,0 } }, -#ifdef SHOJI_IS_RIGHT { { 0x0000 }, { 0,0,0,0 } }, -#else - { { 0x0000 }, { 0,0,1,0 } }, -#endif { { 0x001F }, { 0,0,0,0 } }, { { 0x0020 }, { 0,0,1,0 } }, { { 0x0021 }, { 0,0,1,0 } }, diff --git a/localedata/tests-mbwc/dat_iswctype.c b/localedata/tests-mbwc/dat_iswctype.c index 7e481ff..bfabfa4 100644 --- a/localedata/tests-mbwc/dat_iswctype.c +++ b/localedata/tests-mbwc/dat_iswctype.c @@ -133,7 +133,7 @@ TST_ISWCTYPE tst_iswctype_loc [] = { { { 0x00F7, "punct" }, { 0,0,0,0 } }, /* division */ { { 0x00FF, "punct" }, { 0,0,1,0 } }, /* y dia */ { { 0x009F, "space" }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0, "space" }, { 0,0,0,0 } }, /* NB SPACE */ + { { 0x00A0, "space" }, { 0,0,1,0 } }, /* NB SPACE */ { { 0x00A1, "space" }, { 0,0,1,0 } }, /* UD ! */ { { 0x00B1, "space" }, { 0,0,1,0 } }, /* +- sign */ { { 0x00F8, "space" }, { 0,0,1,0 } }, /* o stroke */ @@ -210,12 +210,7 @@ TST_ISWCTYPE tst_iswctype_loc [] = { { { 0x0009, "blank" }, { 0,0,0,0 } }, { { 0x000B, "blank" }, { 0,0,1,0 } }, { { 0x0020, "blank" }, { 0,0,0,0 } }, -#ifdef SHOJI_IS_RIGHT { { 0x0000, "cntrl" }, { 0,0,0,0 } }, -#else - /* XXX U0000 has no properties at all. */ - { { 0x0000, "cntrl" }, { 0,0,1,0 } }, -#endif { { 0x001F, "cntrl" }, { 0,0,0,0 } }, { { 0x0020, "cntrl" }, { 0,0,1,0 } }, { { 0x0021, "cntrl" }, { 0,0,1,0 } }, diff --git a/localedata/tests-mbwc/dat_iswspace.c b/localedata/tests-mbwc/dat_iswspace.c index 3e5a992..ec9e598 100644 --- a/localedata/tests-mbwc/dat_iswspace.c +++ b/localedata/tests-mbwc/dat_iswspace.c @@ -16,7 +16,7 @@ TST_ISW_LOC (SPACE, space) = { { { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ - { { 0x00A0 }, { 0,0,0,0 } }, /* NB SPACE */ + { { 0x00A0 }, { 0,0,1,0 } }, /* NB SPACE */ { { 0x00A1 }, { 0,0,1,0 } }, /* UD ! */ { { 0x00B0 }, { 0,0,1,0 } }, /* Degree */ { { 0x00B1 }, { 0,0,1,0 } }, /* +- sign */ diff --git a/localedata/tst-ctype-de_DE.ISO-8859-1.in b/localedata/tst-ctype-de_DE.ISO-8859-1.in index 539ff89..41ef96d 100644 --- a/localedata/tst-ctype-de_DE.ISO-8859-1.in +++ b/localedata/tst-ctype-de_DE.ISO-8859-1.in @@ -19,7 +19,7 @@ xdigit xdigit ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ 000000000000000000000000000000000000000000000000 space  ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ - 100000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000 space ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ 000000000000000000000000000000000000000000000000 print  ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c index 9caee1a..5ae7e0f 100644 --- a/localedata/tst-ctype.c +++ b/localedata/tst-ctype.c @@ -118,8 +118,8 @@ punct = %04x alnum = %04x\n", FAIL ("isgraph ('\\0') is true"); if (isblank ('\0')) FAIL ("isblank ('\\0') is true"); - if (iscntrl ('\0')) - FAIL ("iscntrl ('\\0') is true"); + if (! iscntrl ('\0')) + FAIL ("iscntrl ('\\0') not true"); if (ispunct ('\0')) FAIL ("ispunct ('\\0') is true"); if (isalnum ('\0')) diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh index 5b906a2..f56551a 100755 --- a/localedata/tst-ctype.sh +++ b/localedata/tst-ctype.sh @@ -24,7 +24,7 @@ status=0 # Run the test programs. rm -f ${common_objpfx}localedata/tst-ctype.out -for loc in de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 ja_JP.EUC-JP; do +for loc in C de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 ja_JP.EUC-JP; do if test -f tst-ctype-$loc.in; then input=tst-ctype-$loc.in else -- 2.7.4