diff options
29 files changed, 1705 insertions, 24 deletions
@@ -1,5 +1,32 @@ 2011-05-09 Ulrich Drepper <drepper@gmail.com> + [BZ #11532] + * iconvdata/Makefile: Add rules to build CP770, CP771, CP772, CP773, + and CP774 modules. + * iconvdata/gconv-modules: Add entries for CP770, CP771, CP772, CP773, + and CP774 modules. + * iconvdata/tst-tables.sh: Likewise. + * iconvdata/cp770.c: New file. + * iconvdata/cp771.c: New file. + * iconvdata/cp772.c: New file. + * iconvdata/cp773.c: New file. + * iconvdata/cp774.c: New file. + * iconvdata/testdata/CP770: New file. + * iconvdata/testdata/CP770..UTF8: New file. + * iconvdata/testdata/CP771: New file. + * iconvdata/testdata/CP771..UTF8: New file. + * iconvdata/testdata/CP772: New file. + * iconvdata/testdata/CP772..UTF8: New file. + * iconvdata/testdata/CP773: New file. + * iconvdata/testdata/CP773..UTF8: New file. + * iconvdata/testdata/CP774: New file. + * iconvdata/testdata/CP774..UTF8: New file. + + * iconvdata/gen-8bit-gap-1.sh: End reading of charmap file at + END CHARMAP line. + * iconvdata/gen-8bit-gap.sh: Likewise. + * iconvdata/gen-8bit.sh: Likewise. + * locale/iso-639.def: Add ary entry. * locale/C-translit.h.in: Add U20A1 transliteration. @@ -9,11 +9,11 @@ Version 2.14 * The following bugs are resolved with this release: - 11578, 11653, 11668, 11724, 11945, 11947, 12158, 12178, 12200, 12346, - 12393, 12420, 12445, 12449, 12454, 12460, 12469, 12489, 12509, 12510, - 12518, 12541, 12545, 12551, 12583, 12587, 12597, 12611, 12631, 12650, - 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, 12723, - 12734, 12738 + 11532, 11578, 11653, 11668, 11724, 11945, 11947, 12158, 12178, 12200, + 12346, 12393, 12420, 12445, 12449, 12454, 12460, 12469, 12489, 12509, + 12510, 12518, 12541, 12545, 12551, 12583, 12587, 12597, 12611, 12631, + 12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713, 12714, 12717, + 12723, 12734, 12738 * The RPC implementation in libc is obsoleted. Old programs keep working but new programs cannot be linked with the routines in libc anymore. diff --git a/iconvdata/Makefile b/iconvdata/Makefile index d8fb282871..d79756cbdd 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2004,2005,2006,2007,2008 Free Software Foundation, Inc. +# Copyright (C) 1997-2008, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -53,13 +53,14 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213 \ ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048 \ IBM1025 IBM1122 IBM1137 IBM1153 IBM1154 IBM1155 IBM1156 \ - IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008 \ - IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141 \ - IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 \ - IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \ + IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008 \ + IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141 \ + 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 \ - MAC-CENTRALEUROPE KOI8-RU ISO8859-9E + MAC-CENTRALEUROPE KOI8-RU ISO8859-9E \ + CP770 CP771 CP772 CP773 CP774 modules.so := $(addsuffix .so, $(modules)) @@ -202,7 +203,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \ 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 hp-roman9.c hp-turkish8.c \ - hp-thai8.c hp-greek8.c + hp-thai8.c hp-greek8.c cp770.c cp771.c cp772.c cp773.c cp774.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -225,7 +226,7 @@ gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \ ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a \ ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \ ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \ - ibm891 ibm903 ibm904 ibm905 ibm1047 \ + ibm891 ibm903 ibm904 ibm905 ibm1047 gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \ @@ -246,7 +247,8 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ mac-centraleurope koi8-ru hp-roman8 hp-roman9 \ ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk \ iso8859-16 viscii iso8859-9e hp-turkish8 \ - hp-thai8 hp-greek8 + hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774 + gen-special-modules := iso8859-7jp diff --git a/iconvdata/cp770.c b/iconvdata/cp770.c new file mode 100644 index 0000000000..059e7bb03e --- /dev/null +++ b/iconvdata/cp770.c @@ -0,0 +1,29 @@ +/* Conversion from and to CP770. + Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. + + 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> + +/* Specify the conversion table. */ +#define TABLES <cp770.h> + +#define CHARSET_NAME "CP770//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/cp771.c b/iconvdata/cp771.c new file mode 100644 index 0000000000..01e8f24ec8 --- /dev/null +++ b/iconvdata/cp771.c @@ -0,0 +1,29 @@ +/* Conversion from and to CP771. + Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. + + 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> + +/* Specify the conversion table. */ +#define TABLES <cp771.h> + +#define CHARSET_NAME "CP771//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/cp772.c b/iconvdata/cp772.c new file mode 100644 index 0000000000..0d3b06762e --- /dev/null +++ b/iconvdata/cp772.c @@ -0,0 +1,29 @@ +/* Conversion from and to CP772. + Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. + + 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> + +/* Specify the conversion table. */ +#define TABLES <cp772.h> + +#define CHARSET_NAME "CP772//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/cp773.c b/iconvdata/cp773.c new file mode 100644 index 0000000000..2224def560 --- /dev/null +++ b/iconvdata/cp773.c @@ -0,0 +1,29 @@ +/* Conversion from and to CP773. + Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. + + 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> + +/* Specify the conversion table. */ +#define TABLES <cp773.h> + +#define CHARSET_NAME "CP773//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/cp774.c b/iconvdata/cp774.c new file mode 100644 index 0000000000..f2175be4eb --- /dev/null +++ b/iconvdata/cp774.c @@ -0,0 +1,29 @@ +/* Conversion from and to CP774. + Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. + + 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> + +/* Specify the conversion table. */ +#define TABLES <cp774.h> + +#define CHARSET_NAME "CP774//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index a31871645f..9a870943dd 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1997-2005, 2007, 2008, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -1224,6 +1224,26 @@ module CP737// INTERNAL CP737 1 module INTERNAL CP737// CP737 1 # from to module cost +module CP770// INTERNAL CP770 1 +module INTERNAL CP770// CP770 1 + +# from to module cost +module CP771// INTERNAL CP771 1 +module INTERNAL CP771// CP771 1 + +# from to module cost +module CP772// INTERNAL CP772 1 +module INTERNAL CP772// CP772 1 + +# from to module cost +module CP773// INTERNAL CP773 1 +module INTERNAL CP773// CP773 1 + +# from to module cost +module CP774// INTERNAL CP774 1 +module INTERNAL CP774// CP774 1 + +# from to module cost alias IBM775// CP775// alias CSPC775BALTIC// CP775// module CP775// INTERNAL CP775 1 diff --git a/iconvdata/gen-8bit-gap-1.sh b/iconvdata/gen-8bit-gap-1.sh index 7b8baeb871..e86ac53e89 100644 --- a/iconvdata/gen-8bit-gap-1.sh +++ b/iconvdata/gen-8bit-gap-1.sh @@ -1,15 +1,15 @@ #! /bin/sh echo "static const uint32_t iso88597_to_ucs4[96] = {" -sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ +sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \ -e 's/^<U\(....\)>[[:space:]]*.x\([A-Fa-f].\).*/ [0x\2 - 0xA0] = 0x\1,/p' \ "$@" | sort -u echo "};" echo "static const struct gap from_idx[] = {" -sed -ne 's/^<U\(....\)>[[:space:]]*.x[A-Fa-f]..*/\1/p' \ +sed -ne 's/^<U\(....\)>[[:space:]]*.x[A-Fa-f]..*/\1/p;/^END/q' \ "$@" | sort -u | $AWK -f gap.awk echo " { .start = 0xffff, .end = 0xffff, .idx = 0 }" echo "};" echo "static const char iso88597_from_ucs4[] = {" -sed -ne 's/^<U\(....\)>[[:space:]]*.x\([A-Fa-f].\).*/0x\1 0x\2/p' \ +sed -ne 's/^<U\(....\)>[[:space:]]*.x\([A-Fa-f].\).*/0x\1 0x\2/p;/^END/q' \ "$@" | sort -u | $AWK -f gaptab.awk echo "};" diff --git a/iconvdata/gen-8bit-gap.sh b/iconvdata/gen-8bit-gap.sh index d0b59d320c..e1dabaebdb 100644 --- a/iconvdata/gen-8bit-gap.sh +++ b/iconvdata/gen-8bit-gap.sh @@ -1,15 +1,15 @@ #! /bin/sh echo "static const uint32_t to_ucs4[256] = {" -sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ +sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\2] = 0x\1,/p' \ "$@" | sort -u echo "};" echo "static const struct gap from_idx[] = {" -sed -ne 's/^<U\(....\).*/\1/p' \ +sed -ne 's/^<U\(....\).*/\1/p;/^END/q' \ "$@" | sort -u | $AWK -f gap.awk echo " { .start = 0xffff, .end = 0xffff, .idx = 0 }" echo "};" echo "static const char from_ucs4[] = {" -sed -ne 's/^<U\(....\)>[[:space:]]*.x\(..\).*/\1 \2/p' \ +sed -ne 's/^<U\(....\)>[[:space:]]*.x\(..\).*/\1 \2/p;/^END/q' \ "$@" | sort -u | $AWK -f gaptab.awk echo "};" diff --git a/iconvdata/gen-8bit.sh b/iconvdata/gen-8bit.sh index e434c05984..d1a21bc03d 100644 --- a/iconvdata/gen-8bit.sh +++ b/iconvdata/gen-8bit.sh @@ -1,11 +1,11 @@ #! /bin/sh echo "static const uint32_t to_ucs4[256] = {" -sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ +sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\2] = 0x\1,/p' \ "$@" | sort -u echo "};" echo "static const char from_ucs4[] = {" -sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d' \ +sed -ne '/^[^[:space:]]*[[:space:]]*.x00/d;/^END/q' \ -e 's/^<U\(....\)>[[:space:]]*.x\(..\).*/ [0x\1] = 0x\2,/p' \ "$@" | sort -u echo "};" diff --git a/iconvdata/testdata/CP770 b/iconvdata/testdata/CP770 new file mode 100644 index 0000000000..b3a5bf4ab5 --- /dev/null +++ b/iconvdata/testdata/CP770 @@ -0,0 +1,14 @@ + ! " # $ % & ' ( ) * + , - . / + 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + @ A B C D E F G H I J K L M N O + P Q R S T U V W X Y Z [ \ ] ^ _ + ` a b c d e f g h i j k l m n o + p q r s t u v w x y z { | } ~ + + + + + + + + diff --git a/iconvdata/testdata/CP770..UTF8 b/iconvdata/testdata/CP770..UTF8 new file mode 100644 index 0000000000..ddfc685053 --- /dev/null +++ b/iconvdata/testdata/CP770..UTF8 @@ -0,0 +1,14 @@ + ! " # $ % & ' ( ) * + , - . / + 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + @ A B C D E F G H I J K L M N O + P Q R S T U V W X Y Z [ \ ] ^ _ + ` a b c d e f g h i j k l m n o + p q r s t u v w x y z { | } ~ + Č ü ė ā ä ą ļ č ē Ē ę Ę ī į Ä Ą + Ė ž Ž õ ö Õ ū ų ģ Ö Ü ¢ Ļ „ š Š + Ā Ī ķ Ķ ņ Ņ Ū Ų Ģ ⌐ ¬ ½ ¼ Į « » + ░ ▒ ▓ │ ┤ ╡ ╢ ╖ ╕ ╣ ║ ╗ ╝ ╜ ╛ ┐ + └ ┴ ┬ ├ ─ ┼ ╞ ╟ ╚ ╔ ╩ ╦ ╠ ═ ╬ ╧ + ╨ ╤ ╥ ╙ ╘ ╒ ╓ ╫ ╪ ┘ ┌ █ ▄ ▌ ▐ ▀ + α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ + ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■ diff --git a/iconvdata/testdata/CP771 b/iconvdata/testdata/CP771 new file mode 100644 index 0000000000..b3a5bf4ab5 --- /dev/null +++ b/iconvdata/testdata/CP771 @@ -0,0 +1,14 @@ + ! " # $ % & ' ( ) * + , - . / + 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + @ A B C D E F G H I J K L M N O + P Q R S T U V W X Y Z [ \ ] ^ _ + ` a b c d e f g h i j k l m n o + p q r s t u v w x y z { | } ~ + + + + + + + + diff --git a/iconvdata/testdata/CP771..UTF8 b/iconvdata/testdata/CP771..UTF8 new file mode 100644 index 0000000000..12b82b23f6 --- /dev/null +++ b/iconvdata/testdata/CP771..UTF8 @@ -0,0 +1,14 @@ + ! " # $ % & ' ( ) * + , - . / + 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + @ A B C D E F G H I J K L M N O + P Q R S T U V W X Y Z [ \ ] ^ _ + ` a b c d e f g h i |