From ddaafd04f1e91be17d1504279dada1a3b54c79bd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 20 Jan 2007 00:23:01 +0000 Subject: [PATCH] * iconvdata/brf.c: New file. * iconvdata/Makefile: Add rules to build BRF. * iconvdata/TESTS: Add BRF entry. * iconvdata/gconv-modules: Likewise. * iconvdata/tst-tables.sh: Likewise. * iconvdata/testdata/BRF: New file. * iconvdata/testdata/BRF..UTF8: New file. --- ChangeLog | 10 ++++ iconvdata/Makefile | 9 ++-- iconvdata/TESTS | 3 +- iconvdata/brf.c | 29 ++++++++++++ iconvdata/gconv-modules | 6 ++- iconvdata/testdata/BRF | 7 +++ iconvdata/testdata/BRF..UTF8 | 7 +++ iconvdata/tst-tables.sh | 3 +- localedata/charmaps/BRF | 108 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 175 insertions(+), 7 deletions(-) create mode 100644 iconvdata/brf.c create mode 100644 iconvdata/testdata/BRF create mode 100644 iconvdata/testdata/BRF..UTF8 create mode 100644 localedata/charmaps/BRF diff --git a/ChangeLog b/ChangeLog index 51b52b1..f2cfe6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-01-19 Ulrich Drepper + + * iconvdata/brf.c: New file. + * iconvdata/Makefile: Add rules to build BRF. + * iconvdata/TESTS: Add BRF entry. + * iconvdata/gconv-modules: Likewise. + * iconvdata/tst-tables.sh: Likewise. + * iconvdata/testdata/BRF: New file. + * iconvdata/testdata/BRF..UTF8: New file. + 2007-01-18 Anton Nikishaev * wcsmbs/wchar.h (wcstoll): Fix comment, function returns value of diff --git a/iconvdata/Makefile b/iconvdata/Makefile index c7d5801..8b49367 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2004,2005,2006 Free Software Foundation, Inc. +# Copyright (C) 1997-2004,2005,2006,2007 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 @@ -58,7 +58,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 \ IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \ IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804 \ - IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK + IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF modules.so := $(addsuffix .so, $(modules)) @@ -196,7 +196,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map \ ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h \ 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 + ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c \ + brf.c # We build the transformation modules only when we build shared libs. ifeq (yes,$(build-shared)) @@ -237,7 +238,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 ibm866nav pt154 rk1048 mik + iso8859-11 ibm866nav pt154 rk1048 mik brf gen-special-modules := iso8859-7jp diff --git a/iconvdata/TESTS b/iconvdata/TESTS index b70e505..2743cc1 100644 --- a/iconvdata/TESTS +++ b/iconvdata/TESTS @@ -1,5 +1,5 @@ # Available tests for iconv(1) (and therefore iconv(3)) in GNU libc. -# Copyright (C) 1998-2002, 2005 Free Software Foundation, Inc. +# Copyright (C) 1998-2002, 2005, 2007 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1998. # @@ -166,3 +166,4 @@ IBM1390 IBM1390 N UTF8 IBM1399 IBM1399 N UTF8 ISO_11548-1 ISO_11548-1 - UTF8 MIK MIK Y UTF8 +BRF BRF - UTF8 diff --git a/iconvdata/brf.c b/iconvdata/brf.c new file mode 100644 index 0000000..4e40e7b --- /dev/null +++ b/iconvdata/brf.c @@ -0,0 +1,29 @@ +/* Conversion from and to BRF. + Copyright (C) 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Samuel Thibault , 2006. + + 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 "BRF//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 852c7b9..7f47dec 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1997-2004, 2005, 2007 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 @@ -1907,3 +1907,7 @@ module INTERNAL ISO_11548-1// ISO_11548-1 1 # from to module cost module MIK// INTERNAL MIK 1 module INTERNAL MIK// MIK 1 + +# from to module cost +module BRF// INTERNAL BRF 1 +module INTERNAL BRF// BRF 1 diff --git a/iconvdata/testdata/BRF b/iconvdata/testdata/BRF new file mode 100644 index 0000000..a69e107 --- /dev/null +++ b/iconvdata/testdata/BRF @@ -0,0 +1,7 @@ +A B C D E F G H I J +K L M N O P Q R S T +U V X Y Z & = ( ! ) +* < % ? : $ ] \ [ W +1 2 3 4 5 6 7 8 9 0 +/ + # > ' - +@ ^ _ " . ; , diff --git a/iconvdata/testdata/BRF..UTF8 b/iconvdata/testdata/BRF..UTF8 new file mode 100644 index 0000000..08275e2 --- /dev/null +++ b/iconvdata/testdata/BRF..UTF8 @@ -0,0 +1,7 @@ +⠁⠀⠃⠀⠉⠀⠙⠀⠑⠀⠋⠀⠛⠀⠓⠀⠊⠀⠚ +⠅⠀⠇⠀⠍⠀⠝⠀⠕⠀⠏⠀⠟⠀⠗⠀⠎⠀⠞ +⠥⠀⠧⠀⠭⠀⠽⠀⠵⠀⠯⠀⠿⠀⠷⠀⠮⠀⠾ +⠡⠀⠣⠀⠩⠀⠹⠀⠱⠀⠫⠀⠻⠀⠳⠀⠪⠀⠺ +⠂⠀⠆⠀⠒⠀⠲⠀⠢⠀⠖⠀⠶⠀⠦⠀⠔⠀⠴ +⠌⠀⠬⠀⠼⠀⠜⠀⠄⠀⠤ +⠈⠀⠘⠀⠸⠀⠐⠀⠨⠀⠰⠀⠠ diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index 506adbc..be1e883 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000,2001,2002,2003,2004,2007 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible , 2000. # @@ -208,6 +208,7 @@ cat < BRF + % + / +% version: 1.0 +% source: Samuel Thibault + +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 BRAILLE PATTERN BLANK + /x21 BRAILLE PATTERN DOTS-2346 + /x22 BRAILLE PATTERN DOTS-5 + /x23 BRAILLE PATTERN DOTS-3456 + /x24 BRAILLE PATTERN DOTS-1246 + /x25 BRAILLE PATTERN DOTS-146 + /x26 BRAILLE PATTERN DOTS-12346 + /x27 BRAILLE PATTERN DOTS-3 + /x28 BRAILLE PATTERN DOTS-12356 + /x29 BRAILLE PATTERN DOTS-23456 + /x2a BRAILLE PATTERN DOTS-16 + /x2b BRAILLE PATTERN DOTS-346 + /x2c BRAILLE PATTERN DOTS-6 + /x2d BRAILLE PATTERN DOTS-36 + /x2e BRAILLE PATTERN DOTS-46 + /x2f BRAILLE PATTERN DOTS-34 + /x30 BRAILLE PATTERN DOTS-356 + /x31 BRAILLE PATTERN DOTS-2 + /x32 BRAILLE PATTERN DOTS-23 + /x33 BRAILLE PATTERN DOTS-25 + /x34 BRAILLE PATTERN DOTS-256 + /x35 BRAILLE PATTERN DOTS-26 + /x36 BRAILLE PATTERN DOTS-235 + /x37 BRAILLE PATTERN DOTS-2356 + /x38 BRAILLE PATTERN DOTS-236 + /x39 BRAILLE PATTERN DOTS-35 + /x3a BRAILLE PATTERN DOTS-156 + /x3b BRAILLE PATTERN DOTS-56 + /x3c BRAILLE PATTERN DOTS-126 + /x3d BRAILLE PATTERN DOTS-123456 + /x3e BRAILLE PATTERN DOTS-345 + /x3f BRAILLE PATTERN DOTS-1456 + /x40 BRAILLE PATTERN DOTS-4 + /x41 BRAILLE PATTERN DOTS-1 + /x42 BRAILLE PATTERN DOTS-12 + /x43 BRAILLE PATTERN DOTS-14 + /x44 BRAILLE PATTERN DOTS-145 + /x45 BRAILLE PATTERN DOTS-15 + /x46 BRAILLE PATTERN DOTS-124 + /x47 BRAILLE PATTERN DOTS-1245 + /x48 BRAILLE PATTERN DOTS-125 + /x49 BRAILLE PATTERN DOTS-24 + /x4a BRAILLE PATTERN DOTS-245 + /x4b BRAILLE PATTERN DOTS-13 + /x4c BRAILLE PATTERN DOTS-123 + /x4d BRAILLE PATTERN DOTS-134 + /x4e BRAILLE PATTERN DOTS-1345 + /x4f BRAILLE PATTERN DOTS-135 + /x50 BRAILLE PATTERN DOTS-1234 + /x51 BRAILLE PATTERN DOTS-12345 + /x52 BRAILLE PATTERN DOTS-1235 + /x53 BRAILLE PATTERN DOTS-234 + /x54 BRAILLE PATTERN DOTS-2345 + /x55 BRAILLE PATTERN DOTS-136 + /x56 BRAILLE PATTERN DOTS-1236 + /x57 BRAILLE PATTERN DOTS-2456 + /x58 BRAILLE PATTERN DOTS-1346 + /x59 BRAILLE PATTERN DOTS-13456 + /x5a BRAILLE PATTERN DOTS-1356 + /x5b BRAILLE PATTERN DOTS-246 + /x5c BRAILLE PATTERN DOTS-1256 + /x5d BRAILLE PATTERN DOTS-12456 + /x5e BRAILLE PATTERN DOTS-45 + /x5f BRAILLE PATTERN DOTS-456 +END CHARMAP + +WIDTH +... 1 +END WIDTH -- 2.7.4