From ec04e9baf6def57a05da896ff89acc95c1840fc7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 11 Sep 1998 15:55:01 +0000 Subject: [PATCH] Update. 1998-09-11 Ulrich Drepper * iconvdata/Makefile (modules): Add 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, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.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, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h. --- ChangeLog | 43 +++++++++++++++-- iconvdata/csn_369103.c | 29 ++++++++++++ iconvdata/cwi.c | 29 ++++++++++++ iconvdata/dec-mcs.c | 29 ++++++++++++ iconvdata/ecma-cyrillic.c | 29 ++++++++++++ iconvdata/gconv-modules | 90 ++++++++++++++++++++++++++++++++++++ iconvdata/gost_19768-74.c | 29 ++++++++++++ iconvdata/greek-ccitt.c | 29 ++++++++++++ iconvdata/greek7-old.c | 29 ++++++++++++ iconvdata/greek7.c | 29 ++++++++++++ iconvdata/inis-8.c | 29 ++++++++++++ iconvdata/inis-cyrillic.c | 29 ++++++++++++ iconvdata/inis.c | 29 ++++++++++++ iconvdata/{iso6937.c => iso6937-2.c} | 75 +++++++++++++++++++++--------- iconvdata/iso6937.c | 6 +-- iconvdata/iso_2033.c | 29 ++++++++++++ iconvdata/iso_5427-ext.c | 29 ++++++++++++ iconvdata/iso_5427.c | 29 ++++++++++++ iconvdata/iso_5428.c | 29 ++++++++++++ manual/top-menu.texi | 2 +- 20 files changed, 620 insertions(+), 31 deletions(-) create mode 100644 iconvdata/csn_369103.c create mode 100644 iconvdata/cwi.c create mode 100644 iconvdata/dec-mcs.c create mode 100644 iconvdata/ecma-cyrillic.c create mode 100644 iconvdata/gost_19768-74.c create mode 100644 iconvdata/greek-ccitt.c create mode 100644 iconvdata/greek7-old.c create mode 100644 iconvdata/greek7.c create mode 100644 iconvdata/inis-8.c create mode 100644 iconvdata/inis-cyrillic.c create mode 100644 iconvdata/inis.c copy iconvdata/{iso6937.c => iso6937-2.c} (93%) create mode 100644 iconvdata/iso_2033.c create mode 100644 iconvdata/iso_5427-ext.c create mode 100644 iconvdata/iso_5427.c create mode 100644 iconvdata/iso_5428.c diff --git a/ChangeLog b/ChangeLog index 70327fe48b..382a99ea3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +1998-09-11 Ulrich Drepper + + * iconvdata/Makefile (modules): Add 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, + and ISO_5428. + Define *-routines variables for new modules. + (distribute): Add .c files for new modules. + (awk-generated-headers): Add csn_369103.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, and iso_5428.h. + Add rules for hedaer generation. + * iconvdata/gconv-modules: Add entries for new modules. + * iconvdata/csn_369103.c: New file. + * iconvdata/cwi.c: New file. + * iconvdata/dec-mcs.c: New file. + * iconvdata/ecma-cyrillic.c: New file. + * iconvdata/gost_19768-74.c: New file. + * iconvdata/greek-ccitt.c: New file. + * iconvdata/greek7-old.c: New file. + * iconvdata/greek7.c: New file. + * iconvdata/inis-8.c: New file. + * iconvdata/inis-cyrillic.c: New file. + * iconvdata/inis.c: New file. + * iconvdata/iso6937-2.c: New file. + * iconvdata/iso_2033.c: New file. + * iconvdata/iso_5427-ext.c: New file. + * iconvdata/iso_5427.c: New file. + * iconvdata/iso_5428.c: New file. + + * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 + entries. + Convert U02dd correctly. + 1998-09-11 20:46 Richard Henderson * sysdeps/alpha/dl-machine.h (_dl_start_user): Pass pointer to @@ -50,10 +85,10 @@ * include/limits.h: Include gcc's header even if this file is found more than once before it (PR libc/778) - * sysdeps/unix/sysv/linux/Makefile (subdirs==misc) - [sysdep_headers]: Remove sys/debugreg.h. - * sysdeps/unix/sysv/linux/i386/Makefile (subdirs==misc) - [sysdep_headers]: Add sys/debugreg.h. + * sysdeps/unix/sysv/linux/Makefile [subdir==misc] + (sysdep_headers): Remove sys/debugreg.h. + * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] + (sysdep_headers): Add sys/debugreg.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: Removed. * sysdeps/unix/sysv/linux/i386/sys/debugreg.h: New file. diff --git a/iconvdata/csn_369103.c b/iconvdata/csn_369103.c new file mode 100644 index 0000000000..d24c96a80f --- /dev/null +++ b/iconvdata/csn_369103.c @@ -0,0 +1,29 @@ +/* Conversion from and to CSN_369103. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "CSN_369103//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/cwi.c b/iconvdata/cwi.c new file mode 100644 index 0000000000..ebbd052a7a --- /dev/null +++ b/iconvdata/cwi.c @@ -0,0 +1,29 @@ +/* Conversion from and to CWI. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "CWI//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/dec-mcs.c b/iconvdata/dec-mcs.c new file mode 100644 index 0000000000..2df81a85ba --- /dev/null +++ b/iconvdata/dec-mcs.c @@ -0,0 +1,29 @@ +/* Conversion from and to DEC-MCS. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "DEC-MCS//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/ecma-cyrillic.c b/iconvdata/ecma-cyrillic.c new file mode 100644 index 0000000000..656a095b25 --- /dev/null +++ b/iconvdata/ecma-cyrillic.c @@ -0,0 +1,29 @@ +/* Conversion from and to ECMA-CYRILLIC. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "ECMS-CYRILLIC//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 157b1b5df8..2fe0b10874 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -311,6 +311,13 @@ alias ISO6937// ISO_6937// module ISO_6937// INTERNAL ISO_6937 1 module INTERNAL ISO_6937// ISO_6937 1 + +# from to module cost +alias ISO-IR-90// ISO_6937-2// +alias ISO_6937-2:1983// ISO_6937-2// +module ISO_6937-2// INTERNAL ISO_6937-2 1 +module INTERNAL ISO_6937-2// ISO_6937-2 1 + # from to module cost alias SHIFT-JIS// SJIS// alias CP932// SJIS// @@ -844,3 +851,86 @@ alias CSA_T500// ANSI_X3.110// alias NAPLPS// ANSI_X3.110// module ANSI_X3.110// INTERNAL ANSI_X3.110 1 module INTERNAL ANSI_X3.110// ANSI_X3.110 1 + +# from to module cost +alias ISO-IR-139// CSN_369103// +module CSN_369103// INTERNAL CSN_369103 1 +module INTERNAL CSN_369103// CSN_369103 1 + +# from to module cost +alias CWI-2// CWI// +alias CP-HU// CWI// +module CWI// INTERNAL CWI 1 +module INTERNAL CWI// CWI 1 + +# from to module cost +alias DEC// DEC-MCS// +module DEC-MCS// INTERNAL DEC-MCS 1 +module INTERNAL DEC-MCS// DEC-MCS 1 + +# from to module cost +alias ISO-IR-111// ECMA-CYRILLIC// +module ECMA-CYRILLIC// INTERNAL ECMA-CYRILLIC 1 +module INTERNAL ECMA-CYRILLIC// ECMA-CYRILLIC 1 + +# from to module cost +alias ST_SEV_358-88// GOST_19768-74// +alias GOST_19768// GOST_19768-74// +alias ISO-IR-153// GOST_19768-74// +module GOST_19768-74// INTERNAL GOST_19768-74 1 +module INTERNAL GOST_19768-74// GOST_19768-74 1 + +# from to module cost +alias ISO-IR-150// GREEK-CCITT// +module GREEK-CCITT// INTERNAL GREEK-CCITT 1 +module INTERNAL GREEK-CCITT// GREEK-CCITT 1 + +# from to module cost +alias ISO-IR-88// GREEK7// +module GREEK7// INTERNAL GREEK7 1 +module INTERNAL GREEK7// GREEK7 1 + +# from to module cost +alias ISO-IR-18// GREEK7-OLD// +module GREEK7-OLD// INTERNAL GREEK7-OLD 1 +module INTERNAL GREEK7-OLD// GREEK7-OLD 1 + +# from to module cost +alias ISO-IR-49// INIS// +module INIS// INTERNAL INIS 1 +module INTERNAL INIS// INIS 1 + +# from to module cost +alias ISO-IR-50// INIS-8// +module INIS-8// INTERNAL INIS-8 1 +module INTERNAL INIS-8// INIS-8 1 + +# from to module cost +alias ISO-IR-51// INIS-CYRILLIC// +module INIS-CYRILLIC// INTERNAL INIS-CYRILLIC 1 +module INTERNAL INIS-CYRILLIC// INIS-CYRILLIC 1 + +# from to module cost +alias ISO-IR-98// ISO_2033// +alias ISO_2033-1983// ISO_2033// +alias E13B/ ISO_2033// +module ISO_2033// INTERNAL ISO_2033 1 +module INTERNAL ISO_2033// ISO_2033 1 + +# from to module cost +alias ISO-IR-37// ISO_5427// +alias KOI-7// ISO_5427// +module ISO_5427// INTERNAL ISO_5427 1 +module INTERNAL ISO_5427// ISO_5427 1 + +# from to module cost +alias ISO-IR-54// ISO_5427-EXT// +alias ISO_5427:1981// ISO_5427-EXT// +module ISO_5427-EXT// INTERNAL ISO_5427-EXT 1 +module INTERNAL ISO_5427-EXT// ISO_5427-EXT 1 + +# from to module cost +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 diff --git a/iconvdata/gost_19768-74.c b/iconvdata/gost_19768-74.c new file mode 100644 index 0000000000..04b0acf0ac --- /dev/null +++ b/iconvdata/gost_19768-74.c @@ -0,0 +1,29 @@ +/* Conversion from and to GOST_19768-74. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "GOST_19768-74//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/greek-ccitt.c b/iconvdata/greek-ccitt.c new file mode 100644 index 0000000000..8da00bf958 --- /dev/null +++ b/iconvdata/greek-ccitt.c @@ -0,0 +1,29 @@ +/* Conversion from and to GREEK-CCITT. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "GREEK-CCITT//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/greek7-old.c b/iconvdata/greek7-old.c new file mode 100644 index 0000000000..d2fa6657ed --- /dev/null +++ b/iconvdata/greek7-old.c @@ -0,0 +1,29 @@ +/* Conversion from and to GREEK7-OLD. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "GREEK7-OLD//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/greek7.c b/iconvdata/greek7.c new file mode 100644 index 0000000000..6cf5f3a810 --- /dev/null +++ b/iconvdata/greek7.c @@ -0,0 +1,29 @@ +/* Conversion from and to GREEK7. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "GREEK7//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/inis-8.c b/iconvdata/inis-8.c new file mode 100644 index 0000000000..a539dccce7 --- /dev/null +++ b/iconvdata/inis-8.c @@ -0,0 +1,29 @@ +/* Conversion from and to INIS-8. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "INIS-8//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/inis-cyrillic.c b/iconvdata/inis-cyrillic.c new file mode 100644 index 0000000000..f0d7b7ff79 --- /dev/null +++ b/iconvdata/inis-cyrillic.c @@ -0,0 +1,29 @@ +/* Conversion from and to INIS-CYRILLIC. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "INIS-CYRILLIC//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/inis.c b/iconvdata/inis.c new file mode 100644 index 0000000000..8108c46faf --- /dev/null +++ b/iconvdata/inis.c @@ -0,0 +1,29 @@ +/* Conversion from and to INIS. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "INIS//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/iso6937.c b/iconvdata/iso6937-2.c similarity index 93% copy from iconvdata/iso6937.c copy to iconvdata/iso6937-2.c index c927bd5fbb..c104d8358b 100644 --- a/iconvdata/iso6937.c +++ b/iconvdata/iso6937-2.c @@ -1,7 +1,7 @@ -/* Generic conversion to and from ISO 6937. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Generic conversion to and from ISO 6937-2. + Copyright (C) 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. + Contributed by Ulrich Drepper , 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 @@ -27,7 +27,7 @@ static const uint32_t to_ucs4[256] = /* 0x08 */ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, /* 0x10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x18 */ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, - /* 0x20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0034, 0x0025, 0x0026, 0x0027, + /* 0x20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027, /* 0x28 */ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, /* 0x30 */ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, /* 0x38 */ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, @@ -38,23 +38,23 @@ static const uint32_t to_ucs4[256] = /* 0x60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, /* 0x68 */ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, /* 0x70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - /* 0x78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, + /* 0x78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x203e, 0x007f, /* 0x80 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x88 */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* 0x90 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, /* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, - /* 0xa0 */ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x0000, 0x00a5, 0x0000, 0x00a7, - /* 0xa8 */ 0x00a4, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, + /* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0000, 0x00a7, + /* 0xa8 */ 0x0000, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, /* 0xb8 */ 0x00f7, 0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, /* 0xc0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xc8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0xd0 */ 0x2014, 0x00b9, 0x00ae, 0x00a9, 0x2122, 0x266a, 0x00ac, 0x00a6, + /* 0xd0 */ 0x2014, 0x00b9, 0x00ae, 0x00a9, 0x2122, 0x266a, 0x0000, 0x0000, /* 0xd8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, /* 0xe0 */ 0x2126, 0x00c6, 0x00d0, 0x00aa, 0x0126, 0x0000, 0x0132, 0x013f, /* 0xe8 */ 0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, /* 0xf0 */ 0x0138, 0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, - /* 0xf8 */ 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0x00ad + /* 0xf8 */ 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0x0000 }; /* The outer array range runs from 0xc1 to 0xcf, the inner range from 0x20 @@ -108,7 +108,7 @@ static const uint32_t to_ucs4_comb[15][96] = }, /* 0xc4 */ { - /* 0x20 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x20 */ 0x007e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -123,7 +123,7 @@ static const uint32_t to_ucs4_comb[15][96] = }, /* 0xc5 */ { - /* 0x20 */ 0x00af, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x20 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -276,7 +276,7 @@ static const char from_ucs4[][2] = /* 0x0014 */ "\x14\x00", "\x15\x00", "\x16\x00", "\x17\x00", "\x18\x00", /* 0x0019 */ "\x19\x00", "\x1a\x00", "\x1b\x00", "\x1c\x00", "\x1d\x00", /* 0x001e */ "\x1e\x00", "\x1f\x00", "\x20\x00", "\x21\x00", "\x22\x00", - /* 0x0023 */ "\x23\x00", "\x24\x00", "\x25\x00", "\x26\x00", "\x27\x00", + /* 0x0023 */ "\xa6\x00", "\xa4\x00", "\x25\x00", "\x26\x00", "\x27\x00", /* 0x0028 */ "\x28\x00", "\x29\x00", "\x2a\x00", "\x2b\x00", "\x2c\x00", /* 0x002d */ "\x2d\x00", "\x2e\x00", "\x2f\x00", "\x30\x00", "\x31\x00", /* 0x0032 */ "\x32\x00", "\x33\x00", "\x34\x00", "\x35\x00", "\x36\x00", @@ -294,19 +294,19 @@ static const char from_ucs4[][2] = /* 0x006e */ "\x6e\x00", "\x6f\x00", "\x70\x00", "\x71\x00", "\x72\x00", /* 0x0073 */ "\x73\x00", "\x74\x00", "\x75\x00", "\x76\x00", "\x77\x00", /* 0x0078 */ "\x78\x00", "\x79\x00", "\x7a\x00", "\x7b\x00", "\x7c\x00", - /* 0x007d */ "\x7d\x00", "\x7e\x00", "\x7f\x00", "\x00\x80", "\x00\x81", + /* 0x007d */ "\x7d\x00", "\x7e\x00", "\x7f\x00", "\x80\x00", "\x81\x00", /* 0x0082 */ "\x82\x00", "\x83\x00", "\x84\x00", "\x85\x00", "\x86\x00", /* 0x0087 */ "\x87\x00", "\x88\x00", "\x89\x00", "\x8a\x00", "\x8b\x00", /* 0x008c */ "\x8c\x00", "\x8d\x00", "\x8e\x00", "\x8f\x00", "\x90\x00", /* 0x0091 */ "\x91\x00", "\x92\x00", "\x93\x00", "\x94\x00", "\x95\x00", /* 0x0096 */ "\x96\x00", "\x97\x00", "\x98\x00", "\x99\x00", "\x9a\x00", /* 0x009b */ "\x9b\x00", "\x9c\x00", "\x9d\x00", "\x9e\x00", "\x9f\x00", - /* 0x00a0 */ "\xa0\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa4\x00", - /* 0x00a5 */ "\xa5\x00", "\xd7\x00", "\xa7\x00", "\xc8\x20", "\xd3\x00", - /* 0x00aa */ "\xe3\x00", "\xab\x00", "\xd6\x00", "\xff\x00", "\xd2\x00", + /* 0x00a0 */ "\x00\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa8\x00", + /* 0x00a5 */ "\xa5\x00", "\x00\x00", "\xa7\x00", "\xc8\x20", "\xd3\x00", + /* 0x00aa */ "\xe3\x00", "\xab\x00", "\x00\x00", "\x00\x00", "\xd2\x00", /* 0x00af */ "\xc5\x20", "\xb0\x00", "\xb1\x00", "\xb2\x00", "\xb3\x00", /* 0x00b4 */ "\xc2\x20", "\xb5\x00", "\xb6\x00", "\xb7\x00", "\xcb\x20", - /* 0x00b9 */ "\xc1\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00", + /* 0x00b9 */ "\xd1\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00", /* 0x00be */ "\xbe\x00", "\xbf\x00", "\xc1\x41", "\xc2\x41", "\xc3\x41", /* 0x00c3 */ "\xc4\x41", "\xc8\x41", "\xca\x41", "\xe1\x00", "\xcb\x43", /* 0x00c8 */ "\xc1\x45", "\xc2\x45", "\xc3\x45", "\xc8\x45", "\xc1\x49", @@ -357,12 +357,20 @@ static const char from_ucs4[][2] = 0x2014 "\xd0\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\xa9\x00", 0x2019 "\xb9\x00", "\x00\x00", "\x00\x00", "\xaa\x00", "\xba\x00", 0x201e "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\xd4\x00", - 0x2123 "\x00\x00", "\x00\x00", "\x00\x00", "\xe0\x00", "\x00\x00", + 0x2123 "\x00\x00", "\x00\x00", "\x00\x00", "\xe0\x00", ... 0x215b "\xdc\x00", "\xdd\x00", "\xde\x00" ... 0x2190 "\xac\x00", "\xad\x00", "\xae\x00", "\xaf\x00", ... + 0x2500 "\xd6\x00", "\x00\x00", "\xd7\x00", + ... + 0x253c "\xe5\x00", + ... + 0x2571 "\xd8\x00", "\xd9\x00", + ... + 0x25e2 "\xda\x00", "\xdb\x00", + ... 0x266a "\xd5\x00" These would blow up the table and are therefore handled specially in @@ -372,9 +380,9 @@ static const char from_ucs4[][2] = /* Definitions used in the body of the `gconv' function. */ -#define CHARSET_NAME "ISO_6937//" -#define FROM_LOOP from_iso6937 -#define TO_LOOP to_iso6937 +#define CHARSET_NAME "ISO_6937-2//" +#define FROM_LOOP from_iso6937_2 +#define TO_LOOP to_iso6937_2 #define DEFINE_INIT 1 #define DEFINE_FINI 1 #define MIN_NEEDED_FROM 1 @@ -382,7 +390,7 @@ static const char from_ucs4[][2] = #define MIN_NEEDED_TO 4 -/* First define the conversion function from ISO 6937 to UCS4. */ +/* First define the conversion function from ISO 6937-2 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM #define MAX_NEEDED_INPUT MAX_NEEDED_FROM #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO @@ -464,7 +472,7 @@ static const char from_ucs4[][2] = break; \ case 0x2d8 ... 0x2dd: \ { \ - static const char map[5] = "\xc6\xc7\xca\xce\xcd"; \ + static const char map[6] = "\xc6\xc7\xca\xce\x00"; \ \ tmp[0] = map[ch - 0x2d8]; \ tmp[1] = ' '; \ @@ -502,6 +510,27 @@ static const char from_ucs4[][2] = tmp[1] = '\0'; \ cp = tmp; \ break; \ + case 0x2500: \ + cp = "\xd6"; \ + break; \ + case 0x2502: \ + cp = "\xd7"; \ + break; \ + case 0x253c: \ + cp = "\xe5"; \ + break; \ + case 0x2571: \ + cp = "\xd8"; \ + break; \ + case 0x2572: \ + cp = "\xd9"; \ + break; \ + case 0x25e2: \ + cp = "\xda"; \ + break; \ + case 0x25e3: \ + cp = "\xdb"; \ + break; \ case 0x266a: \ cp = "\xd5"; \ break; \ diff --git a/iconvdata/iso6937.c b/iconvdata/iso6937.c index c927bd5fbb..5e9f25f995 100644 --- a/iconvdata/iso6937.c +++ b/iconvdata/iso6937.c @@ -294,7 +294,7 @@ static const char from_ucs4[][2] = /* 0x006e */ "\x6e\x00", "\x6f\x00", "\x70\x00", "\x71\x00", "\x72\x00", /* 0x0073 */ "\x73\x00", "\x74\x00", "\x75\x00", "\x76\x00", "\x77\x00", /* 0x0078 */ "\x78\x00", "\x79\x00", "\x7a\x00", "\x7b\x00", "\x7c\x00", - /* 0x007d */ "\x7d\x00", "\x7e\x00", "\x7f\x00", "\x00\x80", "\x00\x81", + /* 0x007d */ "\x7d\x00", "\x7e\x00", "\x7f\x00", "\x80\x00", "\x81\x00", /* 0x0082 */ "\x82\x00", "\x83\x00", "\x84\x00", "\x85\x00", "\x86\x00", /* 0x0087 */ "\x87\x00", "\x88\x00", "\x89\x00", "\x8a\x00", "\x8b\x00", /* 0x008c */ "\x8c\x00", "\x8d\x00", "\x8e\x00", "\x8f\x00", "\x90\x00", @@ -306,7 +306,7 @@ static const char from_ucs4[][2] = /* 0x00aa */ "\xe3\x00", "\xab\x00", "\xd6\x00", "\xff\x00", "\xd2\x00", /* 0x00af */ "\xc5\x20", "\xb0\x00", "\xb1\x00", "\xb2\x00", "\xb3\x00", /* 0x00b4 */ "\xc2\x20", "\xb5\x00", "\xb6\x00", "\xb7\x00", "\xcb\x20", - /* 0x00b9 */ "\xc1\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00", + /* 0x00b9 */ "\xd1\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00", /* 0x00be */ "\xbe\x00", "\xbf\x00", "\xc1\x41", "\xc2\x41", "\xc3\x41", /* 0x00c3 */ "\xc4\x41", "\xc8\x41", "\xca\x41", "\xe1\x00", "\xcb\x43", /* 0x00c8 */ "\xc1\x45", "\xc2\x45", "\xc3\x45", "\xc8\x45", "\xc1\x49", @@ -464,7 +464,7 @@ static const char from_ucs4[][2] = break; \ case 0x2d8 ... 0x2dd: \ { \ - static const char map[5] = "\xc6\xc7\xca\xce\xcd"; \ + static const char map[6] = "\xc6\xc7\xca\xce\x00\xcd"; \ \ tmp[0] = map[ch - 0x2d8]; \ tmp[1] = ' '; \ diff --git a/iconvdata/iso_2033.c b/iconvdata/iso_2033.c new file mode 100644 index 0000000000..6c51773db7 --- /dev/null +++ b/iconvdata/iso_2033.c @@ -0,0 +1,29 @@ +/* Conversion from and to ISO_2033-1983. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "ISO_2033-1983//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/iso_5427-ext.c b/iconvdata/iso_5427-ext.c new file mode 100644 index 0000000000..455ff3435f --- /dev/null +++ b/iconvdata/iso_5427-ext.c @@ -0,0 +1,29 @@ +/* Conversion from and to ISO_5427-EXT. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "ISO_5427-EXT//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/iso_5427.c b/iconvdata/iso_5427.c new file mode 100644 index 0000000000..a1863f22ab --- /dev/null +++ b/iconvdata/iso_5427.c @@ -0,0 +1,29 @@ +/* Conversion from and to ISO_5427. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "ISO_5427//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/iso_5428.c b/iconvdata/iso_5428.c new file mode 100644 index 0000000000..63cb7e5d29 --- /dev/null +++ b/iconvdata/iso_5428.c @@ -0,0 +1,29 @@ +/* Conversion from and to ISO_5428. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "ISO_5428//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/manual/top-menu.texi b/manual/top-menu.texi index dacb1a937d..1c8d3e9248 100644 --- a/manual/top-menu.texi +++ b/manual/top-menu.texi @@ -228,7 +228,7 @@ Locales with library functions. * Standard Locales:: Locale names available on all systems. * Locale Information:: How to access the information for the locale. -* Formatting Numbers:: A dedicated functions to format numbers. +* Formatting Numbers:: A dedicated function to format numbers. Locale Information -- 2.11.4.GIT