Update.

1999-04-10  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/Makefile (modules): Add TIS-620.
	(distribute): Add tis-620.c.
	(gen-8bit-gap-modules): tis-620.
	* iconvdata/tis-620.c: New file.
	* iconvdata/gconv-modules: Add TIS-620 entries.

	* iconvdata/asmo_449.c: Correct comment.

4 files changed, 43 insertions, 5 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index fd0159bdea..ea39c30c3c 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -44,7 +44,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   GOST_19768-74 GREEK-CCITT GREEK7 GREEK7-OLD INIS INIS-8	 \
 	   INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT	 \
 	   ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI	 \
-	   SAMI-WS2 ISO-IR-197
+	   SAMI-WS2 ISO-IR-197 TIS-620
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -111,7 +111,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c	    \
 	      koi8-r.c ksc5601.c ksc5601.h latin-greek.c latin-greek-1.c    \
 	      macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c  \
-	      t.61.c uhc.c sami-ws2.c iso-ir-197.c
+	      t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -151,7 +151,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			inis-cyrillic iso_2033 iso_5427 iso_5427-ext	   \
 			iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
-			iso-ir-197 cp1258
+			iso-ir-197 cp1258 tis-620
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/asmo_449.c b/iconvdata/asmo_449.c
index d56facf846..b10108facb 100644
--- a/iconvdata/asmo_449.c
+++ b/iconvdata/asmo_449.c
@@ -1,5 +1,5 @@
-/* Conversion from and to MACINTOSH.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+/* Conversion from and to ASMO_449.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 7aa4da57c9..b7e2d42961 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1129,3 +1129,12 @@ module	INTERNAL		WIN-SAMI-2//		SAMI-WS2	1
 #	from			to			module		cost
 module	ISO-IR-197//		INTERNAL		ISO-IR-197	1
 module	INTERNAL		ISO-IR-197//		ISO-IR-197	1
+
+#	from			to			module		cost
+alias	TIS620//		TIS-620//
+alias	TIS620-0//		TIS-620//
+alias	TIS620.2529-1//		TIS-620//
+alias	TIS620.2533-0//		TIS-620//
+alias	ISO-IR-166//		TIS-620//
+module	TIS-620//		INTERNAL		TIS-620		1
+module	INTERNAL		TIS-620//		TIS-620		1
diff --git a/iconvdata/tis-620.c b/iconvdata/tis-620.c
new file mode 100644
index 0000000000..d30ae6cac7
--- /dev/null
+++ b/iconvdata/tis-620.c
@@ -0,0 +1,29 @@
+/* Conversion from and to TIS-620.
+   Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
+
+   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.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <tis-620.h>
+
+#define CHARSET_NAME	"TIS-620//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>