about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-25 18:14:28 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-25 18:14:28 +0000
commit07dab0c38525997dc9984f583a71f3b1cbd44cbd (patch)
tree4a37a32c9705fe1170d548d603ad5dbf7ea531a6 /localedata
parentab80bec0cbf512c51f040b36a90a732fcaaa397e (diff)
downloadglibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.tar.gz
glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.tar.xz
glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.zip
Update.
2000-06-25  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/ld-collate.c: Correct handling of different
	collation sections.
	* locale/programs/localedef.c (add_to_readlist): Take locale pointer
	as extra parameter from which to copy category information.
	Change all callers.
	(load_locale): Likewise.
	* locale/programs/localedef.h: Update prototypes of add_to_readlist
	and load_locale.
	* locale/programs/ld-ctype.c: Update call to add_to_readlist.
	* locale/programs/locfile.h: Likewise.
	* locale/programs/locfile-kw.gperf: Add entry for script.
	* locale/programs/locfile-token.h: Add tok_script.

	* locale/programs/locale.c: Update copyright year.
	* locale/programs/localedef.c: Likewise.

	* xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog13
-rw-r--r--localedata/locales/i18n4
-rw-r--r--localedata/locales/iso14651_t132
-rw-r--r--localedata/sort-test.sh11
-rwxr-xr-xlocaledata/tst-fmon.sh7
-rwxr-xr-xlocaledata/tst-locale.sh2
-rwxr-xr-xlocaledata/tst-mbswcs.sh2
-rwxr-xr-xlocaledata/tst-rpmatch.sh3
-rwxr-xr-xlocaledata/tst-trans.sh2
9 files changed, 42 insertions, 34 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 39771c5763..5c419b2eb2 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* sort-test.sh: Add more GCONV_PATH usages.
+	* tst-fmon.sh: Likewise.
+	* tst-locale.sh: Likewise.
+	* tst-mbswcs.sh: Likewise.
+	* tst-rpmatch.sh: Likewise.
+	* tst-trans.sh: Likewise.
+
+	* locales/i18n: Remove order_start around copy.
+
+	* locales/iso14651_t1: Correct various small errors.
+
 2000-06-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/ISO-8859-1: Correct width specification.
diff --git a/localedata/locales/i18n b/localedata/locales/i18n
index cd76ef792c..7598840864 100644
--- a/localedata/locales/i18n
+++ b/localedata/locales/i18n
@@ -995,13 +995,9 @@ symbol-equivalence <HOOK>              <CROOK>
 symbol-equivalence <HORN>              <HORNU>
 symbol-equivalence <DOT-BELOW>         <POINS>
 
-order_start forward;forward;forward;forward,position
-
 % Copy the template from ISO/IEC 14651
 copy "iso14651_t1"
 
-order_end
-
 END LC_COLLATE
 
 LC_MONETARY
diff --git a/localedata/locales/iso14651_t1 b/localedata/locales/iso14651_t1
index 0402a1f510..c0b2bba758 100644
--- a/localedata/locales/iso14651_t1
+++ b/localedata/locales/iso14651_t1
@@ -1,7 +1,5 @@
 LC_COLLATE
 
-COLL_WEIGHT_MAX=4
-
 # Déclaration des systèmes d'écriture / Declaration of scripts
 script <SPECIAL>
 script <LATIN>
@@ -106,6 +104,7 @@ collating-symbol <w>
 collating-symbol <x>
 collating-symbol <y>
 collating-symbol <z>
+collating-symbol <th>
 #
 # <ARABINT>/<ARABFOR>
 #
@@ -153,7 +152,7 @@ collating-symbol <yeh_barree>
 #
 # <HEBREU>
 #
-collating-symbol <alef>
+collating-symbol <halef>
 collating-symbol <bet>
 collating-symbol <gimel>
 collating-symbol <dalet>
@@ -164,7 +163,7 @@ collating-symbol <het>
 collating-symbol <tet>
 collating-symbol <yod>
 collating-symbol <kaf_fin>
