aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-01-20 00:23:01 +0000
committerUlrich Drepper <drepper@redhat.com>2007-01-20 00:23:01 +0000
commitddaafd04f1e91be17d1504279dada1a3b54c79bd (patch)
treee70c00931c7b4b880bfee82c6d8d786e8f7dad0d
parent9e6e344e6910388d195c611cb59d8391afa24243 (diff)
downloadglibc-ddaafd04f1e91be17d1504279dada1a3b54c79bd.tar
glibc-ddaafd04f1e91be17d1504279dada1a3b54c79bd.tar.gz
glibc-ddaafd04f1e91be17d1504279dada1a3b54c79bd.tar.bz2
glibc-ddaafd04f1e91be17d1504279dada1a3b54c79bd.zip
* 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.
-rw-r--r--ChangeLog10
-rw-r--r--iconvdata/Makefile9
-rw-r--r--iconvdata/TESTS3
-rw-r--r--iconvdata/brf.c29
-rw-r--r--iconvdata/gconv-modules6
-rw-r--r--iconvdata/testdata/BRF7
-rw-r--r--iconvdata/testdata/BRF..UTF87
-rwxr-xr-xiconvdata/tst-tables.sh3
-rw-r--r--localedata/charmaps/BRF108
9 files changed, 175 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 51b52b13b7..f2cfe6c49c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-19 Ulrich Drepper <drepper@redhat.com>
+
+ * 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 <anton.nik@gmail.com>
* wcsmbs/wchar.h (wcstoll): Fix comment, function returns value of
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index c7d5801c6c..8b49367bd4 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 b70e5051f0..2743cc1ff6 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 <drepper@cygnus.com>, 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 0000000000..4e40e7b02a
--- /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 <samuel.thibault@ens-lyon.org>, 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 <stdint.h>
+
+/* Get the conversion table. */
+#define TABLES <brf.h>
+
+#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 852c7b94a6..7f47dec5ed 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 0000000000..a69e107243
--- /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 0000000000..08275e232f
--- /dev/null
+++ b/iconvdata/testdata/BRF..UTF8
@@ -0,0 +1,7 @@
+⠁⠀⠃⠀⠉⠀⠙⠀⠑⠀⠋⠀⠛⠀⠓⠀⠊⠀⠚
+⠅⠀⠇⠀⠍⠀⠝⠀⠕⠀⠏⠀⠟⠀⠗⠀⠎⠀⠞
+⠥⠀⠧⠀⠭⠀⠽⠀⠵⠀⠯⠀⠿⠀⠷⠀⠮⠀⠾
+⠡⠀⠣⠀⠩⠀⠹⠀⠱⠀⠫⠀⠻⠀⠳⠀⠪⠀⠺
+⠂⠀⠆⠀⠒⠀⠲⠀⠢⠀⠖⠀⠶⠀⠦⠀⠔⠀⠴
+⠌⠀⠬⠀⠼⠀⠜⠀⠄⠀⠤
+⠈⠀⠘⠀⠸⠀⠐⠀⠨⠀⠰⠀⠠
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index 506adbcd7c..be1e8832a5 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 <haible@clisp.cons.org>, 2000.
#
@@ -208,6 +208,7 @@ cat <<EOF |
PT154
RK1048
MIK
+ BRF
#
# Multibyte encodings come here
#
diff --git a/localedata/charmaps/BRF b/localedata/charmaps/BRF
new file mode 100644
index 0000000000..6b06f7164a
--- /dev/null
+++ b/localedata/charmaps/BRF
@@ -0,0 +1,108 @@
+<code_set_name> BRF
+<comment_char> %
+<escape_char> /
+% version: 1.0
+% source: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+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)
+<U2800> /x20 BRAILLE PATTERN BLANK
+<U282E> /x21 BRAILLE PATTERN DOTS-2346
+<U2810> /x22 BRAILLE PATTERN DOTS-5
+<U283C> /x23 BRAILLE PATTERN DOTS-3456
+<U282B> /x24 BRAILLE PATTERN DOTS-1246
+<U2829> /x25 BRAILLE PATTERN DOTS-146
+<U282F> /x26 BRAILLE PATTERN DOTS-12346
+<U2804> /x27 BRAILLE PATTERN DOTS-3
+<U2837> /x28 BRAILLE PATTERN DOTS-12356
+<U283E> /x29 BRAILLE PATTERN DOTS-23456
+<U2821> /x2a BRAILLE PATTERN DOTS-16
+<U282C> /x2b BRAILLE PATTERN DOTS-346
+<U2820> /x2c BRAILLE PATTERN DOTS-6
+<U2824> /x2d BRAILLE PATTERN DOTS-36
+<U2828> /x2e BRAILLE PATTERN DOTS-46
+<U280C> /x2f BRAILLE PATTERN DOTS-34
+<U2834> /x30 BRAILLE PATTERN DOTS-356
+<U2802> /x31 BRAILLE PATTERN DOTS-2
+<U2806> /x32 BRAILLE PATTERN DOTS-23
+<U2812> /x33 BRAILLE PATTERN DOTS-25
+<U2832> /x34 BRAILLE PATTERN DOTS-256
+<U2822> /x35 BRAILLE PATTERN DOTS-26
+<U2816> /x36 BRAILLE PATTERN DOTS-235
+<U2836> /x37 BRAILLE PATTERN DOTS-2356
+<U2826> /x38 BRAILLE PATTERN DOTS-236
+<U2814> /x39 BRAILLE PATTERN DOTS-35
+<U2831> /x3a BRAILLE PATTERN DOTS-156
+<U2830> /x3b BRAILLE PATTERN DOTS-56
+<U2823> /x3c BRAILLE PATTERN DOTS-126
+<U283F> /x3d BRAILLE PATTERN DOTS-123456
+<U281C> /x3e BRAILLE PATTERN DOTS-345
+<U2839> /x3f BRAILLE PATTERN DOTS-1456
+<U2808> /x40 BRAILLE PATTERN DOTS-4
+<U2801> /x41 BRAILLE PATTERN DOTS-1
+<U2803> /x42 BRAILLE PATTERN DOTS-12
+<U2809> /x43 BRAILLE PATTERN DOTS-14
+<U2819> /x44 BRAILLE PATTERN DOTS-145
+<U2811> /x45 BRAILLE PATTERN DOTS-15
+<U280B> /x46 BRAILLE PATTERN DOTS-124
+<U281B> /x47 BRAILLE PATTERN DOTS-1245
+<U2813> /x48 BRAILLE PATTERN DOTS-125
+<U280A> /x49 BRAILLE PATTERN DOTS-24
+<U281A> /x4a BRAILLE PATTERN DOTS-245
+<U2805> /x4b BRAILLE PATTERN DOTS-13
+<U2807> /x4c BRAILLE PATTERN DOTS-123
+<U280D> /x4d BRAILLE PATTERN DOTS-134
+<U281D> /x4e BRAILLE PATTERN DOTS-1345
+<U2815> /x4f BRAILLE PATTERN DOTS-135
+<U280F> /x50 BRAILLE PATTERN DOTS-1234
+<U281F> /x51 BRAILLE PATTERN DOTS-12345
+<U2817> /x52 BRAILLE PATTERN DOTS-1235
+<U280E> /x53 BRAILLE PATTERN DOTS-234
+<U281E> /x54 BRAILLE PATTERN DOTS-2345
+<U2825> /x55 BRAILLE PATTERN DOTS-136
+<U2827> /x56 BRAILLE PATTERN DOTS-1236
+<U283A> /x57 BRAILLE PATTERN DOTS-2456
+<U282D> /x58 BRAILLE PATTERN DOTS-1346
+<U283D> /x59 BRAILLE PATTERN DOTS-13456
+<U2835> /x5a BRAILLE PATTERN DOTS-1356
+<U282A> /x5b BRAILLE PATTERN DOTS-246
+<U2833> /x5c BRAILLE PATTERN DOTS-1256
+<U283B> /x5d BRAILLE PATTERN DOTS-12456
+<U2818> /x5e BRAILLE PATTERN DOTS-45
+<U2838> /x5f BRAILLE PATTERN DOTS-456
+END CHARMAP
+
+WIDTH
+<U2800>...<U283F> 1
+END WIDTH