From 040cf4baf7c85c2c357e63f70935f86a90ab512d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 30 Jun 2000 04:07:37 +0000 Subject: Update. * tst-fmon.sh: Don't generate de_DE and en_US locale data. * tst-rpmatch.sh: Use de_DE.ISO-8859-1 not de_DE. * tst-ctype.sh: Use de_DE.ISO-8859-1 and en_US.ANSI_X3.4-1968. * locales/POSIX: Update for new format. --- localedata/ChangeLog | 6 + localedata/locales/POSIX | 412 +++++++++++++++++++++++++--------------------- localedata/tst-ctype.sh | 2 +- localedata/tst-rpmatch.sh | 14 +- 4 files changed, 234 insertions(+), 200 deletions(-) diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 6ec7bbda62..0fa1d2bf93 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,11 @@ 2000-06-29 Ulrich Drepper + * tst-fmon.sh: Don't generate de_DE and en_US locale data. + * tst-rpmatch.sh: Use de_DE.ISO-8859-1 not de_DE. + * tst-ctype.sh: Use de_DE.ISO-8859-1 and en_US.ANSI_X3.4-1968. + + * locales/POSIX: Update for new format. + * Makefile: Regenerate locale data also if localedef changed. * tst-fmon.data: Until we know what is correct, but the spaces diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX index 24e296bf44..c1e24e1c43 100644 --- a/localedata/locales/POSIX +++ b/localedata/locales/POSIX @@ -27,187 +27,201 @@ LC_CTYPE # The following is the POSIX Locale LC_CTYPE. # "alpha" is by default "upper" and "lower" # "alnum" is by definiton "alpha" and "digit" -# "print" is by default "alnum", "punct" and the character +# "print" is by default "alnum", "punct" and the character # "graph" is by default "alnum" and "punct" # -upper ;;;;;;;;;;;;;\ - ;;

;;;;;;;;;; +lower ;;;;;;;;\ + ;;;;;;;;\ + ;;;;;;;;\ + ; # -digit ;;;;;\ - ;;;; +digit ;;;;;\ + ;;;; # -space ;;;;\ - ; +space ;;;;\ + ; # -cntrl ;;;;;\ - ;;\ - ;;;;;;;;;\ - ;;;;;;;;;\ - ;;;;;;; +cntrl ;;;;;\ + ;;\ + ;;;;;;;;\ + ;;;;;;;;\ + ;;;;;;;;\ + ; # -punct ;;;\ - ;;;;\ - ;;;\ - ;;;;;\ - ;;;;\ - ;;;\ - ;;;\ - ;;;\ - ;;; +punct ;;;\ + ;;;;\ + ;;;\ + ;;;;;\ + ;;;;\ + ;;;\ + ;;;\ + ;;;\ + ;;; # -xdigit ;;;;;;;;;\ - ;;;;;;;;;;;; +xdigit ;;;;;;;;\ + ;;;;;;;;\ + ;;;;; # -blank ; +blank ; # -tolower (,);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);\ - (

,

);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);(,) +tolower (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,) # -toupper (,);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);\ - (

,

);(,);(,);(,);(,);\ - (,);(,);(,);(,);(,);(,) +toupper (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,);(,);\ + (,);(,) END LC_CTYPE LC_COLLATE # This is the POSIX Locale definition for the LC_COLLATE category. # The order is the same as in the ASCII code set. order_start forward - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UNDEFINED order_end # @@ -219,7 +233,7 @@ LC_MONETARY # int_curr_symbol "" currency_symbol "" -mon_decimal_point "" +mon_decimal_point "" mon_thousands_sep "" mon_grouping -1 positive_sign "" @@ -239,7 +253,7 @@ LC_NUMERIC # This is the POSIX Locale definition for # the LC_NUMERIC category. # -decimal_point "" +decimal_point "" thousands_sep "" grouping -1 # @@ -250,46 +264,60 @@ LC_TIME # the LC_TIME category. # # Abbreviated weekday names (%s) -abday "";"";"";"";\ - "";"";"" +abday "";"";\ + "";"";\ + "";"";\ + "" # # Full weekday names (%A) -day "";"";\ - "";"";\ - "";"";\ - "" +day "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "" # # Abbreviated month names (%b) -abmon "";"";"";\ - "

";"";"";\ - "";"";"

";\ - "";"";"" +abmon "";"";\ + "";"";\ + "";"";\ + "";"";\ + "";"";\ + "";"" # # Full month names (%B) -mon "";"";\ - "";"

";\ - "";"";\ - "";"";\ - "

";"";\ - "";"" +mon "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "";\ + "" # # Equivalent of AM/PM (%p) "AM"/"PM" -am_pm "";"

" +am_pm "";"" # # Appropriate date and time representation (%c) # "%a %b %e %H:%M:%S %Y" -d_t_fmt "\ -\ -" +d_t_fmt "\ +\ +" # # Appropriate date representation (%x) "%m/%d/%y" -d_fmt "" +d_fmt "" # # Appropriate time representation (%X) "%H:%M:%S" -t_fmt "" +t_fmt "" # -# Appropriate 12 h time representation (%Xr "%I:%M:%S %p" -t_fmt_ampm "

" +# Appropriate 12 h time representation (%r) "%I:%M:%S %p" +t_fmt_ampm "\ +" # END LC_TIME @@ -297,7 +325,7 @@ LC_MESSAGES # This is the POSIX Locale definition for # the LC_NUMERIC category. # -yesexpr "" +yesexpr "" # -noexpr "" +noexpr "" END LC_MESSAGES diff --git a/localedata/tst-ctype.sh b/localedata/tst-ctype.sh index 32926d8c9d..a0d51dccbc 100755 --- a/localedata/tst-ctype.sh +++ b/localedata/tst-ctype.sh @@ -23,7 +23,7 @@ status=0 # Run the test programs. rm -f ${common_objpfx}localedata/tst-ctype.out -for loc in de_DE de_DE.UTF-8 en_US ja_JP.EUC-JP; do +for loc in 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 diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh index a3993a3885..dd6b8a135e 100755 --- a/localedata/tst-rpmatch.sh +++ b/localedata/tst-rpmatch.sh @@ -49,13 +49,13 @@ C&no&0 #& Uh, that's nonsense C&nonsens&0 C&Error&-1 -de_DE&Yes&1 -de_DE&Ja&1 -de_DE&Jammerschade&1 -de_DE&dejavu&-1 -de_DE&Nein&0 -de_DE&Fehler&-1 -de_DE&jein&1 +de_DE.ISO-8859-1&Yes&1 +de_DE.ISO-8859-1&Ja&1 +de_DE.ISO-8859-1&Jammerschade&1 +de_DE.ISO-8859-1&dejavu&-1 +de_DE.ISO-8859-1&Nein&0 +de_DE.ISO-8859-1&Fehler&-1 +de_DE.ISO-8859-1&jein&1 EOF rc=$? -- cgit v1.2.3

;;;;;;;;;; +upper ;;;;;;;;\ + ;;;;;;;;\ + ;;;;;;;;\ + ; # -lower ;;;;;;;;;;;;;\ - ;;