aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--localedata/locales/i18n4
-rw-r--r--localedata/locales/ja_JP16
-rw-r--r--localedata/tests-mbwc/dat_iswcntrl.c4
-rw-r--r--localedata/tests-mbwc/dat_iswctype.c7
-rw-r--r--localedata/tests-mbwc/dat_iswspace.c2
-rw-r--r--localedata/tst-ctype-de_DE.ISO-8859-1.in2
-rw-r--r--localedata/tst-ctype.c4
-rwxr-xr-xlocaledata/tst-ctype.sh2
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/
<U0009>..<U000D>;/
% TABLE 1 BASIC LATIN/
- <U0020>;<U00A0>;/
+ <U0020>;/
% TABLE 35 GENERAL PUNCTUATION/
<U2000>..<U2006>;<U2008>..<U200B>;/
% TABLE 50 CJK SYMBOLS AND PUNCTUATION, HIRAGANA/
<U3000>
%
-cntrl <U0001>..<U001F>;<U007F>..<U009F>
+cntrl <U0000>..<U001F>;<U007F>..<U009F>
%
punct /
<U0021>..<U002F>;<U003A>..<U0040>;<U005B>..<U0060>;<U007B>..<U007E>;/
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 <U0020>;<U0009>
space <U0009>;<U000A>;<U000B>;<U000C>;/
<U000D>;<U0020>;<U3000>
-cntrl <U0001>;<U0002>;<U0003>;<U0004>;<U0005>;<U0006>;<U0007>;<U0008>;/
- <U0009>;<U000A>;<U000B>;<U000C>;<U000D>;<U000E>;<U000F>;<U0010>;/
- <U0011>;<U0012>;<U0013>;<U0014>;<U0015>;<U0016>;<U0017>;<U0018>;/
- <U0019>;<U001A>;<U001B>;<U001C>;<U001D>;<U001E>;<U001F>;<U007F>;/
- <U0080>;<U0081>;<U0082>;<U0083>;<U0084>;<U0085>;<U0086>;<U0087>;/
- <U0088>;<U0089>;<U008A>;<U008B>;<U008C>;<U008D>;<U0090>;<U0091>;/
- <U0092>;<U0093>;<U0094>;<U0095>;<U0096>;<U0097>;<U0098>;<U0099>;/
- <U009A>;<U009B>;<U009C>;<U009D>;<U009E>;<U009F>
+cntrl <U0000>;<U0001>;<U0002>;<U0003>;<U0004>;<U0005>;<U0006>;<U0007>;/
+ <U0008>;<U0009>;<U000A>;<U000B>;<U000C>;<U000D>;<U000E>;<U000F>;/
+ <U0010>;<U0011>;<U0012>;<U0013>;<U0014>;<U0015>;<U0016>;<U0017>;/
+ <U0018>;<U0019>;<U001A>;<U001B>;<U001C>;<U001D>;<U001E>;<U001F>;/
+ <U007F>;<U0080>;<U0081>;<U0082>;<U0083>;<U0084>;<U0085>;<U0086>;/
+ <U0087>;<U0088>;<U0089>;<U008A>;<U008B>;<U008C>;<U008D>;<U0090>;/
+ <U0091>;<U0092>;<U0093>;<U0094>;<U0095>;<U0096>;<U0097>;<U0098>;/
+ <U0099>;<U009A>;<U009B>;<U009C>;<U009D>;<U009E>;<U009F>
punct <U0021>;<U0022>;<U0023>;/
<U0024>;<U0025>;<U0026>;<U0027>;/
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
generated by cgit v1.1 at 2024-11-05 03:27:00 +0000