diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | iconvdata/Makefile | 20 | ||||
| -rw-r--r-- | iconvdata/gconv-modules | 19 | ||||
| -rw-r--r-- | iconvdata/iso_10367-box.c | 29 | ||||
| -rw-r--r-- | iconvdata/mac-is.c | 29 | ||||
| -rw-r--r-- | iconvdata/nats-dano.c | 29 | ||||
| -rw-r--r-- | iconvdata/nats-sefi.c | 29 |
7 files changed, 166 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9b02273498..fc001dd5ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,19 @@ latest possible point to allow partly initialized structures (e.g., from strptime). + * iconvdata/Makefile (modules): Add ISO_10367-BOX, MAC-IS, NATS-DANO, + and NATS-SEFI. + Define *-routines variables for new modules. + (distribute): Add .c files for new modules. + (awk-generated-headers): Add iso_10367-box.h, mac-is.h, nats-dano.h, + and nats-sefi.h. + Add rules for header generation. + * iconvdata/gconv-modules: Add entries for new modules. + * iconvdata/iso_10367-box.c: New file. + * iconvdata/mac-is.c: New file. + * iconvdata/nats-dano.c: New file. + * iconvdata/nats-sefi.c: New file. + 1998-04-30 18:20 H.J. Lu <hjl@gnu.org> * elf/dl-load.c (_dl_init_paths): Don't check the dynamic @@ -33,7 +46,7 @@ ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. - Add rules for hedaer generation. + Add rules for header generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. diff --git a/iconvdata/Makefile b/iconvdata/Makefile index c77de4f0a1..2c5bba3293 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -41,7 +41,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ ASMO_449 ANSI_X3.110 CSN_369103 CWI DEC-MCS ECMA-CYRILLIC \ 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_5428 ISO_10367-BOX MAC-IS NATS-DANO NATS-SEFI modules.so := $(addsuffix .so, $(modules)) @@ -167,6 +167,10 @@ ISO_2033-routines := iso_2033 ISO_5427-routines := iso_5427 ISO_5427-EXT-routines := iso_5427-ext ISO_5428-routines := iso_5428 +ISO_10367-BOX-routines := iso_10367-box +MAC-IS-routines := mac-is +NATS-DANO-routines := nats-dano +NATS-SEFI-routines := nats-dano libJIS-routines := jis0201 jis0208 jis0212 libKSC-routines := ksc5601 libGB-routines := gb2312 @@ -224,7 +228,7 @@ distribute := 8bit-generic.c 8bit-gap.c gap.awk gaptab.awk gconv-modules \ cwi.c dec-mcs.c ecma-cyrillic.c gost_19768-74.c greek-ccitt.c \ greek7.c greek7-old.c inis.c inis-8.c inis-cyrillic.c \ iso6937-2.c iso_2033.c iso_5427.c iso_5427-ext.c \ - iso_5428.c + iso_5428.c iso_10367-box.c mac-is.c nats-dano.c nats-sefi.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -295,7 +299,8 @@ awk-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h \ cwi.h dec-mcs.h ecma-cyrillic.h gost_19768-74.h\ greek-ccitt.h greek7.h greek7-old.h inis.h \ inis-8.h inis-cyrillic.h iso_2033.h iso_5427.h \ - iso_5427-ext.h iso_5428.h + iso_5427-ext.h iso_5428.h iso_10367-box.h \ + mac-is.h nats-dano.h nats-sefi.h generated = $(sed-generated-headers) $(sed-generated-headers:%.h=%.stmp) \ $(awk-generated-headers) $(awk-generated-headers:%.h=%.stmp) \ @@ -534,6 +539,15 @@ $(objpfx)iso_5427-ext.stmp: ../localedata/charmaps/ISO_5427-EXT gen-8bit-gap.sh $(generate-8bit-gap-table) $(objpfx)iso_5428.stmp: ../localedata/charmaps/ISO_5428 gen-8bit-gap.sh $(generate-8bit-gap-table) +$(objpfx)iso_10367-box.stmp: ../localedata/charmaps/ISO_10367-BOX \ + gen-8bit-gap.sh + $(generate-8bit-gap-table) +$(objpfx)mac-is.stmp: ../localedata/charmaps/MAC-IS gen-8bit-gap.sh + $(generate-8bit-gap-table) +$(objpfx)nats-dano.stmp: ../localedata/charmaps/NATS-DANO gen-8bit-gap.sh + $(generate-8bit-gap-table) +$(objpfx)nats-sefi.stmp: ../localedata/charmaps/NATS-SEFI gen-8bit-gap.sh + $(generate-8bit-gap-table) headers: $(addprefix $(objpfx),\ $(sed-generated-headers) $(awk-generated-headers)) diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 2fe0b10874..136f5921e5 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -934,3 +934,22 @@ alias ISO-IR-55// ISO_5428// alias ISO_5428:1980// ISO_5428// module ISO_5428// INTERNAL ISO_5428 1 module INTERNAL ISO_5428// ISO_5428 1 + +# from to module cost +alias ISO-IR-155// ISO_10367-BOX// +module ISO_10367-BOX// INTERNAL ISO_10367-BOX 1 +module INTERNAL ISO_10367-BOX// ISO_10367-BOX 1 + +# from to module cost +module MAC-IS// INTERNAL MAC-IS 1 +module INTERNAL MAC-IS// MAC-IS 1 + +# from to module cost +alias ISO-IR-9-1// NATS-DANO// +module NATS-DANO// INTERNAL NATS-DANO 1 +module INTERNAL NATS-DANO// NATS-DANO 1 + +# from to module cost +alias ISO-IR-8-1// NATS-SEFI// +module NATS-SEFI// INTERNAL NATS-SEFI 1 +module INTERNAL NATS-SEFI// NATS-SEFI 1 diff --git a/iconvdata/iso_10367-box.c b/iconvdata/iso_10367-box.c new file mode 100644 index 0000000000..bf395ac995 --- /dev/null +++ b/iconvdata/iso_10367-box.c @@ -0,0 +1,29 @@ +/* Conversion from and to ISO_10367-BOX. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + 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 <iso_10367-box.h> + +#define CHARSET_NAME "ISO_10367-BOX//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/mac-is.c b/iconvdata/mac-is.c new file mode 100644 index 0000000000..d6d0619a3b --- /dev/null +++ b/iconvdata/mac-is.c @@ -0,0 +1,29 @@ +/* Conversion from and to MAC-IS. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + 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 <mac-is.h> + +#define CHARSET_NAME "MAC-IS//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/nats-dano.c b/iconvdata/nats-dano.c new file mode 100644 index 0000000000..0fe0b44d36 --- /dev/null +++ b/iconvdata/nats-dano.c @@ -0,0 +1,29 @@ +/* Conversion from and to NATS-DANO. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + 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 <nats-dano.h> + +#define CHARSET_NAME "NATS-DANO//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/nats-sefi.c b/iconvdata/nats-sefi.c new file mode 100644 index 0000000000..c078179a34 --- /dev/null +++ b/iconvdata/nats-sefi.c @@ -0,0 +1,29 @@ +/* Conversion from and to NATS-SEFI. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + 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 <nats-sefi.h> + +#define CHARSET_NAME "NATS-SEFI//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> |