From 87520cccf6207f0a3525b5a5d5dc2ffd80b3d416 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 8 Dec 2007 01:38:23 +0000 Subject: [BZ #5427] * iconvdata/hp-roman9.c: New file. * iconvdata/Makefile: Add rules for hp-roman9.c. * iconvdata/tst-tables.sh: Add HP-ROMAN9. * iconvdata/hp-roman8.c: Use 8bit-gap instead of 8bit-generic. * iconvdata/Makefile: Adjust appropriately. keyword for gcc's braced-groups. --- iconvdata/Makefile | 8 ++++---- iconvdata/hp-roman8.c | 8 ++++---- iconvdata/hp-roman9.c | 29 +++++++++++++++++++++++++++++ iconvdata/tst-tables.sh | 1 + 4 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 iconvdata/hp-roman9.c (limited to 'iconvdata') diff --git a/iconvdata/Makefile b/iconvdata/Makefile index ca4c713..7572f27 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -25,7 +25,7 @@ subdir := iconvdata modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \ ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16 \ - T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 EBCDIC-AT-DE \ + T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE \ EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC \ BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO \ EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \ @@ -198,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 mac-centraleurope.c + brf.c mac-centraleurope.c hp-roman9.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -217,7 +217,7 @@ install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \ # 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 \ + ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr \ ebcdic-dk-no ebcdic-dk-no-a ebcdic-es ebcdic-es-a \ ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr \ ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \ @@ -241,7 +241,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ 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 \ - mac-centraleurope koi8-ru + mac-centraleurope koi8-ru hp-roman8 hp-roman9 gen-special-modules := iso8859-7jp diff --git a/iconvdata/hp-roman8.c b/iconvdata/hp-roman8.c index 9833a07..ec29d82 100644 --- a/iconvdata/hp-roman8.c +++ b/iconvdata/hp-roman8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN8. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,10 +20,10 @@ #include -/* Get the conversion table. */ -#include +/* Specify the conversion table. */ +#define TABLES #define CHARSET_NAME "HP-ROMAN8//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/hp-roman9.c b/iconvdata/hp-roman9.c new file mode 100644 index 0000000..2f14815 --- /dev/null +++ b/iconvdata/hp-roman9.c @@ -0,0 +1,29 @@ +/* Conversion from and to HP-ROMAN9. + Copyright (C) 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Specify the conversion table. */ +#define TABLES + +#define CHARSET_NAME "HP-ROMAN9//" +#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 f240e51..5cb2e9e 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -80,6 +80,7 @@ cat <