From ddaafd04f1e91be17d1504279dada1a3b54c79bd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 20 Jan 2007 00:23:01 +0000 Subject: * 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. --- 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 ++- 7 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 iconvdata/brf.c create mode 100644 iconvdata/testdata/BRF create mode 100644 iconvdata/testdata/BRF..UTF8 (limited to 'iconvdata') 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 , 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 , 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 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 , 2000. # @@ -208,6 +208,7 @@ cat <