From 87520cccf6207f0a3525b5a5d5dc2ffd80b3d416 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 8 Dec 2007 01:38:23 +0000 Subject: [BZ #5427] * iconvdata/hp-roman9.c: New file. * iconvdata/Makefile: Add rules for hp-roman9.c. * iconvdata/tst-tables.sh: Add HP-ROMAN9. * iconvdata/hp-roman8.c: Use 8bit-gap instead of 8bit-generic. * iconvdata/Makefile: Adjust appropriately. keyword for gcc's braced-groups. --- ChangeLog | 10 +- iconvdata/Makefile | 8 +- iconvdata/hp-roman8.c | 8 +- iconvdata/hp-roman9.c | 29 +++++ iconvdata/tst-tables.sh | 1 + localedata/ChangeLog | 5 + localedata/charmaps/HP-ROMAN9 | 263 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 315 insertions(+), 9 deletions(-) create mode 100644 iconvdata/hp-roman9.c create mode 100644 localedata/charmaps/HP-ROMAN9 diff --git a/ChangeLog b/ChangeLog index 49fce28b4f..ff97ce94d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-12-07 Ulrich Drepper + [BZ #5427] + * iconvdata/hp-roman9.c: New file. + * iconvdata/Makefile: Add rules for hp-roman9.c. + * iconvdata/tst-tables.sh: Add HP-ROMAN9. + + * iconvdata/hp-roman8.c: Use 8bit-gap instead of 8bit-generic. + * iconvdata/Makefile: Adjust appropriately. + [BZ #5441] * stdio-common/vfscanf.c (_IO_vfwscanf): Don't free ptrs_to_free structure, it's allocated with alloca. @@ -10,7 +18,7 @@ [BZ #5452] * sysdeps/unix/sysv/linux/bits/sched.h: Use __extension__ - keyword for gcc's braced-groups. + keyword for gcc's braced-groups. 2007-12-07 Ulrich Drepper diff --git a/iconvdata/Makefile b/iconvdata/Makefile index ca4c713179..7572f2789e 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -25,7 +25,7 @@ subdir := iconvdata modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \ ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16 \ - T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 EBCDIC-AT-DE \ + T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE \ EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC \ BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO \ EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \ @@ -198,7 +198,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \ ibm12712.c ibm12712.h ibm16804.c ibm16804.h \ 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 + brf.c mac-centraleurope.c hp-roman9.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -217,7 +217,7 @@ install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \ # We can build the conversion tables for numerous charsets automatically. gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \ - hp-roman8 ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr \ + ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr \ ebcdic-dk-no ebcdic-dk-no-a ebcdic-es ebcdic-es-a \ ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr \ ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \ @@ -241,7 +241,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 koi8-ru + mac-centraleurope koi8-ru hp-roman8 hp-roman9 gen-special-modules := iso8859-7jp diff --git a/iconvdata/hp-roman8.c b/iconvdata/hp-roman8.c index 9833a071fb..ec29d82773 100644 --- a/iconvdata/hp-roman8.c +++ b/iconvdata/hp-roman8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN8. - 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. @@ -20,10 +20,10 @@ #include -/* Get the conversion table. */ -#include +/* Specify the conversion table. */ +#define TABLES #define CHARSET_NAME "HP-ROMAN8//" #define HAS_HOLES 1 /* Not all 256 character are defined. */ -#include <8bit-generic.c> +#include <8bit-gap.c> diff --git a/iconvdata/hp-roman9.c b/iconvdata/hp-roman9.c new file mode 100644 index 0000000000..2f14815762 --- /dev/null +++ b/iconvdata/hp-roman9.c @@ -0,0 +1,29 @@ +/* Conversion from and to HP-ROMAN9. + 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. */ + +#include + +/* Specify the conversion table. */ +#define TABLES + +#define CHARSET_NAME "HP-ROMAN9//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index f240e51f36..5cb2e9e347 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -80,6 +80,7 @@ cat < + + [BZ #5427] + * charmaps/HP-ROMAN9: New file. + 2007-12-04 Ulrich Drepper * locales/si_LK (mon): Fix February and November spelling. diff --git a/localedata/charmaps/HP-ROMAN9 b/localedata/charmaps/HP-ROMAN9 new file mode 100644 index 0000000000..1e1dd881d1 --- /dev/null +++ b/localedata/charmaps/HP-ROMAN9 @@ -0,0 +1,263 @@ + HP-ROMAN9 + % + / + +% alias ROMAN9 +% alias R9 +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 A WITH GRAVE + /xa2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX + /xa3 LATIN CAPITAL LETTER E WITH GRAVE + /xa4 LATIN CAPITAL LETTER E WITH CIRCUMFLEX + /xa5 LATIN CAPITAL LETTER E WITH DIAERESIS + /xa6 LATIN CAPITAL LETTER I WITH CIRCUMFLEX + /xa7 LATIN CAPITAL LETTER I WITH DIAERESIS + /xa8 ACUTE ACCENT + /xa9 MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone) + /xaa MODIFIER LETTER CIRCUMFLEX ACCENT + /xab DIAERESIS + /xac SMALL TILDE + /xad LATIN CAPITAL LETTER U WITH GRAVE + /xae LATIN CAPITAL LETTER U WITH CIRCUMFLEX + /xaf LIRA SIGN + /xb0 MACRON + /xb1 LATIN CAPITAL LETTER Y WITH ACUTE + /xb2 LATIN SMALL LETTER Y WITH ACUTE + /xb3 DEGREE SIGN + /xb4 LATIN CAPITAL LETTER C WITH CEDILLA + /xb5 LATIN SMALL LETTER C WITH CEDILLA + /xb6 LATIN CAPITAL LETTER N WITH TILDE + /xb7 LATIN SMALL LETTER N WITH TILDE + /xb8 INVERTED EXCLAMATION MARK + /xb9 INVERTED QUESTION MARK + /xba EURO-CURRENCY SIGN + /xbb POUND SIGN + /xbc YEN SIGN + /xbd SECTION SIGN + /xbe LATIN SMALL LETTER F WITH HOOK + /xbf CENT SIGN + /xc0 LATIN SMALL LETTER A WITH CIRCUMFLEX + /xc1 LATIN SMALL LETTER E WITH CIRCUMFLEX + /xc2 LATIN SMALL LETTER O WITH CIRCUMFLEX + /xc3 LATIN SMALL LETTER U WITH CIRCUMFLEX + /xc4 LATIN SMALL LETTER A WITH ACUTE + /xc5 LATIN SMALL LETTER E WITH ACUTE + /xc6 LATIN SMALL LETTER O WITH ACUTE + /xc7 LATIN SMALL LETTER U WITH ACUTE + /xc8 LATIN SMALL LETTER A WITH GRAVE + /xc9 LATIN SMALL LETTER E WITH GRAVE + /xca LATIN SMALL LETTER O WITH GRAVE + /xcb LATIN SMALL LETTER U WITH GRAVE + /xcc LATIN SMALL LETTER A WITH DIAERESIS + /xcd LATIN SMALL LETTER E WITH DIAERESIS + /xce LATIN SMALL LETTER O WITH DIAERESIS + /xcf LATIN SMALL LETTER U WITH DIAERESIS + /xd0 LATIN CAPITAL LETTER A WITH RING ABOVE + /xd1 LATIN SMALL LETTER I WITH CIRCUMFLEX + /xd2 LATIN CAPITAL LETTER O WITH STROKE + /xd3 LATIN CAPITAL LETTER AE + /xd4 LATIN SMALL LETTER A WITH RING ABOVE + /xd5 LATIN SMALL LETTER I WITH ACUTE + /xd6 LATIN SMALL LETTER O WITH STROKE + /xd7 LATIN SMALL LETTER AE + /xd8 LATIN CAPITAL LETTER A WITH DIAERESIS + /xd9 LATIN SMALL LETTER I WITH GRAVE + /xda LATIN CAPITAL LETTER O WITH DIAERESIS + /xdb LATIN CAPITAL LETTER U WITH DIAERESIS + /xdc LATIN CAPITAL LETTER E WITH ACUTE + /xdd LATIN SMALL LETTER I WITH DIAERESIS + /xde LATIN SMALL LETTER SHARP S (German) + /xdf LATIN CAPITAL LETTER O WITH CIRCUMFLEX + /xe0 LATIN CAPITAL LETTER A WITH ACUTE + /xe1 LATIN CAPITAL LETTER A WITH TILDE + /xe2 LATIN SMALL LETTER A WITH TILDE + /xe3 LATIN CAPITAL LETTER ETH (Icelandic) + /xe4 LATIN SMALL LETTER ETH (Icelandic) + /xe5 LATIN CAPITAL LETTER I WITH ACUTE + /xe6 LATIN CAPITAL LETTER I WITH GRAVE + /xe7 LATIN CAPITAL LETTER O WITH ACUTE + /xe8 LATIN CAPITAL LETTER O WITH GRAVE + /xe9 LATIN CAPITAL LETTER O WITH TILDE + /xea LATIN SMALL LETTER O WITH TILDE + /xeb LATIN CAPITAL LETTER S WITH CARON + /xec LATIN SMALL LETTER S WITH CARON + /xed LATIN CAPITAL LETTER U WITH ACUTE + /xee LATIN CAPITAL LETTER Y WITH DIAERESIS + /xef LATIN SMALL LETTER Y WITH DIAERESIS + /xf0 LATIN CAPITAL LETTER THORN (Icelandic) + /xf1 LATIN SMALL LETTER THORN (Icelandic) + /xf2 MIDDLE DOT + /xf3 MICRO SIGN + /xf4 PILCROW SIGN + /xf5 VULGAR FRACTION THREE QUARTERS + /xf6 EM DASH + /xf7 VULGAR FRACTION ONE QUARTER + /xf8 VULGAR FRACTION ONE HALF + /xf9 FEMININE ORDINAL INDICATOR + /xfa MASCULINE ORDINAL INDICATOR + /xfb LEFT-POINTING DOUBLE ANGLE QUOTATION MARK + /xfc BLACK SQUARE + /xfd RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + /xfe PLUS-MINUS SIGN +END CHARMAP -- cgit v1.2.3