Update.

2004-04-17  Ulrich Drepper  <drepper@redhat.com>

	* locales/kk_KZ: New file.
	* charmaps/PT154: New file.
	* charmaps/RK1048: New file.

	* locales/af_ZA: Make sure yesexpr and noexpr regex
	* locales/ar_TN: Likewise.
	* locales/ar_YE: Likewise.
	* locales/bn_BD: Likewise.
	* locales/br_FR: Likewise.
	* locales/ca_ES: Likewise.
	* locales/cy_GB: Likewise.
	* locales/gd_GB: Likewise.
	* locales/gv_GB: Likewise.
	* locales/hy_AM: Likewise.
	* locales/id_ID: Likewise.
	* locales/ka_GE: Likewise.
	* locales/kw_GB: Likewise.
	* locales/lg_UG: Likewise.
	* locales/mk_MK: Likewise.
	* locales/oc_FR: Likewise.
	* locales/ru_UA: Likewise.
	* locales/sk_SK: Likewise.
	* locales/sr_YU: Likewise.
	* locales/sr_YU@cyrillic: Likewise.
	* locales/uk_UA: Likewise.
	* locales/ur_PK: Likewise.
	* locales/wa_BE: Likewise.
	* locales/fa_IR: Fix yesexpr and noexpr.

5 files changed, 75 insertions, 6 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 59bc1fb..ceefe84 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T		 \
 	   GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8	 \
 	   TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213		 \
-	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS
+	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -172,7 +172,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
 	      mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h	    \
 	      ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
 	      euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c		    \
-	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c
+	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -213,7 +213,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
 			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
 			georgian-ps georgian-academy iso-ir-209 mac-sami   \
-			iso8859-11 ibm866nav
+			iso8859-11 ibm866nav pt154 rk1048
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index eec846b..a5b2d66 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1,5 +1,5 @@
 # GNU libc iconv configuration.
-# Copyright (C) 1997-1999, 2000-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -1561,3 +1561,12 @@ module	INTERNAL		Shift_JISX0213//	SHIFT_JISX0213	1
 #	from			to			module		cost
 module	TSCII//			INTERNAL		TSCII		1
 module	INTERNAL		TSCII//			TSCII		1
+
+#	from			to			module		cost
+module	PT154//			INTERNAL		PT154		1
+module	INTERNAL		PT154//			PT154		1
+
+#	from			to			module		cost
+alias	STRK1048-2002//		RK1048//
+module	RK1048//		INTERNAL		RK1048		1
+module	INTERNAL		RK1048//		RK1048		1
diff --git a/iconvdata/pt154.c b/iconvdata/pt154.c
new file mode 100644
index 0000000..6a8204a
--- /dev/null
+++ b/iconvdata/pt154.c
@@ -0,0 +1,29 @@
+/* Conversion from and to PT154.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <pt154.h>
+
+#define CHARSET_NAME   "PT154//"
+#define HAS_HOLES      0       /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/rk1048.c b/iconvdata/rk1048.c
new file mode 100644
index 0000000..f8b2ad3
--- /dev/null
+++ b/iconvdata/rk1048.c
@@ -0,0 +1,29 @@
+/* Conversion from and to RK1048.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <rk1048.h>
+
+#define CHARSET_NAME   "RK1048//"
+#define HAS_HOLES      1       /* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index abd9e8d..2c1c9d0 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
 #
@@ -205,6 +205,8 @@ cat <<EOF |
   ARMSCII-8
   TCVN5712-1
   TSCII
+  PT154
+  RK1048
   #
   # Multibyte encodings come here
   #