diff --git a/ChangeLog b/ChangeLog index 96abc080ee..5e7261756b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2007-09-29 Ulrich Drepper + * iconvdata/Makefile (modules): Add ISO8859-9E. + (distribute): Add iso8859-9e.c. + (gen-8bit-gap-modules): Add iso8859-9e. + * iconvdata/iso8859-9e.c: New file. + * iconvdata/gconv-modules: Add entries for ISO-8859-9E. + * iconvdata/TESTS: Likewise. + * iconvdata/tst-tables.sh: Likewise. + + * iconvdata/koi8-r.c (HAS_HOLES): Define to 0. + * locale/iso-639.def: Add several new entries. 2007-09-24 Jakub Jelinek diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 8256bca2fc..bf52d52f8f 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -59,7 +59,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ 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 + MAC-CENTRALEUROPE KOI8-RU ISO8859-9E modules.so := $(addsuffix .so, $(modules)) @@ -166,7 +166,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \ inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c \ iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c \ iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c \ - iso8859-11.c iso8859-13.c iso8859-14.c \ + iso8859-11.c iso8859-13.c iso8859-14.c iso8859-9e.c \ iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c \ iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h \ jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c \ @@ -222,7 +222,8 @@ gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \ ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr \ ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \ ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \ - ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii + ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii \ + iso8859-9e gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \ diff --git a/iconvdata/TESTS b/iconvdata/TESTS index 4e1fdcd264..9284b448ef 100644 --- a/iconvdata/TESTS +++ b/iconvdata/TESTS @@ -39,6 +39,7 @@ ISO-8859-6 ISO-8859-6 Y UTF8 ISO-8859-7 ISO-8859-7 Y UTF8 ISO-8859-8 ISO-8859-8 Y UTF8 ISO-8859-9 ISO-8859-9 Y UTF8 +ISO-8859-9E ISO-8859-9E Y UTF8 ISO-8859-10 ISO-8859-10 Y UCS-2BE UTF8 ISO-8859-14 ISO-8859-14 Y UTF8 ISO-8859-15 ISO-8859-15 Y UTF8 diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index ae4cf5fdc9..a8fcd8f0b3 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1920,3 +1920,10 @@ module INTERNAL MAC-CENTRALEUROPE// MAC-CENTRALEUROPE 1 # from to module cost module KOI8-RU// INTERNAL KOI8-RU 1 module INTERNAL KOI8-RU// KOI8-RU 1 + +# from to module cost +alias ISO_8859-9E// ISO-8859-9E// +alias ISO8859-9E// ISO-8859-9E// +alias ISO88599E// ISO-8859-9E// +module ISO-8859-9E// INTERNAL ISO8859-9E 1 +module INTERNAL ISO-8859-9E// ISO8859-9E 1 diff --git a/iconvdata/iso8859-9e.c b/iconvdata/iso8859-9e.c new file mode 100644 index 0000000000..7048edac6f --- /dev/null +++ b/iconvdata/iso8859-9e.c @@ -0,0 +1,28 @@ +/* Conversion from and to ISO 8859-9E. + 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. */ + +/* Get the conversion table. */ +#include +#include + +#define CHARSET_NAME "ISO-8859-9E//" +#define HAS_HOLES 0 /* All 256 character are defined. */ + +#include <8bit-generic.c> diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index b9eecd0683..f240e51f36 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -65,6 +65,7 @@ cat < + + * charmaps/ISO-8859-9E: New file. + 2007-09-28 Ulrich Drepper * charmaps/KOI8-RU: New file. diff --git a/localedata/charmaps/ISO-8859-9E b/localedata/charmaps/ISO-8859-9E new file mode 100644 index 0000000000..005f1de6d3 --- /dev/null +++ b/localedata/charmaps/ISO-8859-9E @@ -0,0 +1,263 @@ + ISO-8859-9E + % + / +% version: 1.2 + +CHARMAP + /x00 NULL (NUL) + /x01 START OF HEADING (SOH) + /x02 START OF TEXT (STX) + /x03 END OF TEXT (ETX) + /x04 END OF TRANSMISSION (EOT) + /x05 ENQUIRY (ENQ) + /x06 ACKNOWLEDGE (ACK) + /x07 BELL (BEL) + /x08 BACKSPACE (BS) + /x09 CHARACTER TABULATION (HT) + /x0a LINE FEED (LF) + /x0b LINE TABULATION (VT) + /x0c FORM FEED (FF) + /x0d CARRIAGE RETURN (CR) + /x0e SHIFT OUT (SO) + /x0f SHIFT IN (SI) + /x10 DATALINK ESCAPE (DLE) + /x11 DEVICE CONTROL ONE (DC1) + /x12 DEVICE CONTROL TWO (DC2) + /x13 DEVICE CONTROL THREE (DC3) + /x14 DEVICE CONTROL FOUR (DC4) + /x15 NEGATIVE ACKNOWLEDGE (NAK) + /x16 SYNCHRONOUS IDLE (SYN) + /x17 END OF TRANSMISSION BLOCK (ETB) + /x18 CANCEL (CAN) + /x19 END OF MEDIUM (EM) + /x1a SUBSTITUTE (SUB) + /x1b ESCAPE (ESC) + /x1c FILE SEPARATOR (IS4) + /x1d GROUP SEPARATOR (IS3) + /x1e RECORD SEPARATOR (IS2) + /x1f UNIT SEPARATOR (IS1) + /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 (DEL) + /x80 PADDING CHARACTER (PAD) + /x81 HIGH OCTET PRESET (HOP) + /x82 BREAK PERMITTED HERE (BPH) + /x83 NO BREAK HERE (NBH) + /x84 INDEX (IND) + /x85 NEXT LINE (NEL) + /x86 START OF SELECTED AREA (SSA) + /x87 END OF SELECTED AREA (ESA) + /x88 CHARACTER TABULATION SET (HTS) + /x89 CHARACTER TABULATION WITH JUSTIFICATION (HTJ) + /x8a LINE TABULATION SET (VTS) + /x8b PARTIAL LINE FORWARD (PLD) + /x8c PARTIAL LINE BACKWARD (PLU) + /x8d REVERSE LINE FEED (RI) + /x8e SINGLE-SHIFT TWO (SS2) + /x8f SINGLE-SHIFT THREE (SS3) + /x90 DEVICE CONTROL STRING (DCS) + /x91 PRIVATE USE ONE (PU1) + /x92 PRIVATE USE TWO (PU2) + /x93 SET TRANSMIT STATE (STS) + /x94 CANCEL CHARACTER (CCH) + /x95 MESSAGE WAITING (MW) + /x96 START OF GUARDED AREA (SPA) + /x97 END OF GUARDED AREA (EPA) + /x98 START OF STRING (SOS) + /x99 SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) + /x9a SINGLE CHARACTER INTRODUCER (SCI) + /x9b CONTROL SEQUENCE INTRODUCER (CSI) + /x9c STRING TERMINATOR (ST) + /x9d OPERATING SYSTEM COMMAND (OSC) + /x9e PRIVACY MESSAGE (PM) + /x9f APPLICATION PROGRAM COMMAND (APC) + /xa0 NO-BREAK SPACE + /xa1 LATIN CAPITAL LETTER Z WITH CARON + /xa2 CENT SIGN + /xa3 POUND SIGN + /xa4 EURO SIGN + /xa5 YEN SIGN + /xa6 LATIN CAPITAL LETTER I WITH BREVE + /xa7 SECTION SIGN + /xa8 LATIN CAPITAL LETTER U WITH BREVE + /xa9 COPYRIGHT SIGN + /xaa LATIN CAPITAL LETTER G WITH CARON + /xab LEFT-POINTING DOUBLE ANGLE QUOTATION MARK + /xac LATIN CAPITAL LETTER ENG + /xad SOFT HYPHEN + /xae REGISTERED SIGN + /xaf LATIN CAPITAL LETTER O WITH CARON + /xb0 DEGREE SIGN + /xb1 LATIN SMALL LETTER Z WITH CARON + /xb2 SUPERSCRIPT TWO + /xb3 SUPERSCRIPT THREE + /xb4 ACUTE ACCENT + /xb5 MICRO SIGN + /xb6 LATIN SMALL LETTER I WITH BREVE + /xb7 MIDDLE DOT + /xb8 LATIN SMALL LETTER U WITH BREVE + /xb9 SUPERSCRIPT ONE + /xba LATIN SMALL LETTER G WITH CARON + /xbb RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + /xbc LATIN SMALL LETTER ENG + /xbd VULGAR FRACTION ONE HALF + /xbe LATIN CAPITAL LETTER Y WITH DIAERESIS + /xbf LATIN SMALL LETTER O WITH CARON + /xc0 LATIN CAPITAL LETTER A WITH GRAVE + /xc1 LATIN CAPITAL LETTER A WITH ACUTE + /xc2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX + /xc3 LATIN CAPITAL LETTER A WITH TILDE + /xc4 LATIN CAPITAL LETTER A WITH DIAERESIS + /xc5 LATIN CAPITAL LETTER A WITH RING ABOVE + /xc6 LATIN CAPITAL LETTER SCHWA + /xc7 LATIN CAPITAL LETTER C WITH CEDILLA + /xc8 LATIN CAPITAL LETTER E WITH GRAVE + /xc9 LATIN CAPITAL LETTER E WITH ACUTE + /xca LATIN CAPITAL LETTER E WITH CIRCUMFLEX + /xcb LATIN CAPITAL LETTER E WITH DIAERESIS + /xcc LATIN CAPITAL LETTER I WITH GRAVE + /xcd LATIN CAPITAL LETTER I WITH ACUTE + /xce LATIN CAPITAL LETTER I WITH CIRCUMFLEX + /xcf LATIN CAPITAL LETTER I WITH DIAERESIS + /xd0 LATIN CAPITAL LETTER G WITH BREVE + /xd1 LATIN CAPITAL LETTER N WITH TILDE + /xd2 LATIN CAPITAL LETTER O WITH GRAVE + /xd3 LATIN CAPITAL LETTER O WITH ACUTE + /xd4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX + /xd5 LATIN CAPITAL LETTER O WITH TILDE + /xd6 LATIN CAPITAL LETTER O WITH DIAERESIS + /xd7 LATIN CAPITAL LETTER Y WITH ACUTE + /xd8 LATIN CAPITAL LETTER BARRED O + /xd9 LATIN CAPITAL LETTER U WITH GRAVE + /xda LATIN CAPITAL LETTER U WITH ACUTE + /xdb LATIN CAPITAL LETTER U WITH CIRCUMFLEX + /xdc LATIN CAPITAL LETTER U WITH DIAERESIS + /xdd LATIN CAPITAL LETTER I WITH DOT ABOVE + /xde LATIN CAPITAL LETTER S WITH CEDILLA + /xdf LATIN SMALL LETTER SHARP S (German) + /xe0 LATIN SMALL LETTER A WITH GRAVE + /xe1 LATIN SMALL LETTER A WITH ACUTE + /xe2 LATIN SMALL LETTER A WITH CIRCUMFLEX + /xe3 LATIN SMALL LETTER A WITH TILDE + /xe4 LATIN SMALL LETTER A WITH DIAERESIS + /xe5 LATIN SMALL LETTER A WITH RING ABOVE + /xe6 LATIN SMALL LETTER SCHWA + /xe7 LATIN SMALL LETTER C WITH CEDILLA + /xe8 LATIN SMALL LETTER E WITH GRAVE + /xe9 LATIN SMALL LETTER E WITH ACUTE + /xea LATIN SMALL LETTER E WITH CIRCUMFLEX + /xeb LATIN SMALL LETTER E WITH DIAERESIS + /xec LATIN SMALL LETTER I WITH GRAVE + /xed LATIN SMALL LETTER I WITH ACUTE + /xee LATIN SMALL LETTER I WITH CIRCUMFLEX + /xef LATIN SMALL LETTER I WITH DIAERESIS + /xf0 LATIN SMALL LETTER G WITH BREVE + /xf1 LATIN SMALL LETTER N WITH TILDE + /xf2 LATIN SMALL LETTER O WITH GRAVE + /xf3 LATIN SMALL LETTER O WITH ACUTE + /xf4 LATIN SMALL LETTER O WITH CIRCUMFLEX + /xf5 LATIN SMALL LETTER O WITH TILDE + /xf6 LATIN SMALL LETTER O WITH DIAERESIS + /xf7 LATIN SMALL LETTER Y WITH ACUTE + /xf8 LATIN SMALL LETTER BARRED O + /xf9 LATIN SMALL LETTER U WITH GRAVE + /xfa LATIN SMALL LETTER U WITH ACUTE + /xfb LATIN SMALL LETTER U WITH CIRCUMFLEX + /xfc LATIN SMALL LETTER U WITH DIAERESIS + /xfd LATIN SMALL LETTER DOTLESS I + /xfe LATIN SMALL LETTER S WITH CEDILLA + /xff LATIN SMALL LETTER Y WITH DIAERESIS +END CHARMAP