diff --git a/ChangeLog b/ChangeLog index 49b5cac2db..0afc4764f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-01-14 Ulrich Drepper + + * iconvdata/Makefile: Add rules to build IBM866NAV. + * iconvdata/ibm866nav.c: New file. + * iconvdata/tst-tables.sh: Add IBM866NAV. + * iconvdata/gconv-modules: Add entries for IBM866NAV. + 2003-01-13 Ulrich Drepper * string/tester.c (test_strcpy): Use the previously #if 0'ed code diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 9584d4d5ed..5e96ef5203 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1997-2002, 2003 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 @@ -51,7 +51,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T \ GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8 \ TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213 \ - ISO-2022-JP-3 TSCII + ISO-2022-JP-3 TSCII IBM866NAV modules.so := $(addsuffix .so, $(modules)) @@ -167,7 +167,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \ mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h \ ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \ euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c \ - tcvn5712-1.c armscii-8.c tscii.c + tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -208,7 +208,7 @@ 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 + iso8859-11 ibm866nav gen-special-modules := iso8859-7jp diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 68df77a2fc..7a08baad46 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc. +# Copyright (C) 1997-1999, 2000-2002, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -823,6 +823,12 @@ alias CSIBM866// IBM866// module IBM866// INTERNAL IBM866 1 module INTERNAL IBM866// IBM866 1 +# from to module cost +alias CP866NAV// IBM866NAV// +alias 866NAV// IBM866NAV// +module IBM866NAV// INTERNAL IBM866NAV 1 +module INTERNAL IBM866NAV// IBM866NAV 1 + # from to module cost alias CP868// IBM868// alias CP-AR// IBM868// diff --git a/iconvdata/ibm866nav.c b/iconvdata/ibm866nav.c new file mode 100644 index 0000000000..5940827bdb --- /dev/null +++ b/iconvdata/ibm866nav.c @@ -0,0 +1,29 @@ +/* Conversion from and to IBM866NAV. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + 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 + +/* Get the conversion table. */ +#define TABLES + +#define CHARSET_NAME "IBM866NAV//" +#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 e333a5ad36..094e3bea74 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible , 2000. # @@ -127,6 +127,7 @@ cat < + + * charmaps/IBM866NAV: New file. Contributed by vidybida@bitp.kiev.ua. + 2002-12-03 Roland McGrath * charmaps/CP1125: New file. @@ -5,7 +9,7 @@ 2002-11-06 Thorsten Kukuk - * locales/tl_PH: Fix typo: Philipines -> Philippines. + * locales/tl_PH: Fix typo: Philipines -> Philippines. 2002-10-18 Bruno Haible diff --git a/localedata/charmaps/IBM866NAV b/localedata/charmaps/IBM866NAV new file mode 100644 index 0000000000..c994d37cc9 --- /dev/null +++ b/localedata/charmaps/IBM866NAV @@ -0,0 +1,271 @@ + IBM866NAV + % + / +% Obtained by editing IBM866 charmap (Alexander Vidybida) +% +% Corresponds to Ukrainian texts produced with "keyrus" screen and +% keyboard driver under DOS +% +% Corresponds to file `cp866nav.def' from the +% standard LaTeX `Cyrillic Bundle' except of codes /xfd, /xfe + +% alias CP866NAV +% alias 866NAV +CHARMAP + /x00 NULL + /x01 START OF HEADING + /x02 START OF TEXT + /x03 END OF TEXT + /x04 END OF TRANSMISSION + /x05 ENQUIRY + /x06 ACKNOWLEDGE + /x07 BELL + /x08 BACKSPACE + /x09 HORIZONTAL TABULATION + /x0a LINE FEED + /x0b VERTICAL TABULATION + /x0c FORM FEED + /x0d CARRIAGE RETURN + /x0e SHIFT OUT + /x0f SHIFT IN + /x10 DATA LINK ESCAPE + /x11 DEVICE CONTROL ONE + /x12 DEVICE CONTROL TWO + /x13 DEVICE CONTROL THREE + /x14 DEVICE CONTROL FOUR + /x15 NEGATIVE ACKNOWLEDGE + /x16 SYNCHRONOUS IDLE + /x17 END OF TRANSMISSION BLOCK + /x18 CANCEL + /x19 END OF MEDIUM + /x1a SUBSTITUTE + /x1b ESCAPE + /x1c FILE SEPARATOR + /x1d GROUP SEPARATOR + /x1e RECORD SEPARATOR + /x1f UNIT SEPARATOR + /x20 SPACE + /x21 EXCLAMATION MARK + /x22 QUOTATION MARK + /x23 NUMBER SIGN + /x24 DOLLAR SIGN + /x25 PERCENT SIGN + /x26 AMPERSAND + /x27 APOSTROPHE + /x28 LEFT PARENTHESIS + /x29 RIGHT PARENTHESIS + /x2a ASTERISK + /x2b PLUS SIGN + /x2c COMMA + /x2d HYPHEN-MINUS + /x2e FULL STOP + /x2f SOLIDUS + /x30 DIGIT ZERO + /x31 DIGIT ONE + /x32 DIGIT TWO + /x33 DIGIT THREE + /x34 DIGIT FOUR + /x35 DIGIT FIVE + /x36 DIGIT SIX + /x37 DIGIT SEVEN + /x38 DIGIT EIGHT + /x39 DIGIT NINE + /x3a COLON + /x3b SEMICOLON + /x3c LESS-THAN SIGN + /x3d EQUALS SIGN + /x3e GREATER-THAN SIGN + /x3f QUESTION MARK + /x40 COMMERCIAL AT + /x41 LATIN CAPITAL LETTER A + /x42 LATIN CAPITAL LETTER B + /x43 LATIN CAPITAL LETTER C + /x44 LATIN CAPITAL LETTER D + /x45 LATIN CAPITAL LETTER E + /x46 LATIN CAPITAL LETTER F + /x47 LATIN CAPITAL LETTER G + /x48 LATIN CAPITAL LETTER H + /x49 LATIN CAPITAL LETTER I + /x4a LATIN CAPITAL LETTER J + /x4b LATIN CAPITAL LETTER K + /x4c LATIN CAPITAL LETTER L + /x4d LATIN CAPITAL LETTER M + /x4e LATIN CAPITAL LETTER N + /x4f LATIN CAPITAL LETTER O + /x50 LATIN CAPITAL LETTER P + /x51 LATIN CAPITAL LETTER Q + /x52 LATIN CAPITAL LETTER R + /x53 LATIN CAPITAL LETTER S + /x54 LATIN CAPITAL LETTER T + /x55 LATIN CAPITAL LETTER U + /x56 LATIN CAPITAL LETTER V + /x57 LATIN CAPITAL LETTER W + /x58 LATIN CAPITAL LETTER X + /x59 LATIN CAPITAL LETTER Y + /x5a LATIN CAPITAL LETTER Z + /x5b LEFT SQUARE BRACKET + /x5c REVERSE SOLIDUS + /x5d RIGHT SQUARE BRACKET + /x5e CIRCUMFLEX ACCENT + /x5f LOW LINE + /x60 GRAVE ACCENT + /x61 LATIN SMALL LETTER A + /x62 LATIN SMALL LETTER B + /x63 LATIN SMALL LETTER C + /x64 LATIN SMALL LETTER D + /x65 LATIN SMALL LETTER E + /x66 LATIN SMALL LETTER F + /x67 LATIN SMALL LETTER G + /x68 LATIN SMALL LETTER H + /x69 LATIN SMALL LETTER I + /x6a LATIN SMALL LETTER J + /x6b LATIN SMALL LETTER K + /x6c LATIN SMALL LETTER L + /x6d LATIN SMALL LETTER M + /x6e LATIN SMALL LETTER N + /x6f LATIN SMALL LETTER O + /x70 LATIN SMALL LETTER P + /x71 LATIN SMALL LETTER Q + /x72 LATIN SMALL LETTER R + /x73 LATIN SMALL LETTER S + /x74 LATIN SMALL LETTER T + /x75 LATIN SMALL LETTER U + /x76 LATIN SMALL LETTER V + /x77 LATIN SMALL LETTER W + /x78 LATIN SMALL LETTER X + /x79 LATIN SMALL LETTER Y + /x7a LATIN SMALL LETTER Z + /x7b LEFT CURLY BRACKET + /x7c VERTICAL LINE + /x7d RIGHT CURLY BRACKET + /x7e TILDE + /x7f DELETE + /x80 CYRILLIC CAPITAL LETTER A + /x81 CYRILLIC CAPITAL LETTER BE + /x82 CYRILLIC CAPITAL LETTER VE + /x83 CYRILLIC CAPITAL LETTER GHE + /x84 CYRILLIC CAPITAL LETTER DE + /x85 CYRILLIC CAPITAL LETTER IE + /x86 CYRILLIC CAPITAL LETTER ZHE + /x87 CYRILLIC CAPITAL LETTER ZE + /x88 CYRILLIC CAPITAL LETTER I + /x89 CYRILLIC CAPITAL LETTER SHORT I + /x8a CYRILLIC CAPITAL LETTER KA + /x8b CYRILLIC CAPITAL LETTER EL + /x8c CYRILLIC CAPITAL LETTER EM + /x8d CYRILLIC CAPITAL LETTER EN + /x8e CYRILLIC CAPITAL LETTER O + /x8f CYRILLIC CAPITAL LETTER PE + /x90 CYRILLIC CAPITAL LETTER ER + /x91 CYRILLIC CAPITAL LETTER ES + /x92 CYRILLIC CAPITAL LETTER TE + /x93 CYRILLIC CAPITAL LETTER U + /x94 CYRILLIC CAPITAL LETTER EF + /x95 CYRILLIC CAPITAL LETTER HA + /x96 CYRILLIC CAPITAL LETTER TSE + /x97 CYRILLIC CAPITAL LETTER CHE + /x98 CYRILLIC CAPITAL LETTER SHA + /x99 CYRILLIC CAPITAL LETTER SHCHA + /x9a CYRILLIC CAPITAL LETTER HARD SIGN + /x9b CYRILLIC CAPITAL LETTER YERU + /x9c CYRILLIC CAPITAL LETTER SOFT SIGN + /x9d CYRILLIC CAPITAL LETTER E + /x9e CYRILLIC CAPITAL LETTER YU + /x9f CYRILLIC CAPITAL LETTER YA + /xa0 CYRILLIC SMALL LETTER A + /xa1 CYRILLIC SMALL LETTER BE + /xa2 CYRILLIC SMALL LETTER VE + /xa3 CYRILLIC SMALL LETTER GHE + /xa4 CYRILLIC SMALL LETTER DE + /xa5 CYRILLIC SMALL LETTER IE + /xa6 CYRILLIC SMALL LETTER ZHE + /xa7 CYRILLIC SMALL LETTER ZE + /xa8 CYRILLIC SMALL LETTER I + /xa9 CYRILLIC SMALL LETTER SHORT I + /xaa CYRILLIC SMALL LETTER KA + /xab CYRILLIC SMALL LETTER EL + /xac CYRILLIC SMALL LETTER EM + /xad CYRILLIC SMALL LETTER EN + /xae CYRILLIC SMALL LETTER O + /xaf CYRILLIC SMALL LETTER PE + /xb0 LIGHT SHADE + /xb1 MEDIUM SHADE + /xb2 DARK SHADE + /xb3 BOX DRAWINGS LIGHT VERTICAL + /xb4 BOX DRAWINGS LIGHT VERTICAL AND LEFT + /xb5 BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE + /xb6 BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE + /xb7 BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE + /xb8 BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE + /xb9 BOX DRAWINGS DOUBLE VERTICAL AND LEFT + /xba BOX DRAWINGS DOUBLE VERTICAL + /xbb BOX DRAWINGS DOUBLE DOWN AND LEFT + /xbc BOX DRAWINGS DOUBLE UP AND LEFT + /xbd BOX DRAWINGS UP DOUBLE AND LEFT SINGLE + /xbe BOX DRAWINGS UP SINGLE AND LEFT DOUBLE + /xbf BOX DRAWINGS LIGHT DOWN AND LEFT + /xc0 BOX DRAWINGS LIGHT UP AND RIGHT + /xc1 BOX DRAWINGS LIGHT UP AND HORIZONTAL + /xc2 BOX DRAWINGS LIGHT DOWN AND HORIZONTAL + /xc3 BOX DRAWINGS LIGHT VERTICAL AND RIGHT + /xc4 BOX DRAWINGS LIGHT HORIZONTAL + /xc5 BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL + /xc6 BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE + /xc7 BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE + /xc8 BOX DRAWINGS DOUBLE UP AND RIGHT + /xc9 BOX DRAWINGS DOUBLE DOWN AND RIGHT + /xca BOX DRAWINGS DOUBLE UP AND HORIZONTAL + /xcb BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL + /xcc BOX DRAWINGS DOUBLE VERTICAL AND RIGHT + /xcd BOX DRAWINGS DOUBLE HORIZONTAL + /xce BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL + /xcf BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE + /xd0 BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE + /xd1 BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE + /xd2 BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE + /xd3 BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE + /xd4 BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE + /xd5 BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE + /xd6 BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE + /xd7 BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE + /xd8 BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE + /xd9 BOX DRAWINGS LIGHT UP AND LEFT + /xda BOX DRAWINGS LIGHT DOWN AND RIGHT + /xdb FULL BLOCK + /xdc LOWER HALF BLOCK + /xdd LEFT HALF BLOCK + /xde RIGHT HALF BLOCK + /xdf UPPER HALF BLOCK + /xe0 CYRILLIC SMALL LETTER ER + /xe1 CYRILLIC SMALL LETTER ES + /xe2 CYRILLIC SMALL LETTER TE + /xe3 CYRILLIC SMALL LETTER U + /xe4 CYRILLIC SMALL LETTER EF + /xe5 CYRILLIC SMALL LETTER HA + /xe6 CYRILLIC SMALL LETTER TSE + /xe7 CYRILLIC SMALL LETTER CHE + /xe8 CYRILLIC SMALL LETTER SHA + /xe9 CYRILLIC SMALL LETTER SHCHA + /xea CYRILLIC SMALL LETTER HARD SIGN + /xeb CYRILLIC SMALL LETTER YERU + /xec CYRILLIC SMALL LETTER SOFT SIGN + /xed CYRILLIC SMALL LETTER E + /xee CYRILLIC SMALL LETTER YU + /xef CYRILLIC SMALL LETTER YA + /xf0 CYRILLIC CAPITAL LETTER IO + /xf1 CYRILLIC SMALL LETTER IO + /xf2 CYRILLIC CAPITAL LETTER GHE WITH UPTURN + /xf3 CYRILLIC SMALL LETTER GHE WITH UPTURN + /xf4 CYRILLIC CAPITAL LETTER UKRAINIAN IE + /xf5 CYRILLIC SMALL LETTER UKRAINIAN IE + /xf6 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + /xf7 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + /xf8 CYRILLIC CAPITAL LETTER YI (Ukrainian) + /xf9 CYRILLIC SMALL LETTER YI (Ukrainian) + /xfa CYRILLIC CAPITAL LETTER SHORT U + /xfb CYRILLIC SMALL LETTER SHORT U + /xfc NUMERO SIGN + /xfd CURRENCY SIGN + /xfe BLACK SQUARE + /xff NO-BREAK SPACE +END CHARMAP