qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ulrich Drepper 2000-06-30 04:07:37 +00:00
parent f53413a1c6
commit 040cf4baf7
4 changed files with 234 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
localedata/ChangeLog
View File

@ -1,5 +1,11 @@
2000-06-29 Ulrich Drepper <drepper@redhat.com> 2000-06-29 Ulrich Drepper <drepper@redhat.com>
* 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. * Makefile: Regenerate locale data also if localedef changed.
* tst-fmon.data: Until we know what is correct, but the spaces * tst-fmon.data: Until we know what is correct, but the spaces

412
localedata/locales/POSIX
View File

@ -27,187 +27,201 @@ LC_CTYPE
# The following is the POSIX Locale LC_CTYPE. # The following is the POSIX Locale LC_CTYPE.
# "alpha" is by default "upper" and "lower" # "alpha" is by default "upper" and "lower"
# "alnum" is by definiton "alpha" and "digit" # "alnum" is by definiton "alpha" and "digit"
# "print" is by default "alnum", "punct" and the <space> character # "print" is by default "alnum", "punct" and the <U0020> character
# "graph" is by default "alnum" and "punct" # "graph" is by default "alnum" and "punct"
# #
upper <A>;<B>;<C>;<D>;<E>;<F>;<G>;<H>;<I>;<J>;<K>;<L>;<M>;\ upper <U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;\
<N>;<O>;<P>;<Q>;<R>;<S>;<T>;<U>;<V>;<W>;<X>;<Y>;<Z> <U0049>;<U004A>;<U004B>;<U004C>;<U004D>;<U004E>;<U004F>;<U0050>;\
<U0051>;<U0052>;<U0053>;<U0054>;<U0055>;<U0056>;<U0057>;<U0058>;\
<U0059>;<U005A>
# #
lower <a>;<b>;<c>;<d>;<e>;<f>;<g>;<h>;<i>;<j>;<k>;<l>;<m>;\ lower <U0061>;<U0062>;<U0063>;<U0064>;<U0065>;<U0066>;<U0067>;<U0068>;\
<n>;<o>;<p>;<q>;<r>;<s>;<t>;<u>;<v>;<w>;<x>;<y>;<z> <U0069>;<U006A>;<U006B>;<U006C>;<U006D>;<U006E>;<U006F>;<U0070>;\
<U0071>;<U0072>;<U0073>;<U0074>;<U0075>;<U0076>;<U0077>;<U0078>;\
<U0079>;<U007A>
# #
digit <zero>;<one>;<two>;<three>;<four>;\ digit <U0030>;<U0031>;<U0032>;<U0033>;<U0034>;\
<five>;<six>;<seven>;<eight>;<nine> <U0035>;<U0036>;<U0037>;<U0038>;<U0039>
# #
space <tab>;<newline>;<vertical-tab>;<form-feed>;\ space <U0009>;<U000A>;<U000B>;<U000C>;\
<carriage-return>;<space> <U000D>;<U0020>
# #
cntrl <alert>;<backspace>;<tab>;<newline>;<vertical-tab>;\ cntrl <U0007>;<U0008>;<U0009>;<U000A>;<U000B>;\
<form-feed>;<carriage-return>;\ <U000C>;<U000D>;\
<NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;<SI>;\ <U0000>;<U0001>;<U0002>;<U0003>;<U0004>;<U0005>;<U0006>;<U000E>;\
<DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;<ETB>;<CAN>;\ <U000F>;<U0010>;<U0011>;<U0012>;<U0013>;<U0014>;<U0015>;<U0016>;\
<EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;<IS1>;<DEL> <U0017>;<U0018>;<U0019>;<U001A>;<U001B>;<U001C>;<U001D>;<U001E>;\
<U001F>;<U007F>
# #
punct <exclamation-mark>;<quotation-mark>;<number-sign>;\ punct <U0021>;<U0022>;<U0023>;\
<dollar-sign>;<percent-sign>;<ampersand>;<apostrophe>;\ <U0024>;<U0025>;<U0026>;<U0027>;\
<left-parenthesis>;<right-parenthesis>;<asterisk>;\ <U0028>;<U0029>;<U002A>;\
<plus-sign>;<comma>;<hyphen>;<period>;<slash>;\ <U002B>;<U002C>;<U002D>;<U002E>;<U002F>;\
<colon>;<semicolon>;<less-than-sign>;<equals-sign>;\ <U003A>;<U003B>;<U003C>;<U003D>;\
<greater-than-sign>;<question-mark>;<commercial-at>;\ <U003E>;<U003F>;<U0040>;\
<left-square-bracket>;<backslash>;<right-square-bracket>;\ <U005B>;<U005C>;<U005D>;\
<circumflex>;<underscore>;<grave-accent>;\ <U005E>;<U005F>;<U0060>;\
<left-curly-bracket>;<vertical-line>;<right-curly-bracket>;<tilde> <U007B>;<U007C>;<U007D>;<U007E>
# #
xdigit <zero>;<one>;<two>;<three>;<four>;<five>;<six>;<seven>;<eight>;\ xdigit <U0030>;<U0031>;<U0032>;<U0033>;<U0034>;<U0035>;<U0036>;<U0037>;\
<nine>;<A>;<B>;<C>;<D>;<E>;<F>;<a>;<b>;<c>;<d>;<e>;<f> <U0038>;<U0039>;<U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;\
<U0061>;<U0062>;<U0063>;<U0064>;<U0065>;<U0066>
# #
blank <space>;<tab> blank <U0020>;<U0009>
# #
tolower (<A>,<a>);(<B>,<b>);(<C>,<c>);(<D>,<d>);(<E>,<e>);\ tolower (<U0041>,<U0061>);(<U0042>,<U0062>);(<U0043>,<U0063>);\
(<F>,<f>);(<G>,<g>);(<H>,<h>);(<I>,<i>);(<J>,<j>);\ (<U0044>,<U0064>);(<U0045>,<U0065>);(<U0046>,<U0066>);\
(<K>,<k>);(<L>,<l>);(<M>,<m>);(<N>,<n>);(<O>,<o>);\ (<U0047>,<U0067>);(<U0048>,<U0068>);(<U0049>,<U0069>);\
(<P>,<p>);(<Q>,<q>);(<R>,<r>);(<S>,<s>);(<T>,<t>);\ (<U004A>,<U006A>);(<U004B>,<U006B>);(<U004C>,<U006C>);\
(<U>,<u>);(<V>,<v>);(<W>,<w>);(<X>,<x>);(<Y>,<y>);(<Z>,<z>) (<U004D>,<U006D>);(<U004E>,<U006E>);(<U004F>,<U006F>);\
(<U0050>,<U0070>);(<U0051>,<U0071>);(<U0052>,<U0072>);\
(<U0053>,<U0073>);(<U0054>,<U0074>);(<U0055>,<U0075>);\
(<U0056>,<U0076>);(<U0057>,<U0077>);(<U0058>,<U0078>);\
(<U0059>,<U0079>);(<U005A>,<U007A>)
# #
toupper (<a>,<A>);(<b>,<B>);(<c>,<C>);(<d>,<D>);(<e>,<E>);\ toupper (<U0061>,<U0041>);(<U0062>,<U0042>);(<U0063>,<U0043>);\
(<f>,<F>);(<g>,<G>);(<h>,<H>);(<i>,<I>);(<j>,<J>);\ (<U0064>,<U0044>);(<U0065>,<U0045>);(<U0066>,<U0046>);\
(<k>,<K>);(<l>,<L>);(<m>,<M>);(<n>,<N>);(<o>,<O>);\ (<U0067>,<U0047>);(<U0068>,<U0048>);(<U0069>,<U0049>);\
(<p>,<P>);(<q>,<Q>);(<r>,<R>);(<s>,<S>);(<t>,<T>);\ (<U006A>,<U004A>);(<U006B>,<U004B>);(<U006C>,<U004C>);\
(<u>,<U>);(<v>,<V>);(<w>,<W>);(<x>,<X>);(<y>,<Y>);(<z>,<Z>) (<U006D>,<U004D>);(<U006E>,<U004E>);(<U006F>,<U004F>);\
(<U0070>,<U0050>);(<U0071>,<U0051>);(<U0072>,<U0052>);\
(<U0073>,<U0053>);(<U0074>,<U0054>);(<U0075>,<U0055>);\
(<U0076>,<U0056>);(<U0077>,<U0057>);(<U0078>,<U0058>);\
(<U0079>,<U0059>);(<U007A>,<U005A>)
END LC_CTYPE END LC_CTYPE
LC_COLLATE LC_COLLATE
# This is the POSIX Locale definition for the LC_COLLATE category. # This is the POSIX Locale definition for the LC_COLLATE category.
# The order is the same as in the ASCII code set. # The order is the same as in the ASCII code set.
order_start forward order_start forward
<NUL> <U0000>
<SOH> <U0001>
<STX> <U0002>
<ETX> <U0003>
<EOT> <U0004>
<ENQ> <U0005>
<ACK> <U0006>
<alert> <U0007>
<backspace> <U0008>
<tab> <U0009>
<newline> <U000A>
<vertical-tab> <U000B>
<form-feed> <U000C>
<carriage-return> <U000D>
<SO> <U000E>
<SI> <U000F>
<DLE> <U0010>
<DC1> <U0011>
<DC2> <U0012>
<DC3> <U0013>
<DC4> <U0014>
<NAK> <U0015>
<SYN> <U0016>
<ETB> <U0017>
<CAN> <U0018>
<EM> <U0019>
<SUB> <U001A>
<ESC> <U001B>
<IS4> <U001C>
<IS3> <U001D>
<IS2> <U001E>
<IS1> <U001F>
<space> <U0020>
<exclamation-mark> <U0021>
<quotation-mark> <U0022>
<number-sign> <U0023>
<dollar-sign> <U0024>
<percent-sign> <U0025>
<ampersand> <U0026>
<apostrophe> <U0027>
<left-parenthesis> <U0028>
<right-parenthesis> <U0029>
<asterisk> <U002A>
<plus-sign> <U002B>
<comma> <U002C>
<hyphen> <U002D>
<period> <U002E>
<slash> <U002F>
<zero> <U0030>
<one> <U0031>
<two> <U0032>
<three> <U0033>
<four> <U0034>
<five> <U0035>
<six> <U0036>
<seven> <U0037>
<eight> <U0038>
<nine> <U0039>
<colon> <U003A>
<semicolon> <U003B>
<less-than-sign> <U003C>
<equals-sign> <U003D>
<greater-than-sign> <U003E>
<question-mark> <U003F>
<commercial-at> <U0040>
<A> <U0041>
<B> <U0042>
<C> <U0043>
<D> <U0044>
<E> <U0045>
<F> <U0046>
<G> <U0047>
<H> <U0048>
<I> <U0049>
<J> <U004A>
<K> <U004B>
<L> <U004C>
<M> <U004D>
<N> <U004E>
<O> <U004F>
<P> <U0050>
<Q> <U0051>
<R> <U0052>
<S> <U0053>
<T> <U0054>
<U> <U0055>
<V> <U0056>
<W> <U0057>
<X> <U0058>
<Y> <U0059>
<Z> <U005A>
<left-square-bracket> <U005B>
<backslash> <U005C>
<right-square-bracket> <U005D>
<circumflex> <U005E>
<underscore> <U005F>
<grave-accent> <U0060>
<a> <U0061>
<b> <U0062>
<c> <U0063>
<d> <U0064>
<e> <U0065>
<f> <U0066>
<g> <U0067>
<h> <U0068>
<i> <U0069>
<j> <U006A>
<k> <U006B>
<l> <U006C>
<m> <U006D>
<n> <U006E>
<o> <U006F>
<p> <U0070>
<q> <U0071>
<r> <U0072>
<s> <U0073>
<t> <U0074>
<u> <U0075>
<v> <U0076>
<w> <U0077>
<x> <U0078>
<y> <U0079>
<z> <U007A>
<left-curly-bracket> <U007B>
<vertical-line> <U007C>
<right-curly-bracket> <U007D>
<tilde> <U007E>
<DEL> <U007F>
UNDEFINED UNDEFINED
order_end order_end
# #
@ -219,7 +233,7 @@ LC_MONETARY
# #
int_curr_symbol "" int_curr_symbol ""
currency_symbol "" currency_symbol ""
mon_decimal_point "<period>" mon_decimal_point "<U002E>"
mon_thousands_sep "" mon_thousands_sep ""
mon_grouping -1 mon_grouping -1
positive_sign "" positive_sign ""
@ -239,7 +253,7 @@ LC_NUMERIC
# This is the POSIX Locale definition for # This is the POSIX Locale definition for
# the LC_NUMERIC category. # the LC_NUMERIC category.
# #
decimal_point "<period>" decimal_point "<U002E>"
thousands_sep "" thousands_sep ""
grouping -1 grouping -1
# #
@ -250,46 +264,60 @@ LC_TIME
# the LC_TIME category. # the LC_TIME category.
# #
# Abbreviated weekday names (%s) # Abbreviated weekday names (%s)
abday "<S><u><n>";"<M><o><n>";"<T><u><e>";"<W><e><d>";\ abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";\
"<T><h><u>";"<F><r><i>";"<S><a><t>" "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";\
"<U0054><U0068><U0075>";"<U0046><U0072><U0069>";\
"<U0053><U0061><U0074>"
# #
# Full weekday names (%A) # Full weekday names (%A)
day "<S><u><n><d><a><y>";"<M><o><n><d><a><y>";\ day "<U0053><U0075><U006E><U0064><U0061><U0079>";\
"<T><u><e><s><d><a><y>";"<W><e><d><n><e><s><d><a><y>";\ "<U004D><U006F><U006E><U0064><U0061><U0079>";\
"<T><h><u><r><s><d><a><y>";"<F><r><i><d><a><y>";\ "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";\
"<S><a><t><u><r><d><a><y>" "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";\
"<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";\
"<U0046><U0072><U0069><U0064><U0061><U0079>";\
"<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
# #
# Abbreviated month names (%b) # Abbreviated month names (%b)
abmon "<J><a><n>";"<F><e><b>";"<M><a><r>";\ abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";\
"<A><p><r>";"<M><a><y>";"<J><u><n>";\ "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";\
"<J><u><l>";"<A><u><g>";"<S><e><p>";\ "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";\
"<O><c><t>";"<N><o><v>";"<D><e><c>" "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";\
"<U0053><U0065><U0070>";"<U004F><U0063><U0074>";\
"<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
# #
# Full month names (%B) # Full month names (%B)
mon "<J><a><n><u><a><r><y>";"<F><e><b><r><u><a><r><y>";\ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";\
"<M><a><r><c><h>";"<A><p><r><i><l>";\ "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";\
"<M><a><y>";"<J><u><n><e>";\ "<U004D><U0061><U0072><U0063><U0068>";\
"<J><u><l><y>";"<A><u><g><u><s><t>";\ "<U0041><U0070><U0072><U0069><U006C>";\
"<S><e><p><t><e><m><b><e><r>";"<O><c><t><o><b><e><r>";\ "<U004D><U0061><U0079>";\
"<N><o><v><e><m><b><e><r>";"<D><e><c><e><m><b><e><r>" "<U004A><U0075><U006E><U0065>";\
"<U004A><U0075><U006C><U0079>";\
"<U0041><U0075><U0067><U0075><U0073><U0074>";\
"<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";\
"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";\
"<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";\
"<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
# #
# Equivalent of AM/PM (%p) "AM"/"PM" # Equivalent of AM/PM (%p) "AM"/"PM"
am_pm "<A><M>";"<P><M>" am_pm "<U0041><U004D>";"<U0050><U004D>"
# #
# Appropriate date and time representation (%c) # Appropriate date and time representation (%c)
# "%a %b %e %H:%M:%S %Y" # "%a %b %e %H:%M:%S %Y"
d_t_fmt "<percent-sign><a><space><percent-sign><b><space><percent-sign><e>\ d_t_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>\
<space><percent-sign><H><colon><percent-sign><M>\ <U0020><U0025><U0048><U003A><U0025><U004D>\
<colon><percent-sign><S><space><percent-sign><Y>" <U003A><U0025><U0053><U0020><U0025><U0059>"
# #
# Appropriate date representation (%x) "%m/%d/%y" # Appropriate date representation (%x) "%m/%d/%y"
d_fmt "<percent-sign><m><slash><percent-sign><d><slash><percent-sign><y>" d_fmt "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0079>"
# #
# Appropriate time representation (%X) "%H:%M:%S" # Appropriate time representation (%X) "%H:%M:%S"
t_fmt "<percent-sign><H><colon><percent-sign><M><colon><percent-sign><S>" t_fmt "<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
# #
# Appropriate 12 h time representation (%Xr "%I:%M:%S %p" # Appropriate 12 h time representation (%r) "%I:%M:%S %p"
t_fmt_ampm "<percent-sign><I><colon><percent-sign><M><colon><percent-sign><S><space><percent-sign><p>" t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>\
<U0020><U0025><U0070>"
# #
END LC_TIME END LC_TIME
@ -297,7 +325,7 @@ LC_MESSAGES
# This is the POSIX Locale definition for # This is the POSIX Locale definition for
# the LC_NUMERIC category. # the LC_NUMERIC category.
# #
yesexpr "<circumflex><left-square-bracket><y><Y><right-square-bracket>" yesexpr "<U005E><U005B><U0079><U0059><U005D>"
# #
noexpr "<circumflex><left-square-bracket><n><N><right-square-bracket>" noexpr "<U005E><U005B><U006E><U004E><U005D>"
END LC_MESSAGES END LC_MESSAGES

2
localedata/tst-ctype.sh
View File

@ -23,7 +23,7 @@ status=0
# Run the test programs. # Run the test programs.
rm -f ${common_objpfx}localedata/tst-ctype.out 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 if test -f tst-ctype-$loc.in; then
input=tst-ctype-$loc.in input=tst-ctype-$loc.in
else else

14
localedata/tst-rpmatch.sh
View File

@ -49,13 +49,13 @@ C&no&0
#& Uh, that's nonsense #& Uh, that's nonsense
C&nonsens&0 C&nonsens&0
C&Error&-1 C&Error&-1
de_DE&Yes&1 de_DE.ISO-8859-1&Yes&1
de_DE&Ja&1 de_DE.ISO-8859-1&Ja&1
de_DE&Jammerschade&1 de_DE.ISO-8859-1&Jammerschade&1
de_DE&dejavu&-1 de_DE.ISO-8859-1&dejavu&-1
de_DE&Nein&0 de_DE.ISO-8859-1&Nein&0
de_DE&Fehler&-1 de_DE.ISO-8859-1&Fehler&-1
de_DE&jein&1 de_DE.ISO-8859-1&jein&1
EOF EOF
rc=$? rc=$?