-collating-symbol <kaf>
+collating-symbol <hkaf>
 collating-symbol <lamed>
 collating-symbol <mem_fin>
 collating-symbol <mem>
@@ -204,7 +203,7 @@ collating-symbol <SIGMA>
 collating-symbol <TAU>
 collating-symbol <UPSILON>
 collating-symbol <PHI>
-collating-symbol <KHI>
+collating-symbol <CHI>
 collating-symbol <PSI>
 collating-symbol <OMEGA>
 #
@@ -246,7 +245,6 @@ collating-symbol <CYR-OUBRE>
 collating-symbol <CYR-EF>
 collating-symbol <CYR-HA>
 collating-symbol <CYR-TSE>
-collating-symbol <CYR-TSHE>
 collating-symbol <CYR-DCHE>
 collating-symbol <CYR-SHA>
 collating-symbol <CYR-SHTSHA>
@@ -272,7 +270,6 @@ collating-symbol <CYR-YA>
 #
 #
 <ANO> # voir
-<MIN>
 <AIS> # isol.
 # 3
 <AFI> # final
@@ -411,7 +408,7 @@ collating-symbol <CYR-YA>
 #
 # <HEBREU>
 #
-<alef>
+<halef>
 <bet>
 <gimel>
 <dalet>
@@ -422,7 +419,7 @@ collating-symbol <CYR-YA>
 <tet>
 <yod>
 <kaf_fin>
-<kaf>
+<hkaf>
 <lamed>
 <mem_fin>
 <mem>
@@ -504,7 +501,6 @@ collating-symbol <CYR-YA>
 <CYR-EF>
 <CYR-HA>
 <CYR-TSE>
-<CYR-TSHE>
 <CYR-DCHE>
 <CYR-SHA>
 <CYR-SHTSHA>
@@ -573,7 +569,7 @@ order_start <SPECIAL>;forward;backward;forward;forward,position
 <U00A3> IGNORE;IGNORE;IGNORE;<U00A3> # 86 £
 <U00A5> IGNORE;IGNORE;IGNORE;<U00A5> # 87 ¥
 <U002A> IGNORE;IGNORE;IGNORE;<U002A> # 88 *
-<U005C> IGNORE;IGNORE;IGNORE;<U005C> # 89 \
+<U005C> IGNORE;IGNORE;IGNORE;<U005C> # 89
 <U0026> IGNORE;IGNORE;IGNORE;<U0026> # 90 &
 <U0023> IGNORE;IGNORE;IGNORE;<U0023> # 91 #
 <U0025> IGNORE;IGNORE;IGNORE;<U0025> # 92 %
@@ -680,7 +676,7 @@ order_start <SPECIAL>;forward;backward;forward;forward,position
 
 order_start <LATIN>;forward;backward;forward;forward,position
 #
-<U00A0> U0020;<BAS>;<MIN>;IGNORE # 170<NBSP>
+<U00A0> <U0020>;<BAS>;<MIN>;IGNORE # 170<NBSP>
 #
 <U0030> <0>;<BAS>;<MIN>;IGNORE # 171 0
 <U0031> <1>;<BAS>;<MIN>;IGNORE # 172 1
@@ -722,7 +718,7 @@ order_start <LATIN>;forward;backward;forward;forward,position
 <U0103> <a>;<BRE>;<MIN>;IGNORE # 206 <a(>
 <U0105> <a>;<OGO>;<MIN>;IGNORE # 207 <a;>
 <U0101> <a>;<MAC>;<MIN>;IGNORE # 208 <a->
-<U00E6> <a><e>;<LIG><LIG>;<MIN><MIN>;IGNORE # 209 æ
+<U00E6> "<a><e>";"<LIG><LIG>";"<MIN><MIN>";IGNORE # 209 æ
 <U0062> <b>;<BAS>;<MIN>;IGNORE # 210 b
 <U0063> <c>;<BAS>;<MIN>;IGNORE # 211 c
 <U00E7> <c>;<CDI>;<MIN>;IGNORE # 212 ç
