From 90bf831bda032b2a0ef772741877e922e4c8ed4d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 29 Sep 2007 04:35:54 +0000 Subject: [PATCH] * iconvdata/Makefile (modules): Add KOI8-RU. (distribute): Add koi8-ru.c. (gen-8bit-gap-modules): Add koi8-ru. * iconvdata/koi8-ru.c: New file. * iconvdata/gconv-modules: Add entries for KOI8-RU. * iconvdata/TESTS: Likewise. * iconvdata/tst-tables.sh: Likewise. * iconvdata/koi8-r.c (HAS_HOLES): Define to 0. --- ChangeLog | 12 ++ iconvdata/Makefile | 4 +- iconvdata/TESTS | 1 + iconvdata/gconv-modules | 4 + iconvdata/koi8-r.c | 4 +- iconvdata/koi8-ru.c | 29 ++++ iconvdata/tst-tables.sh | 1 + localedata/ChangeLog | 4 + localedata/charmaps/KOI8-RU | 264 ++++++++++++++++++++++++++++++++++++ 9 files changed, 319 insertions(+), 4 deletions(-) create mode 100644 iconvdata/koi8-ru.c create mode 100644 localedata/charmaps/KOI8-RU diff --git a/ChangeLog b/ChangeLog index ed21b4f857..cac8b8acb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-09-28 Ulrich Drepper + + * iconvdata/Makefile (modules): Add KOI8-RU. + (distribute): Add koi8-ru.c. + (gen-8bit-gap-modules): Add koi8-ru. + * iconvdata/koi8-ru.c: New file. + * iconvdata/gconv-modules: Add entries for KOI8-RU. + * iconvdata/TESTS: Likewise. + * iconvdata/tst-tables.sh: Likewise. + + * iconvdata/koi8-r.c (HAS_HOLES): Define to 0. + 2007-09-26 Jakub Jelinek * misc/sys/cdefs.h (__warndecl, __errordecl): For GCC 4.3+ define diff --git a/iconvdata/Makefile b/iconvdata/Makefile index e3ec8468f9..8256bca2fc 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 + MAC-CENTRALEUROPE KOI8-RU modules.so := $(addsuffix .so, $(modules)) @@ -240,7 +240,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \ georgian-ps georgian-academy iso-ir-209 mac-sami \ iso8859-11 ibm866nav pt154 rk1048 mik brf \ - mac-centraleurope + mac-centraleurope koi8-ru gen-special-modules := iso8859-7jp diff --git a/iconvdata/TESTS b/iconvdata/TESTS index 251f24b731..4e1fdcd264 100644 --- a/iconvdata/TESTS +++ b/iconvdata/TESTS @@ -169,3 +169,4 @@ MIK MIK Y UTF8 BRF BRF - UTF8 MAC-SAMI MAC-SAMI Y UTF8 MAC-CENTRALEUROPE MAC-CENTRALEUROPE Y UTF8 +KOI8-RU KOI8-RU Y UTF8 diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index fc8e3cdb2c..ae4cf5fdc9 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1916,3 +1916,7 @@ module INTERNAL BRF// BRF 1 alias CP1282// MAC-CENTRALEUROPE// module MAC-CENTRALEUROPE// INTERNAL MAC-CENTRALEUROPE 1 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 diff --git a/iconvdata/koi8-r.c b/iconvdata/koi8-r.c index 88fe157a03..2e7934d0b0 100644 --- a/iconvdata/koi8-r.c +++ b/iconvdata/koi8-r.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-R. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -24,6 +24,6 @@ #define TABLES #define CHARSET_NAME "KOI8-R//" -#define HAS_HOLES 1 /* Not all 256 character are defined. */ +#define HAS_HOLES 0 /* All 256 character are defined. */ #include <8bit-gap.c> diff --git a/iconvdata/koi8-ru.c b/iconvdata/koi8-ru.c new file mode 100644 index 0000000000..ce1b1cff59 --- /dev/null +++ b/iconvdata/koi8-ru.c @@ -0,0 +1,29 @@ +/* Conversion from and to KOI8-RU. + Copyright (C) 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 20077. + + 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 + +/* Specify the conversion table. */ +#define TABLES + +#define CHARSET_NAME "KOI8-RU//" +#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 a9f8427399..b9eecd0683 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -210,6 +210,7 @@ cat < + + * charmaps/KOI8-RU: New file. + 2007-09-23 Ulrich Drepper [BZ #4556] diff --git a/localedata/charmaps/KOI8-RU b/localedata/charmaps/KOI8-RU new file mode 100644 index 0000000000..ce9857f667 --- /dev/null +++ b/localedata/charmaps/KOI8-RU @@ -0,0 +1,264 @@ + KOI8-RU + % + / +% version: 1.0 +% source: Draft RFC rfc-draft-koi8-ru.txt + +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 BOX DRAWINGS LIGHT HORIZONTAL + /x81 BOX DRAWINGS LIGHT VERTICAL + /x82 BOX DRAWINGS LIGHT DOWN AND RIGHT + /x83 BOX DRAWINGS LIGHT DOWN AND LEFT + /x84 BOX DRAWINGS LIGHT UP AND RIGHT + /x85 BOX DRAWINGS LIGHT UP AND LEFT + /x86 BOX DRAWINGS LIGHT VERTICAL AND RIGHT + /x87 BOX DRAWINGS LIGHT VERTICAL AND LEFT + /x88 BOX DRAWINGS LIGHT DOWN AND HORIZONTAL + /x89 BOX DRAWINGS LIGHT UP AND HORIZONTAL + /x8a BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL + /x8b UPPER HALF BLOCK + /x8c LOWER HALF BLOCK + /x8d FULL BLOCK + /x8e LEFT HALF BLOCK + /x8f RIGHT HALF BLOCK + /x90 LIGHT SHADE + /x91 MEDIUM SHADE + /x92 DARK SHADE + /x93 LEFT DOUBLE QUOTATION MARK + /x94 BLACK SQUARE + /x95 BULLET OPERATOR + /x96 RIGHT DOUBLE QUOTATION MARK + /x97 EM DASH + /x98 NUMERO SIGN + /x99 TRADE MARK SIGN + /x9a NO-BREAK SPACE + /x9b RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + /x9c REGISTERED SIGN + /x9d LEFT-POINTING DOUBLE ANGLE QUOTATION MARK + /x9e MIDDLE DOT + /x9f CURRENCY SIGN + /xa0 BOX DRAWINGS DOUBLE HORIZONTAL + /xa1 BOX DRAWINGS DOUBLE VERTICAL + /xa2 BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE + /xa3 CYRILLIC SMALL LETTER IO + /xa4 CYRILLIC SMALL LETTER UKRAINIAN IE + /xa5 BOX DRAWINGS DOUBLE DOWN AND RIGHT + /xa6 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + /xa7 CYRILLIC SMALL LETTER YI + /xa8 BOX DRAWINGS DOUBLE DOWN AND LEFT + /xa9 BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE + /xaa BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE + /xab BOX DRAWINGS DOUBLE UP AND RIGHT + /xac BOX DRAWINGS UP SINGLE AND LEFT DOUBLE + /xad CYRILLIC SMALL LETTER GHE WITH UPTURN + /xae CYRILLIC SMALL LETTER SHORT U + /xaf BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE + /xb0 BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE + /xb1 BOX DRAWINGS DOUBLE VERTICAL AND RIGHT + /xb2 BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE + /xb3 CYRILLIC CAPITAL LETTER IO + /xb4 CYRILLIC CAPITAL LETTER UKRAINIAN IE + /xb5 BOX DRAWINGS DOUBLE VERTICAL AND LEFT + /xb6 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + /xb7 CYRILLIC CAPITAL LETTER YI + /xb8 BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL + /xb9 BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE + /xba BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE + /xbb BOX DRAWINGS DOUBLE UP AND HORIZONTAL + /xbc BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE + /xbd CYRILLIC CAPITAL LETTER GHE WITH UPTURN + /xbe CYRILLIC CAPITAL LETTER SHORT U + /xbf COPYRIGHT SIGN + /xc0 CYRILLIC SMALL LETTER YU + /xc1 CYRILLIC SMALL LETTER A + /xc2 CYRILLIC SMALL LETTER BE + /xc3 CYRILLIC SMALL LETTER TSE + /xc4 CYRILLIC SMALL LETTER DE + /xc5 CYRILLIC SMALL LETTER IE + /xc6 CYRILLIC SMALL LETTER EF + /xc7 CYRILLIC SMALL LETTER GHE + /xc8 CYRILLIC SMALL LETTER HA + /xc9 CYRILLIC SMALL LETTER I + /xca CYRILLIC SMALL LETTER SHORT I + /xcb CYRILLIC SMALL LETTER KA + /xcc CYRILLIC SMALL LETTER EL + /xcd CYRILLIC SMALL LETTER EM + /xce CYRILLIC SMALL LETTER EN + /xcf CYRILLIC SMALL LETTER O + /xd0 CYRILLIC SMALL LETTER PE + /xd1 CYRILLIC SMALL LETTER YA + /xd2 CYRILLIC SMALL LETTER ER + /xd3 CYRILLIC SMALL LETTER ES + /xd4 CYRILLIC SMALL LETTER TE + /xd5 CYRILLIC SMALL LETTER U + /xd6 CYRILLIC SMALL LETTER ZHE + /xd7 CYRILLIC SMALL LETTER VE + /xd8 CYRILLIC SMALL LETTER SOFT SIGN + /xd9 CYRILLIC SMALL LETTER YERU + /xda CYRILLIC SMALL LETTER ZE + /xdb CYRILLIC SMALL LETTER SHA + /xdc CYRILLIC SMALL LETTER E + /xdd CYRILLIC SMALL LETTER SHCHA + /xde CYRILLIC SMALL LETTER CHE + /xdf CYRILLIC SMALL LETTER HARD SIGN + /xe0 CYRILLIC CAPITAL LETTER YU + /xe1 CYRILLIC CAPITAL LETTER A + /xe2 CYRILLIC CAPITAL LETTER BE + /xe3 CYRILLIC CAPITAL LETTER TSE + /xe4 CYRILLIC CAPITAL LETTER DE + /xe5 CYRILLIC CAPITAL LETTER IE + /xe6 CYRILLIC CAPITAL LETTER EF + /xe7 CYRILLIC CAPITAL LETTER GHE + /xe8 CYRILLIC CAPITAL LETTER HA + /xe9 CYRILLIC CAPITAL LETTER I + /xea CYRILLIC CAPITAL LETTER SHORT I + /xeb CYRILLIC CAPITAL LETTER KA + /xec CYRILLIC CAPITAL LETTER EL + /xed CYRILLIC CAPITAL LETTER EM + /xee CYRILLIC CAPITAL LETTER EN + /xef CYRILLIC CAPITAL LETTER O + /xf0 CYRILLIC CAPITAL LETTER PE + /xf1 CYRILLIC CAPITAL LETTER YA + /xf2 CYRILLIC CAPITAL LETTER ER + /xf3 CYRILLIC CAPITAL LETTER ES + /xf4 CYRILLIC CAPITAL LETTER TE + /xf5 CYRILLIC CAPITAL LETTER U + /xf6 CYRILLIC CAPITAL LETTER ZHE + /xf7 CYRILLIC CAPITAL LETTER VE + /xf8 CYRILLIC CAPITAL LETTER SOFT SIGN + /xf9 CYRILLIC CAPITAL LETTER YERU + /xfa CYRILLIC CAPITAL LETTER ZE + /xfb CYRILLIC CAPITAL LETTER SHA + /xfc CYRILLIC CAPITAL LETTER E + /xfd CYRILLIC CAPITAL LETTER SHCHA + /xfe CYRILLIC CAPITAL LETTER CHE + /xff CYRILLIC CAPITAL LETTER HARD SIGN +END CHARMAP