[BZ #4972]

*** empty log message ***
	[BZ #4972]
	* iconvdata/Makefile (modules): Add MAC-CENTRALEUROPE.
	(distribute): Add mac-centraleurope.c.
	(gen-8bit-gap-modules): Add mac-centraleurope.
	* iconvdata/mac-centraleurope.c: New file.
	* iconvdata/gconv-modules: Add entries for MAC-CENTRALEUROPE.
	* iconvdata/TESTS: Likewise.
	* iconvdata/tst-tables.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index eff373a9db30ad85c8f49e2ea55dc8834875d07d..263019a6eb59536e519c16eb9f4744639fdab6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-09-23  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #4972]
+       * iconvdata/Makefile (modules): Add MAC-CENTRALEUROPE.
+       (distribute): Add mac-centraleurope.c.
+       (gen-8bit-gap-modules): Add mac-centraleurope.
+       * iconvdata/mac-centraleurope.c: New file.
+       * iconvdata/gconv-modules: Add entries for MAC-CENTRALEUROPE.
+       * iconvdata/TESTS: Likewise.
+       * iconvdata/tst-tables.sh: Likewise.
+
        [BZ #5043]
        * iconv/iconv_open.c (iconv_open): For large codeset names use malloc.
 

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 26bf61ed5e972bf3ac78caea82f5c0c7d5945ffa..e3ec8468f923b9c0b32347e25a6e0ae2be9b685a 100644 (file)
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -58,7 +58,8 @@ modules       := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
           IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148       \
           IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971       \
           IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-          IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF
+          IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF   \
+          MAC-CENTRALEUROPE
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -197,7 +198,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
              ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
              ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
              ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c   \
-             brf.c
+             brf.c mac-centraleurope.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -238,7 +239,8 @@ 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 pt154 rk1048 mik brf
+                       iso8859-11 ibm866nav pt154 rk1048 mik brf \
+                       mac-centraleurope
 
 gen-special-modules := iso8859-7jp
 

diff --git a/iconvdata/TESTS b/iconvdata/TESTS
index 2743cc1ff6ed5add0b742e973fa5d79f36c2fbab..251f24b73113dc1cac69342356d362ce9b421ddb 100644 (file)
--- a/iconvdata/TESTS
+++ b/iconvdata/TESTS
@@ -167,3 +167,5 @@ IBM1399                     IBM1399                 N       UTF8
 ISO_11548-1            ISO_11548-1             -       UTF8
 MIK                    MIK                     Y       UTF8
 BRF                    BRF                     -       UTF8
+MAC-SAMI               MAC-SAMI                Y       UTF8
+MAC-CENTRALEUROPE      MAC-CENTRALEUROPE       Y       UTF8

diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 8d4667fc8af79f433e09c3597e2032677d335d1d..fc8e3cdb2c7ef68172d29be248194f7208b69ab0 100644 (file)
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1911,3 +1911,8 @@ module    INTERNAL                MIK//                   MIK             1
 #      from                    to                      module          cost
 module BRF//                   INTERNAL                BRF             1
 module INTERNAL                BRF//                   BRF             1
+
+#      from                    to                      module          cost
+alias  CP1282//                MAC-CENTRALEUROPE//
+module MAC-CENTRALEUROPE//     INTERNAL                MAC-CENTRALEUROPE 1
+module INTERNAL                MAC-CENTRALEUROPE//     MAC-CENTRALEUROPE 1

diff --git a/iconvdata/mac-centraleurope.c b/iconvdata/mac-centraleurope.c
new file mode 100644 (file)
index 0000000..41bcf39
--- /dev/null
+++ b/iconvdata/mac-centraleurope.c
@@ -0,0 +1,29 @@
+/* Conversion from and to MAC-CENTRALEUROPE.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   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 <mac-centraleurope.h>
+
+#define CHARSET_NAME   "MAC-CENTRALEUROPE//"
+#define HAS_HOLES      0       /* All 256 character are defined.  */
+
+#include <8bit-gap.c>

diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index be1e8832a5002d81c7d04bf784ee7fdab6249ec1..a9f84273991c6a79f9cdefc8dff8d3f596b6b3c0 100755 (executable)
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -209,6 +209,7 @@ cat <<EOF |
   RK1048
   MIK
   BRF
+  MAC-CENTRALEUROPE
   #
   # Multibyte encodings come here
   #