@@ -803,7 +799,7 @@ order_start <LATIN>;forward;backward;forward;forward,position
 <U015D> <s>;<CIR>;<MIN>;IGNORE # 287 <s/>>
 <U0161> <s>;<CAR>;<MIN>;IGNORE # 288 <s<>
 <U015F> <s>;<CDI>;<MIN>;IGNORE # 289 <s,>
-<U00DF> <s><s>;<LIG><LIG>;<MIN><MIN>;IGNORE # 290 ß
+<U00DF> "<s><s>";"<LIG><LIG>";"<MIN><MIN>";IGNORE # 290 ß
 <U0074> <t>;<BAS>;<MIN>;IGNORE # 291 t
 <U0165> <t>;<CAR>;<MIN>;IGNORE # 292 <t<>
 <U0167> <t>;<OBL>;<MIN>;IGNORE # 293 <t//>
@@ -842,7 +838,7 @@ order_start <LATIN>;forward;backward;forward;forward,position
 <U0102> <a>;<BRE>;<CAP>;IGNORE # 326 <A(>
 <U0104> <a>;<OGO>;<CAP>;IGNORE # 327 <A;>
 <U0100> <a>;<MAC>;<CAP>;IGNORE # 328 <A->
-<U00C6> <a><e>;<LIG><LIG>;<CAP><CAP>;IGNORE # 329 Æ
+<U00C6> "<a><e>";"<LIG><LIG>";"<CAP><CAP>";IGNORE # 329 Æ
 <U0042> <b>;<BAS>;<CAP>;IGNORE # 330 B
 <U0043> <c>;<BAS>;<CAP>;IGNORE # 331 C
 <U00C7> <c>;<CDI>;<CAP>;IGNORE # 332 Ç
@@ -1176,7 +1172,7 @@ order_start <ARABFOR>;backward;backward;backward;forward,position
 <UFEFC> <lam><alef>;<BAS><BAS>;<AFI><AFI>;IGNORE
 
 order_start <HEBREU>;forward;forward;forward;forward,position
-<U05D0> <alef>;<BAS>;IGNORE;IGNORE
+<U05D0> <halef>;<BAS>;IGNORE;IGNORE
 <U05D1> <bet>;<BAS>;IGNORE;IGNORE
 <U05D2> <gimel>;<BAS>;IGNORE;IGNORE
 <U05D3> <dalet>;<BAS>;IGNORE;IGNORE
@@ -1187,7 +1183,7 @@ order_start <HEBREU>;forward;forward;forward;forward,position
 <U05D8> <tet>;<BAS>;IGNORE;IGNORE
 <U05D9> <yod>;<BAS>;IGNORE;IGNORE
 <U05DA> <kaf_fin>;<BAS>;IGNORE;IGNORE
-<U05DB> <kaf>;<BAS>;IGNORE;IGNORE
+<U05DB> <hkaf>;<BAS>;IGNORE;IGNORE
 <U05DC> <lamed>;<BAS>;IGNORE;IGNORE
 <U05DD> <mem_fin>;<BAS>;IGNORE;IGNORE
 <U05DE> <mem>;<BAS>;IGNORE;IGNORE
@@ -1204,7 +1200,7 @@ order_start <HEBREU>;forward;forward;forward;forward,position
 <U05E9> <shin>;<BAS>;IGNORE;IGNORE
 <U05EA> <tav>;<BAS>;IGNORE;IGNORE
 
-order_start <GREC>;forward;backward;forward
+order_start <GREC>;forward;backward;forward;forward,position
 <U0391> <ALPHA>;<BAS>;<CAP>;IGNORE
 <U03B1> <ALPHA>;<BAS>;<AMI>;IGNORE
 <U0386> <ALPHA>;<TNS>;<CAP>;IGNORE
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index 322d40cb2c..be5693a492 100644
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -11,7 +11,8 @@ for l in $lang; do
   cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
   cn=locales/$cns
   fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'`
-  I18NPATH=. ${common_objpfx}elf/ld.so --library-path $common_objpfx \
+  I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
+   ${common_objpfx}elf/ld.so --library-path $common_objpfx \
    ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \
    ${common_objpfx}localedata/$cns
 done
