Update.

2001-05-24  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/Makefile: Add rules for CP10007.
	* iconvdata/gconv-modules: Add entries for CP10007 ad MacCyrillic.
	* iconvdata/cp10007.c: New file.
	* iconvdata/tst-tables.sh: Add CP10007.

4 files changed, 43 insertions, 4 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 0f2e375..3db17d6 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -47,7 +47,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-32 UTF-7 BIG5HKSCS \
-	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5
+	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -136,7 +136,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h  \
 	      iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
 	      iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c	    \
-	      ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c
+	      ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -175,7 +175,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 tis-620 koi8-u ibm874
+			iso-ir-197 tis-620 koi8-u ibm874 cp10007
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/cp10007.c b/iconvdata/cp10007.c
new file mode 100644
index 0000000..b343c2c
--- /dev/null
+++ b/iconvdata/cp10007.c
@@ -0,0 +1,29 @@
+/* Conversion from and to CP10007 (MS MacCyrillic).
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
+
+   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 <cp10007.h>
+
+#define CHARSET_NAME	"CP10007//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index e1831ab..6ea56d3 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1324,10 +1324,19 @@ module	INTERNAL		MAC-IS//		MAC-IS		1
 
 #	from			to			module		cost
 alias	MACUK//			MAC-UK//
+alias	MACUKRAINIAN//		MAC-UK//
+alias	MAC-CYRILLIC//		MAC-UK//
+alias	MACCYRILLIC//		MAC-UK//
 module	MAC-UK//		INTERNAL		MAC-UK		1
 module	INTERNAL		MAC-UK//		MAC-UK		1
 
 #	from			to			module		cost
+alias	MS-MAC-CYRILLIC//	CP10007//
+alias	MSMACCYRILLIC//		CP10007//
+module	CP10007//		INTERNAL		CP10007		1
+module	INTERNAL		CP10007//		CP10007		1
+
+#	from			to			module		cost
 alias	ISO-IR-9-1//		NATS-DANO//
 alias	CSNATSDANO//		NATS-DANO//
 alias	NATSDANO//		NATS-DANO//
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 4acc8e7..8a63c9b 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
 #
@@ -173,6 +173,7 @@ cat <<EOF |
   ISO_10367-BOX
   MAC-IS
   MAC-UK
+  CP10007
   NATS-DANO
   NATS-SEFI
   WIN-SAMI-2        SAMI-WS2