Update.

2000-10-27  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/Makefile (modules): Add VISCII.
	(gen-8bit-modules): Add viscii.
	* iconvdata/viscii.c: New file.
	* iconvdata/gconv-modules: Add entries for VISCII.
	* iconvdata/tst-tables.sh: Add VISCII.

4 files changed, 36 insertions, 4 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index a4a9616d51..d86d9ac058 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -46,7 +46,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI	 \
 	   SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK	 \
 	   ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-7 BIG5HKSCS	 \
-	   GB18030 ISO-2022-CN-EXT
+	   GB18030 ISO-2022-CN-EXT VISCII
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -147,8 +147,7 @@ extra-objs	+= $(modules.so)
 install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
 		  $(inst_gconvdir)/gconv-modules
 
-# If we have the localedata add-on available we can build the conversion
-# tables for numerous charsets.
+# We can build the conversion tables for numerous charsets automatically.
 
 gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
 		    hp-roman8 ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr	    \
@@ -156,7 +155,7 @@ gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
 		    ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr	    \
 		    ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \
 		    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
-		    ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16
+		    ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii
 
 gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index a1e855bd94..1e78ade07a 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1214,3 +1214,7 @@ module	INTERNAL		UTF-7//			UTF-7		1
 #	from			to			module		cost
 module	GB18030//		INTERNAL		GB18030		1
 module	INTERNAL		GB18030//		GB18030		1
+
+#	from			to			module		cost
+module	VISCII//		INTERNAL		VISCII		1
+module	INTERNAL		VISCII//		VISCII		1
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 6c63776087..4acc8e7e64 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -179,6 +179,7 @@ cat <<EOF |
   ISO-IR-197
   TIS-620
   KOI8-U
+  VISCII
   #ISIRI-3342                         This charset concept is completely broken
   #
   # Multibyte encodings come here
diff --git a/iconvdata/viscii.c b/iconvdata/viscii.c
new file mode 100644
index 0000000000..d285f7f40d
--- /dev/null
+++ b/iconvdata/viscii.c
@@ -0,0 +1,28 @@
+/* Conversion from and to VISCII.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Get the conversion table.  */
+#include <stdint.h>
+#include <viscii.h>
+
+#define CHARSET_NAME	"VISCII//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-generic.c>