diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconvdata/jis0208.h | 4 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/Makefile | 3 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_iswalnum.c | 52 |
5 files changed, 38 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 96422839f1..11b9096208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-06-28 Ulrich Drepper <drepper@redhat.com> + + * iconvdata/jis0208.h: Remove redundant test. + 2000-06-27 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/initfini.c (SECTION): Remove trailing semicolon. diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h index df8eb0ddd6..f05888f941 100644 --- a/iconvdata/jis0208.h +++ b/iconvdata/jis0208.h @@ -1,5 +1,5 @@ /* Access functions for JISX0208 conversion. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -49,7 +49,7 @@ jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) unsigned char ch2; int idx; - if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0xea) + if (ch < offset || (ch - offset) <= 0x20) return __UNKNOWN_10646_CHAR; if (avail < 2) diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2bb02ca891..df947d7ee8 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2000-06-28 Ulrich Drepper <drepper@redhat.com> + + * locales/i18n: Correct problems found by test suite. + 2000-06-28 Andreas Jaeger <aj@suse.de> * tests-mbwc/tst_wcscat.c (tst_wcscat): Correct format to avoid diff --git a/localedata/Makefile b/localedata/Makefile index 7ea9938933..d380c7d8cf 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -132,7 +132,8 @@ do-tst-mbswcs: tst-mbswcs.sh $(objpfx)tst-mbswcs1 $(objpfx)tst-mbswcs2 \ $(SHELL) -e $< $(common-objpfx) do-tst-ctype: tst-ctype.sh $(objpfx)tst-ctype do-collate-test $(SHELL) -e $< $(common-objpfx) -$(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite))): %: do-tst-ctype +$(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite))): %: do-tst-ctype\ + do-tst-mbswcs endif endif diff --git a/localedata/tests-mbwc/dat_iswalnum.c b/localedata/tests-mbwc/dat_iswalnum.c index 440e4515d4..68573f9f3a 100644 --- a/localedata/tests-mbwc/dat_iswalnum.c +++ b/localedata/tests-mbwc/dat_iswalnum.c @@ -45,32 +45,32 @@ TST_ISW_LOC (ALNUM, alnum) = { }, { TST_ISW_REC (de_UTF8, alnum) { - { { 0xC280 }, { 0,0,1,0 } }, /* CTRL */ - { { 0xC29F }, { 0,0,1,0 } }, /* CTRL */ - { { 0xC2A0 }, { 0,0,1,0 } }, /* NB SPACE */ - { { 0xC2A1 }, { 0,0,1,0 } }, /* UD ! */ - { { 0xC2B0 }, { 0,0,1,0 } }, /* Degree */ - { { 0xC2B1 }, { 0,0,1,0 } }, /* +- sign */ - { { 0xC2B2 }, { 0,0,1,0 } }, /* SUP 2 */ - { { 0xC2B3 }, { 0,0,1,0 } }, /* SUP 3 */ - { { 0xC2B4 }, { 0,0,1,0 } }, /* ACUTE */ - { { 0xC2B8 }, { 0,0,1,0 } }, /* CEDILLA */ - { { 0xC2B9 }, { 0,0,1,0 } }, /* SUP 1 */ - { { 0xC2BB }, { 0,0,1,0 } }, /* >> */ - { { 0xC2BC }, { 0,0,1,0 } }, /* 1/4 */ - { { 0xC2BD }, { 0,0,1,0 } }, /* 1/2 */ - { { 0xC2BE }, { 0,0,1,0 } }, /* 3/4 */ - { { 0xC2BF }, { 0,0,1,0 } }, /* UD ? */ - { { 0xC380 }, { 0,0,0,0 } }, /* A Grave */ - { { 0xC396 }, { 0,0,0,0 } }, /* O dia */ - { { 0xC397 }, { 0,0,1,0 } }, /* multipl. */ - { { 0xC398 }, { 0,0,0,0 } }, /* O stroke */ - { { 0xC39F }, { 0,0,0,0 } }, /* small Sh */ - { { 0xC3A0 }, { 0,0,0,0 } }, /* a grave */ - { { 0xC3B6 }, { 0,0,0,0 } }, /* o dia */ - { { 0xC3B7 }, { 0,0,1,0 } }, /* division */ - { { 0xC3B8 }, { 0,0,0,0 } }, /* o stroke */ - { { 0xC3BF }, { 0,0,0,0 } }, /* y dia */ + { { 0x0080 }, { 0,0,1,0 } }, /* CTRL */ + { { 0x009F }, { 0,0,1,0 } }, /* CTRL */ + { { 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 */ + { { 0x00B2 }, { 0,0,1,0 } }, /* SUP 2 */ + { { 0x00B3 }, { 0,0,1,0 } }, /* SUP 3 */ + { { 0x00B4 }, { 0,0,1,0 } }, /* ACUTE */ + { { 0x00B8 }, { 0,0,1,0 } }, /* CEDILLA */ + { { 0x00B9 }, { 0,0,1,0 } }, /* SUP 1 */ + { { 0x00BB }, { 0,0,1,0 } }, /* >> */ + { { 0x00BC }, { 0,0,1,0 } }, /* 1/4 */ + { { 0x00BD }, { 0,0,1,0 } }, /* 1/2 */ + { { 0x00BE }, { 0,0,1,0 } }, /* 3/4 */ + { { 0x00BF }, { 0,0,1,0 } }, /* UD ? */ + { { 0x00C0 }, { 0,0,0,0 } }, /* A Grave */ + { { 0x00D6 }, { 0,0,0,0 } }, /* O dia */ + { { 0x00D7 }, { 0,0,1,0 } }, /* multipl. */ + { { 0x00D8 }, { 0,0,0,0 } }, /* O stroke */ + { { 0x00DF }, { 0,0,0,0 } }, /* small Sh */ + { { 0x00E0 }, { 0,0,0,0 } }, /* a grave */ + { { 0x00F6 }, { 0,0,0,0 } }, /* o dia */ + { { 0x00F7 }, { 0,0,1,0 } }, /* division */ + { { 0x00F8 }, { 0,0,0,0 } }, /* o stroke */ + { { 0x00FF }, { 0,0,0,0 } }, /* y dia */ { is_last: 1 } /* last element */ } }, |