diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | iconvdata/Makefile | 4 | ||||
| -rw-r--r-- | iconvdata/TESTS | 1 | ||||
| -rw-r--r-- | iconvdata/gconv-modules | 4 | ||||
| -rw-r--r-- | iconvdata/koi8-r.c | 4 | ||||
| -rw-r--r-- | iconvdata/koi8-ru.c | 29 | ||||
| -rwxr-xr-x | iconvdata/tst-tables.sh | 1 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/charmaps/KOI8-RU | 264 |
9 files changed, 319 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2007-09-28 Ulrich Drepper <drepper@redhat.com> + + * 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 <jakub@redhat.com> * misc/sys/cdefs.h (__warndecl, __errordecl): For GCC 4.3+ define diff --git a/iconvdata/Makefile b/iconvdata/Makefile index e3ec846..8256bca 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 251f24b..4e1fdcd 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 fc8e3cd..ae4cf5f 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 88fe157..2e7934d 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 <drepper@cygnus.com>, 1997. @@ -24,6 +24,6 @@ #define TABLES <koi8-r.h> #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 0000000..ce1b1cf --- /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 <drepper@redhat.com>, 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 <stdint.h> + +/* Specify the conversion table. */ +#define TABLES <koi8-ru.h> + +#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 a9f8427..b9eecd0 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -210,6 +210,7 @@ cat <<EOF | MIK BRF MAC-CENTRALEUROPE + KOI8-RU # # Multibyte encodings come here # diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 9d35cdd..8312856 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2007-09-28 Ulrich Drepper <drepper@redhat.com> + + * charmaps/KOI8-RU: New file. + 2007-09-23 Ulrich Drepper <drepper@redhat.com> [BZ #4556] diff --git a/localedata/charmaps/KOI8-RU b/localedata/charmaps/KOI8-RU new file mode 100644 index 0000000..ce9857f --- /dev/null +++ b/localedata/charmaps/KOI8-RU @@ -0,0 +1,264 @@ +<code_set_name> KOI8-RU +<comment_char> % +<escape_char> / +% version: 1.0 +% source: Draft RFC rfc-draft-koi8-ru.txt + +CHARMAP +<U0000> /x00 NULL (NUL) +<U0001> /x01 START OF HEADING (SOH) +<U0002> /x02 START OF TEXT (STX) +<U0003> /x03 END OF TEXT (ETX) +<U0004> /x04 END OF TRANSMISSION (EOT) +<U0005> /x05 ENQUIRY (ENQ) +<U0006> /x06 ACKNOWLEDGE (ACK) +<U0007> /x07 BELL (BEL) +<U0008> /x08 BACKSPACE (BS) +<U0009> /x09 CHARACTER TABULATION (HT) +<U000A> /x0a LINE FEED (LF) +<U000B> /x0b LINE TABULATION (VT) +<U000C> /x0c FORM FEED (FF) +<U000D> /x0d CARRIAGE RETURN (CR) +<U000E> /x0e SHIFT OUT (SO) +<U000F> /x0f SHIFT IN (SI) +<U0010> /x10 DATALINK ESCAPE (DLE) +<U0011> /x11 DEVICE CONTROL ONE (DC1) +<U0012> /x12 DEVICE CONTROL TWO (DC2) +<U0013> /x13 DEVICE CONTROL THREE (DC3) +<U0014> /x14 DEVICE CONTROL FOUR (DC4) +<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK) +<U0016> /x16 SYNCHRONOUS IDLE (SYN) +<U0017> /x17 END OF TRANSMISSION BLOCK (ETB) +<U0018> /x18 CANCEL (CAN) +<U0019> /x19 END OF MEDIUM (EM) +<U001A> /x1a SUBSTITUTE (SUB) +<U001B> /x1b ESCAPE (ESC) +<U001C> /x1c FILE SEPARATOR (IS4) +<U001D> /x1d GROUP SEPARATOR (IS3) +<U001E> /x1e RECORD SEPARATOR (IS2) +<U001F> /x1f UNIT SEPARATOR (IS1) +<U0020> /x20 SPACE +<U0021> /x21 EXCLAMATION MARK +<U0022> /x22 QUOTATION MARK +<U0023> /x23 NUMBER SIGN +<U0024> /x24 DOLLAR SIGN +<U0025> /x25 PERCENT SIGN +<U0026> /x26 AMPERSAND +<U0027> /x27 APOSTROPHE +<U0028> /x28 LEFT PARENTHESIS +<U0029> /x29 RIGHT PARENTHESIS +<U002A> /x2a ASTERISK +<U002B> /x2b PLUS SIGN +<U002C> /x2c COMMA +<U002D> /x2d HYPHEN-MINUS +<U002E> /x2e FULL STOP +<U002F> /x2f SOLIDUS +<U0030> /x30 DIGIT ZERO +<U0031> /x31 DIGIT ONE +<U0032> /x32 DIGIT TWO +<U0033> /x33 DIGIT THREE +<U0034> /x34 DIGIT FOUR +<U0035> /x35 DIGIT FIVE +<U0036> /x36 DIGIT SIX +<U0037> /x37 DIGIT SEVEN +<U0038> /x38 DIGIT EIGHT +<U0039> /x39 DIGIT NINE +<U003A> /x3a COLON +<U003B> /x3b SEMICOLON +<U003C> /x3c LESS-THAN SIGN +<U003D> /x3d EQUALS SIGN +<U003E> /x3e GREATER-THAN SIGN +<U003F> /x3f QUESTION MARK +<U0040> /x40 COMMERCIAL AT +<U0041> /x41 LATIN CAPITAL LETTER A +<U0042> /x42 LATIN CAPITAL LETTER B +<U0043> /x43 LATIN CAPITAL LETTER C +<U0044> /x44 LATIN CAPITAL LETTER D +<U0045> /x45 LATIN CAPITAL LETTER E +<U0046> /x46 LATIN CAPITAL LETTER F +<U0047> /x47 LATIN CAPITAL LETTER G +<U0048> /x48 LATIN CAPITAL LETTER H +<U0049> /x49 LATIN CAPITAL LETTER I +<U004A> /x4a LATIN CAPITAL LETTER J +<U004B> /x4b LATIN CAPITAL LETTER K +<U004C> /x4c LATIN CAPITAL LETTER L +<U004D> /x4d LATIN CAPITAL LETTER M +<U004E> /x4e LATIN CAPITAL LETTER N +<U004F> /x4f LATIN CAPITAL LETTER O +<U0050> /x50 LATIN CAPITAL LETTER P +<U0051> /x51 LATIN CAPITAL LETTER Q +<U0052> /x52 LATIN CAPITAL LETTER R +<U0053> /x53 LATIN CAPITAL LETTER S +<U0054> /x54 LATIN CAPITAL LETTER T +<U0055> /x55 LATIN CAPITAL LETTER U +<U0056> /x56 LATIN CAPITAL LETTER V +<U0057> /x57 LATIN CAPITAL LETTER W +<U0058> /x58 LATIN CAPITAL LETTER X +<U0059> /x59 LATIN CAPITAL LETTER Y +<U005A> /x5a LATIN CAPITAL LETTER Z +<U005B> /x5b LEFT SQUARE BRACKET +<U005C> /x5c REVERSE SOLIDUS +<U005D> /x5d RIGHT SQUARE BRACKET +<U005E> /x5e CIRCUMFLEX ACCENT +<U005F> /x5f LOW LINE +<U0060> /x60 GRAVE ACCENT +<U0061> /x61 LATIN SMALL LETTER A +<U0062> /x62 LATIN SMALL LETTER B +<U0063> /x63 LATIN SMALL LETTER C +<U0064> /x64 LATIN SMALL LETTER D +<U0065> /x65 LATIN SMALL LETTER E +<U0066> /x66 LATIN SMALL LETTER F +<U0067> /x67 LATIN SMALL LETTER G +<U0068> /x68 LATIN SMALL LETTER H +<U0069> /x69 LATIN SMALL LETTER I +<U006A> /x6a LATIN SMALL LETTER J +<U006B> /x6b LATIN SMALL LETTER K +<U006C> /x6c LATIN SMALL LETTER L +<U006D> /x6d LATIN SMALL LETTER M +<U006E> /x6e LATIN SMALL LETTER N +<U006F> /x6f LATIN SMALL LETTER O +<U0070> /x70 LATIN SMALL LETTER P +<U0071> /x71 LATIN SMALL LETTER Q +<U0072> /x72 LATIN SMALL LETTER R +<U0073> /x73 LATIN SMALL LETTER S +<U0074> /x74 LATIN SMALL LETTER T +<U0075> /x75 LATIN SMALL LETTER U +<U0076> /x76 LATIN SMALL LETTER V +<U0077> /x77 LATIN SMALL LETTER W +<U0078> /x78 LATIN SMALL LETTER X +<U0079> /x79 LATIN SMALL LETTER Y +<U007A> /x7a LATIN SMALL LETTER Z +<U007B> /x7b LEFT CURLY BRACKET +<U007C> /x7c VERTICAL LINE +<U007D> /x7d RIGHT CURLY BRACKET +<U007E> /x7e TILDE +<U007F> /x7f DELETE (DEL) +<U2500> /x80 BOX DRAWINGS LIGHT HORIZONTAL +<U2502> /x81 BOX DRAWINGS LIGHT VERTICAL +<U250C> /x82 BOX DRAWINGS LIGHT DOWN AND RIGHT +<U2510> /x83 BOX DRAWINGS LIGHT DOWN AND LEFT +<U2514> /x84 BOX DRAWINGS LIGHT UP AND RIGHT +<U2518> /x85 BOX DRAWINGS LIGHT UP AND LEFT +<U251C> /x86 BOX DRAWINGS LIGHT VERTICAL AND RIGHT +<U2524> /x87 BOX DRAWINGS LIGHT VERTICAL AND LEFT +<U252C> /x88 BOX DRAWINGS LIGHT DOWN AND HORIZONTAL +<U2534> /x89 BOX DRAWINGS LIGHT UP AND HORIZONTAL +<U253C> /x8a BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL +<U2580> /x8b UPPER HALF BLOCK +<U2584> /x8c LOWER HALF BLOCK +<U2588> /x8d FULL BLOCK +<U258C> /x8e LEFT HALF BLOCK +<U2590> /x8f RIGHT HALF BLOCK +<U2591> /x90 LIGHT SHADE +<U2592> /x91 MEDIUM SHADE +<U2593> /x92 DARK SHADE +<U201C> /x93 LEFT DOUBLE QUOTATION MARK +<U25A0> /x94 BLACK SQUARE +<U2219> /x95 BULLET OPERATOR +<U201D> /x96 RIGHT DOUBLE QUOTATION MARK +<U2014> /x97 EM DASH +<U2116> /x98 NUMERO SIGN +<U2122> /x99 TRADE MARK SIGN +<U00A0> /x9a NO-BREAK SPACE +<U00BB> /x9b RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +<U00AE> /x9c REGISTERED SIGN +<U00AB> /x9d LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +<U00B7> /x9e MIDDLE DOT +<U00A4> /x9f CURRENCY SIGN +<U2550> /xa0 BOX DRAWINGS DOUBLE HORIZONTAL +<U2551> /xa1 BOX DRAWINGS DOUBLE VERTICAL +<U2552> /xa2 BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE +<U0451> /xa3 CYRILLIC SMALL LETTER IO +<U0454> /xa4 CYRILLIC SMALL LETTER UKRAINIAN IE +<U2554> /xa5 BOX DRAWINGS DOUBLE DOWN AND RIGHT +<U0456> /xa6 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +<U0457> /xa7 CYRILLIC SMALL LETTER YI +<U2557> /xa8 BOX DRAWINGS DOUBLE DOWN AND LEFT +<U2558> /xa9 BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE +<U2559> /xaa BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE +<U255A> /xab BOX DRAWINGS DOUBLE UP AND RIGHT +<U255B> /xac BOX DRAWINGS UP SINGLE AND LEFT DOUBLE +<U0491> /xad CYRILLIC SMALL LETTER GHE WITH UPTURN +<U045E> /xae CYRILLIC SMALL LETTER SHORT U +<U255E> /xaf BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE +<U255F> /xb0 BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE +<U2560> /xb1 BOX DRAWINGS DOUBLE VERTICAL AND RIGHT +<U2561> /xb2 BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE +<U0401> /xb3 CYRILLIC CAPITAL LETTER IO +<U0404> /xb4 CYRILLIC CAPITAL LETTER UKRAINIAN IE +<U2563> /xb5 BOX DRAWINGS DOUBLE VERTICAL AND LEFT +<U0406> /xb6 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I +<U0407> /xb7 CYRILLIC CAPITAL LETTER YI +<U2566> /xb8 BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL +<U2567> /xb9 BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE +<U2568> /xba BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE +<U2569> /xbb BOX DRAWINGS DOUBLE UP AND HORIZONTAL +<U256A> /xbc BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE +<U0490> /xbd CYRILLIC CAPITAL LETTER GHE WITH UPTURN +<U040E> /xbe CYRILLIC CAPITAL LETTER SHORT U +<U00A9> /xbf COPYRIGHT SIGN +<U044E> /xc0 CYRILLIC SMALL LETTER YU +<U0430> /xc1 CYRILLIC SMALL LETTER A +<U0431> /xc2 CYRILLIC SMALL LETTER BE +<U0446> /xc3 CYRILLIC SMALL LETTER TSE +<U0434> /xc4 CYRILLIC SMALL LETTER DE +<U0435> /xc5 CYRILLIC SMALL LETTER IE +<U0444> /xc6 CYRILLIC SMALL LETTER EF +<U0433> /xc7 CYRILLIC SMALL LETTER GHE +<U0445> /xc8 CYRILLIC SMALL LETTER HA +<U0438> /xc9 CYRILLIC SMALL LETTER I +<U0439> /xca CYRILLIC SMALL LETTER SHORT I +<U043A> /xcb CYRILLIC SMALL LETTER KA +<U043B> /xcc CYRILLIC SMALL LETTER EL +<U043C> /xcd CYRILLIC SMALL LETTER EM +<U043D> /xce CYRILLIC SMALL LETTER EN +<U043E> /xcf CYRILLIC SMALL LETTER O +<U043F> /xd0 CYRILLIC SMALL LETTER PE +<U044F> /xd1 CYRILLIC SMALL LETTER YA +<U0440> /xd2 CYRILLIC SMALL LETTER ER +<U0441> /xd3 CYRILLIC SMALL LETTER ES +<U0442> /xd4 CYRILLIC SMALL LETTER TE +<U0443> /xd5 CYRILLIC SMALL LETTER U +<U0436> /xd6 CYRILLIC SMALL LETTER ZHE +<U0432> /xd7 CYRILLIC SMALL LETTER VE +<U044C> /xd8 CYRILLIC SMALL LETTER SOFT SIGN +<U044B> /xd9 CYRILLIC SMALL LETTER YERU +<U0437> /xda CYRILLIC SMALL LETTER ZE +<U0448> /xdb CYRILLIC SMALL LETTER SHA +<U044D> /xdc CYRILLIC SMALL LETTER E +<U0449> /xdd CYRILLIC SMALL LETTER SHCHA +<U0447> /xde CYRILLIC SMALL LETTER CHE +<U044A> /xdf CYRILLIC SMALL LETTER HARD SIGN +<U042E> /xe0 CYRILLIC CAPITAL LETTER YU +<U0410> /xe1 CYRILLIC CAPITAL LETTER A +<U0411> /xe2 CYRILLIC CAPITAL LETTER BE +<U0426> /xe3 CYRILLIC CAPITAL LETTER TSE +<U0414> /xe4 CYRILLIC CAPITAL LETTER DE +<U0415> /xe5 CYRILLIC CAPITAL LETTER IE +<U0424> /xe6 CYRILLIC CAPITAL LETTER EF +<U0413> /xe7 CYRILLIC CAPITAL LETTER GHE +<U0425> /xe8 CYRILLIC CAPITAL LETTER HA +<U0418> /xe9 CYRILLIC CAPITAL LETTER I +<U0419> /xea CYRILLIC CAPITAL LETTER SHORT I +<U041A> /xeb CYRILLIC CAPITAL LETTER KA +<U041B> /xec CYRILLIC CAPITAL LETTER EL +<U041C> /xed CYRILLIC CAPITAL LETTER EM +<U041D> /xee CYRILLIC CAPITAL LETTER EN +<U041E> /xef CYRILLIC CAPITAL LETTER O +<U041F> /xf0 CYRILLIC CAPITAL LETTER PE +<U042F> /xf1 CYRILLIC CAPITAL LETTER YA +<U0420> /xf2 CYRILLIC CAPITAL LETTER ER +<U0421> /xf3 CYRILLIC CAPITAL LETTER ES +<U0422> /xf4 CYRILLIC CAPITAL LETTER TE +<U0423> /xf5 CYRILLIC CAPITAL LETTER U +<U0416> /xf6 CYRILLIC CAPITAL LETTER ZHE +<U0412> /xf7 CYRILLIC CAPITAL LETTER VE +<U042C> /xf8 CYRILLIC CAPITAL LETTER SOFT SIGN +<U042B> /xf9 CYRILLIC CAPITAL LETTER YERU +<U0417> /xfa CYRILLIC CAPITAL LETTER ZE +<U0428> /xfb CYRILLIC CAPITAL LETTER SHA +<U042D> /xfc CYRILLIC CAPITAL LETTER E +<U0429> /xfd CYRILLIC CAPITAL LETTER SHCHA +<U0427> /xfe CYRILLIC CAPITAL LETTER CHE +<U042A> /xff CYRILLIC CAPITAL LETTER HARD SIGN +END CHARMAP |