@@ -20,14 +21,14 @@ done
 status=0
 for l in $lang; do
   cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
-  LOCPATH=${common_objpfx}localedata LC_ALL=$cns \
-   ${common_objpfx}elf/ld.so --library-path $common_objpfx \
+  LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \
+   LC_ALL=$cns ${common_objpfx}elf/ld.so --library-path $common_objpfx \
    ${common_objpfx}localedata/collate-test $id < $cns.in \
    > ${common_objpfx}localedata/$cns.out || status=1
   cmp -s $cns.in ${common_objpfx}localedata/$cns.out || status=1
 
-  LOCPATH=${common_objpfx}localedata LC_ALL=$cns \
-   ${common_objpfx}elf/ld.so --library-path $common_objpfx \
+  LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \
+   LC_ALL=$cns ${common_objpfx}elf/ld.so --library-path $common_objpfx \
    ${common_objpfx}localedata/xfrm-test $id < $cns.in \
    > ${common_objpfx}localedata/$cns.xout || status=1
   cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || status=1
diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index a1c9ad5d3c..c578826145 100755
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Testing the implementation of strfmon(3).
-# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
 #
@@ -36,7 +36,7 @@ for l in $lang; do
     cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
     cn=locales/$cns
     fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'`
-    I18NPATH=. \
+    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef \
     --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns
@@ -44,7 +44,7 @@ done
 for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do
     cn=tst-fmon-locales/$cns
     fn=charmaps/ISO-8859-1
-    I18NPATH=. \
+    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef \
     --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns
@@ -55,6 +55,7 @@ IFS="	"                # This is a TAB
 while read locale format value expect; do
     if [ -n "$format" ]; then
 	LOCPATH=${common_objpfx}localedata \
+	GCONV_PATH=${common_objpfx}/iconvdata \
 	${common_objpfx}elf/ld.so --library-path $common_objpfx \
         ${common_objpfx}localedata/tst-fmon \
 	    "$locale" "$format" "$value" "$expect"
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index 6851c364c8..75d54b81ae 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -27,7 +27,7 @@ test_locale ()
     input=$2
     out=$3
     rep=$4
-    I18NPATH=. \
+    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \
       --repertoire-map $rep ${common_objpfx}localedata/$out
diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh
index 936db382e3..a23de6bc75 100755
--- a/localedata/tst-mbswcs.sh
+++ b/localedata/tst-mbswcs.sh
@@ -26,7 +26,7 @@ generate_locale ()
     input=$2
     out=$3
     rep=$4
-    I18NPATH=. \
+    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \
       --repertoire-map $rep ${common_objpfx}localedata/$out
diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 50297139d1..a3993a3885 100755
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -f
 #
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library and contains tests for
 # the rpmatch(3)-implementation.
 # contributed by Jochen Hein <jochen.hein@delphi.central.de>
@@ -25,6 +25,7 @@ rc=0
 while read locale string result dummy; do
     if [ "$locale" != "#" ]; then
 	LOCPATH=${common_objpfx}localedata \
+	GCONV_PATH=${common_objpfx}/iconvdata \
 	${common_objpfx}elf/ld.so --library-path $common_objpfx \
 	${common_objpfx}localedata/tst-rpmatch $locale $string $result \
 	|| exit 1
diff --git a/localedata/tst-trans.sh b/localedata/tst-trans.sh
index c17525dd18..0689c5cfe3 100755
--- a/localedata/tst-trans.sh
+++ b/localedata/tst-trans.sh
@@ -21,7 +21,7 @@
 common_objpfx=$1
 
 # Generate the necessary locale data.
-I18NPATH=. \
+I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
 ${common_objpfx}elf/ld.so --library-path $common_objpfx \
 ${common_objpfx}locale/localedef --quiet \
 -i tests/trans.def -f charmaps/ISO-8859-1 -u repertoiremaps/mnemonic.ds \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-24 19:45:30 +0000