summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--iconvdata/Makefile7
-rw-r--r--iconvdata/gconv-modules8
-rw-r--r--iconvdata/iso-ir-209.c29
-rw-r--r--iconvdata/mac-sami.c29
-rwxr-xr-xiconvdata/tst-tables.sh2
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/charmaps/ISO-IR-209258
-rw-r--r--localedata/charmaps/MAC-SAMI266
9 files changed, 615 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 710e15ad32..45f951cfac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconvdata/Makefile: Add rules to build ISO-IR-209 and MAC-SAMI.
+	* iconvdata/iso-ir-209.c: New file.
+	* iconvdata/mac-sami.c: New file.
+	* iconvdata/gconv-modules: Add entries for ISO-IR-209 and MAC-SAMI.
+	* iconvdata/tst-tables.sh: Likewise.
+
+	* posix/getopt.c: Remove store_args_and_env which is not needed since
+	USE_NONOPTION_FLAGS is undefined anyhow.  Use __libc_argc and
+	__libc_argv variables.
+
 2001-08-12  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/clock.c: New file.
@@ -54,7 +66,7 @@
 	only if consider_profiling is != 0, not if _dl_profile != NULL.
 
 	* sysdeps/generic/dl-environ.c (_dl_next_ld_env_entry): Optimize a bit.
-	Now returns pointer to first character set "LD_".
+	Now returns pointer to first character after "LD_".
 	* elf/rtld.c (process_envvars): Adjust for change above.
 	* sysdeps/unix/sysv/linux/dl-librecon.h (EXTRA_LD_ENVVARS): Likewise.
 	* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 419ea3c583..fe4a7508fa 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -48,7 +48,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK	 \
 	   ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-32 UTF-7 BIG5HKSCS \
 	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T		 \
-	   GEORGIAN-PS GEORGIAN-ACADEMY
+	   GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -139,7 +139,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
 	      iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c	    \
 	      ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c	    \
-	      koi8-t.c georgian-ps.c georgian-academy.c
+	      koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c	    \
+	      mac-sami.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -179,7 +180,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
 			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
+			georgian-ps georgian-academy iso-ir-209 mac-sami
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 1eacc1b51e..5951574c1d 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1442,3 +1442,11 @@ module	INTERNAL		GEORGIAN-PS//		GEORGIAN-PS	1
 #	from			to			module		cost
 module	GEORGIAN-ACADEMY//	INTERNAL		GEORGIAN-ACADEMY 1
 module	INTERNAL		GEORGIAN-ACADEMY//	GEORGIAN-ACADEMY 1
+
+#	from			to			module		cost
+module	ISO-IR-209//		INTERNAL		ISO-IR-209	1
+module	INTERNAL		ISO-IR-209//		ISO-IR-209	1
+
+#	from			to			module		cost
+module	MAC-SAMI//		INTERNAL		MAC-SAMI	1
+module	INTERNAL		MAC-SAMI//		MAC-SAMI	1
diff --git a/iconvdata/iso-ir-209.c b/iconvdata/iso-ir-209.c
new file mode 100644
index 0000000000..9ab4950d90
--- /dev/null
+++ b/iconvdata/iso-ir-209.c
@@ -0,0 +1,29 @@
+/* Conversion from and to ISO-IR-209.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
+
+   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 <iso-ir-209.h>
+
+#define CHARSET_NAME	"ISO-IR-209//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/mac-sami.c b/iconvdata/mac-sami.c
new file mode 100644
index 0000000000..db221a6c50
--- /dev/null
+++ b/iconvdata/mac-sami.c
@@ -0,0 +1,29 @@
+/* Conversion from and to MAC-SAMI.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
+
+   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 <mac-sami.h>
+
+#define CHARSET_NAME	"MAC-SAMI//"
+#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 fea3914df3..ce706aa625 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -180,6 +180,8 @@ cat <<EOF |
   NATS-SEFI
   WIN-SAMI-2        SAMI-WS2
   ISO-IR-197
+  ISO-IR-209
+  MAC-SAMI
   TIS-620
   KOI8-U
   VISCII
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index ce1734d0a6..45d2c1c99b 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/ISO-IR-209: New file.
+	* charmaps/MAC-SAMI: New file.
+	Contributed by Regnor Jernsletten <Regnor.Jernsletten@eunet.no>.
+
 2001-08-04  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/GEORGIAN-PS: New file.
diff --git a/localedata/charmaps/ISO-IR-209 b/localedata/charmaps/ISO-IR-209
new file mode 100644
index 0000000000..0f88e26ba1
--- /dev/null
+++ b/localedata/charmaps/ISO-IR-209
@@ -0,0 +1,258 @@
+<code_set_name> ISO-IR-209
+<comment_char> %
+<escape_char> /
+% source:  http://www.itscj.ipsj.or.jp/ISO-IR/209.pdf
+% author:  Regnor Jernsletten <Regnor.Jernsletten@sami.uit.no>
+% date:    2001-07-31
+% comment: Proposed sami charset.
+
+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)
+<U201A>     /x82         SINGLE LOW-9 QUOTATION MARK
+<U0192>     /x83         LATIN SMALL LETTER F WITH HOOK
+<U201E>     /x84         DOUBLE LOW-9 QUOTATION MARK
+<U2026>     /x85         HORIZONTAL ELLIPSIS
+<U00AC>     /x86         NOT SIGN
+<U2260>     /x87         NOT EQUAL TO
+<U00A3>     /x88         POUND SIGN
+<U2030>     /x89         PER MILLE SIGN
+<U00BF>     /x8a         INVERTED QUESTION MARK
+<U2264>     /x8b         LESS-THAN OR EQUAL TO
+<U0152>     /x8c         LATIN CAPITAL LIGATURE OE
+<U2018>     /x91         LEFT SINGLE QUOTATION MARK
+<U2019>     /x92         RIGHT SINGLE QUOTATION MARK
+<U201C>     /x93         LEFT DOUBLE QUOTATION MARK
+<U201D>     /x94         RIGHT DOUBLE QUOTATION MARK
+<U2022>     /x95         BULLET
+<U2013>     /x96         EN DASH
+<U2014>     /x97         EM DASH
+<U00AE>     /x98         REGISTERED SIGN
+<U2122>     /x99         TRADE MARK SIGN
+<U00A1>     /x9a         INVERTED EXCLAMATION MARK
+<U2265>     /x9b         GREATER-THAN OR EQUAL TO
+<U0153>     /x9c         LATIN SMALL LIGATURE OE
+<U0178>     /x9f         LATIN CAPITAL LETTER Y WITH DIAERESIS
+<U00A0>     /xa0         NO-BREAK SPACE
+<U010C>     /xa1         LATIN CAPITAL LETTER C WITH CARON
+<U010D>     /xa2         LATIN SMALL LETTER C WITH CARON
+<U0110>     /xa3         LATIN CAPITAL LETTER D WITH STROKE
+<U0111>     /xa4         LATIN SMALL LETTER D WITH STROKE
+<U01E4>     /xa5         LATIN CAPITAL LETTER G WITH STROKE
+<U01E5>     /xa6         LATIN SMALL LETTER G WITH STROKE
+<U00A7>     /xa7         SECTION SIGN
+<U01E6>     /xa8         LATIN CAPITAL LETTER G WITH CARON
+<U00A9>     /xa9         COPYRIGHT SIGN
+<U01E7>     /xaa         LATIN SMALL LETTER G WITH CARON
+<U821E>     /xab         LATIN CAPITAL LETTER H WITH CARON
+<U01E8>     /xac         LATIN CAPITAL LETTER K WITH CARON
+<U00AD>     /xad         SOFT HYPHEN
+<U01E9>     /xae         LATIN SMALL LETTER K WITH CARON
+<U014A>     /xaf         LATIN CAPITAL LETTER ENG (Sami)
+<U00B0>     /xb0         DEGREE SIGN
+<U014B>     /xb1         LATIN SMALL LETTER ENG (Sami)
+<U0160>     /xb2         LATIN CAPITAL LETTER S WITH CARON
+<U0161>     /xb3         LATIN SMALL LETTER S WITH CARON
+<U00B4>     /xb4         ACUTE ACCENT
+<U0166>     /xb5         LATIN CAPITAL LETTER T WITH STROKE
+<U00B6>     /xb6         PILCROW SIGN
+<U00B7>     /xb7         MIDDLE DOT
+<U0167>     /xb8         LATIN SMALL LETTER T WITH STROKE
+<U017D>     /xb9         LATIN CAPITAL LETTER Z WITH CARON
+<U017E>     /xba         LATIN SMALL LETTER Z WITH CARON
+<U821F>     /xbb         LATIN SMALL LETTER H WITH CARON
+<U01B7>     /xbc         LATIN CAPITAL LETTER EZH
+<U0292>     /xbd         LATIN SMALL LETTER EZH
+<U01EE>     /xbe         LATIN CAPITAL LETTER EZH WITH CARON
+<U01EF>     /xbf         LATIN SMALL LETTER EZH WITH CARON
+<U00C0>     /xc0         LATIN CAPITAL LETTER A WITH GRAVE
+<U00C1>     /xc1         LATIN CAPITAL LETTER A WITH ACUTE
+<U00C2>     /xc2         LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<U00C3>     /xc3         LATIN CAPITAL LETTER A WITH TILDE
+<U00C4>     /xc4         LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00C5>     /xc5         LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00C6>     /xc6         LATIN CAPITAL LETTER AE
+<U00C7>     /xc7         LATIN CAPITAL LETTER C WITH CEDILLA
+<U00C8>     /xc8         LATIN CAPITAL LETTER E WITH GRAVE
+<U00C9>     /xc9         LATIN CAPITAL LETTER E WITH ACUTE
+<U00CA>     /xca         LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00CB>     /xcb         LATIN CAPITAL LETTER E WITH DIAERESIS
+<U00CC>     /xcc         LATIN CAPITAL LETTER I WITH GRAVE
+<U00CD>     /xcd         LATIN CAPITAL LETTER I WITH ACUTE
+<U00CE>     /xce         LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<U00CF>     /xcf         LATIN CAPITAL LETTER I WITH DIAERESIS
+<U00D0>     /xd0         LATIN CAPITAL LETTER ETH (Icelandic)
+<U00D1>     /xd1         LATIN CAPITAL LETTER N WITH TILDE
+<U00D2>     /xd2         LATIN CAPITAL LETTER O WITH GRAVE
+<U00D3>     /xd3         LATIN CAPITAL LETTER O WITH ACUTE
+<U00D4>     /xd4         LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<U00D5>     /xd5         LATIN CAPITAL LETTER O WITH TILDE
+<U00D6>     /xd6         LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00D7>     /xd7         MULTIPLICATION SIGN
+<U00D8>     /xd8         LATIN CAPITAL LETTER O WITH STROKE
+<U00D9>     /xd9         LATIN CAPITAL LETTER U WITH GRAVE
+<U00DA>     /xda         LATIN CAPITAL LETTER U WITH ACUTE
+<U00DB>     /xdb         LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U00DC>     /xdc         LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00DD>     /xdd         LATIN CAPITAL LETTER Y WITH ACUTE
+<U00DE>     /xde         LATIN CAPITAL LETTER THORN (Icelandic)
+<U00DF>     /xdf         LATIN SMALL LETTER SHARP S (German)
+<U00E0>     /xe0         LATIN SMALL LETTER A WITH GRAVE
+<U00E1>     /xe1         LATIN SMALL LETTER A WITH ACUTE
+<U00E2>     /xe2         LATIN SMALL LETTER A WITH CIRCUMFLEX
+<U00E3>     /xe3         LATIN SMALL LETTER A WITH TILDE
+<U00E4>     /xe4         LATIN SMALL LETTER A WITH DIAERESIS
+<U00E5>     /xe5         LATIN SMALL LETTER A WITH RING ABOVE
+<U00E6>     /xe6         LATIN SMALL LETTER AE
+<U00E7>     /xe7         LATIN SMALL LETTER C WITH CEDILLA
+<U00E8>     /xe8         LATIN SMALL LETTER E WITH GRAVE
+<U00E9>     /xe9         LATIN SMALL LETTER E WITH ACUTE
+<U00EA>     /xea         LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00EB>     /xeb         LATIN SMALL LETTER E WITH DIAERESIS
+<U00EC>     /xec         LATIN SMALL LETTER I WITH GRAVE
+<U00ED>     /xed         LATIN SMALL LETTER I WITH ACUTE
+<U00EE>     /xee         LATIN SMALL LETTER I WITH CIRCUMFLEX
+<U00EF>     /xef         LATIN SMALL LETTER I WITH DIAERESIS
+<U00F0>     /xf0         LATIN SMALL LETTER ETH (Icelandic)
+<U00F1>     /xf1         LATIN SMALL LETTER N WITH TILDE
+<U00F2>     /xf2         LATIN SMALL LETTER O WITH GRAVE
+<U00F3>     /xf3         LATIN SMALL LETTER O WITH ACUTE
+<U00F4>     /xf4         LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U00F5>     /xf5         LATIN SMALL LETTER O WITH TILDE
+<U00F6>     /xf6         LATIN SMALL LETTER O WITH DIAERESIS
+<U00F7>     /xf7         DIVISION SIGN
+<U00F8>     /xf8         LATIN SMALL LETTER O WITH STROKE
+<U00F9>     /xf9         LATIN SMALL LETTER U WITH GRAVE
+<U00FA>     /xfa         LATIN SMALL LETTER U WITH ACUTE
+<U00FB>     /xfb         LATIN SMALL LETTER U WITH CIRCUMFLEX
+<U00FC>     /xfc         LATIN SMALL LETTER U WITH DIAERESIS
+<U00FD>     /xfd         LATIN SMALL LETTER Y WITH ACUTE
+<U00FE>     /xfe         LATIN SMALL LETTER THORN (Icelandic)
+<U00FF>     /xff         LATIN SMALL LETTER Y WITH DIAERESIS
+END CHARMAP
diff --git a/localedata/charmaps/MAC-SAMI b/localedata/charmaps/MAC-SAMI
new file mode 100644
index 0000000000..b2b2a071e4
--- /dev/null
+++ b/localedata/charmaps/MAC-SAMI
@@ -0,0 +1,266 @@
+<code_set_name> MAC-SAMI
+<comment_char> %
+<escape_char> /
+% source:  http://www.indigo.ie/egt/standards/se/mac-sami.html
+% author:  Regnor Jernsletten <Regnor.Jernsletten@sami.uit.no>
+% date:    2001-07-31
+% comment: Macintosh sami standard.
+
+CHARMAP
+<U0000>     /x00         NULL
+<U0001>     /x01         START OF HEADING
+<U0002>     /x02         START OF TEXT
+<U0003>     /x03         END OF TEXT
+<U0004>     /x04         END OF TRANSMISSION
+<U0005>     /x05         ENQUIRY
+<U0006>     /x06         ACKNOWLEDGE
+<U0007>     /x07         BELL
+<U0008>     /x08         BACKSPACE
+<U0009>     /x09         HORIZONTAL TABULATION
+<U000A>     /x0a         LINE FEED
+<U000B>     /x0b         VERTICAL TABULATION
+<U000C>     /x0c         FORM FEED
+<U000D>     /x0d         CARRIAGE RETURN
+<U000E>     /x0e         SHIFT OUT
+<U000F>     /x0f         SHIFT IN
+<U0010>     /x10         DATA LINK ESCAPE
+<U0011>     /x11         DEVICE CONTROL ONE
+<U0012>     /x12         DEVICE CONTROL TWO
+<U0013>     /x13         DEVICE CONTROL THREE
+<U0014>     /x14         DEVICE CONTROL FOUR
+<U0015>     /x15         NEGATIVE ACKNOWLEDGE
+<U0016>     /x16         SYNCHRONOUS IDLE
+<U0017>     /x17         END OF TRANSMISSION BLOCK
+<U0018>     /x18         CANCEL
+<U0019>     /x19         END OF MEDIUM
+<U001A>     /x1a         SUBSTITUTE
+<U001B>     /x1b         ESCAPE
+<U001C>     /x1c         FILE SEPARATOR
+<U001D>     /x1d         GROUP SEPARATOR
+<U001E>     /x1e         RECORD SEPARATOR
+<U001F>     /x1f         UNIT SEPARATOR
+<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
+<U00C4>     /x80         LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00C5>     /x81         LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00C7>     /x82         LATIN CAPITAL LETTER C WITH CEDILLA
+<U00C9>     /x83         LATIN CAPITAL LETTER E WITH ACUTE
+<U00D1>     /x84         LATIN CAPITAL LETTER N WITH TILDE
+<U00D6>     /x85         LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00DC>     /x86         LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00E1>     /x87         LATIN SMALL LETTER A WITH ACUTE
+<U00E0>     /x88         LATIN SMALL LETTER A WITH GRAVE
+<U00E2>     /x89         LATIN SMALL LETTER A WITH CIRCUMFLEX
+<U00E4>     /x8a         LATIN SMALL LETTER A WITH DIAERESIS
+<U00E3>     /x8b         LATIN SMALL LETTER A WITH TILDE
+<U00E5>     /x8c         LATIN SMALL LETTER A WITH RING ABOVE
+<U00E7>     /x8d         LATIN SMALL LETTER C WITH CEDILLA
+<U00E9>     /x8e         LATIN SMALL LETTER E WITH ACUTE
+<U00E8>     /x8f         LATIN SMALL LETTER E WITH GRAVE
+<U00EA>     /x90         LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00EB>     /x91         LATIN SMALL LETTER E WITH DIAERESIS
+<U00ED>     /x92         LATIN SMALL LETTER I WITH ACUTE
+<U00EC>     /x93         LATIN SMALL LETTER I WITH GRAVE
+<U00EE>     /x94         LATIN SMALL LETTER I WITH CIRCUMFLEX
+<U00EF>     /x95         LATIN SMALL LETTER I WITH DIAERESIS
+<U00F1>     /x96         LATIN SMALL LETTER N WITH TILDE
+<U00F3>     /x97         LATIN SMALL LETTER O WITH ACUTE
+<U00F2>     /x98         LATIN SMALL LETTER O WITH GRAVE
+<U00F4>     /x99         LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U00F6>     /x9a         LATIN SMALL LETTER O WITH DIAERESIS
+<U00F5>     /x9b         LATIN SMALL LETTER O WITH TILDE
+<U00FA>     /x9c         LATIN SMALL LETTER U WITH ACUTE
+<U00F9>     /x9d         LATIN SMALL LETTER U WITH GRAVE
+<U00FB>     /x9e         LATIN SMALL LETTER U WITH CIRCUMFLEX
+<U00FC>     /x9f         LATIN SMALL LETTER U WITH DIAERESIS
+<U00DD>     /xa0         LATIN CAPITAL LETTER Y WITH ACUTE
+<U00B0>     /xa1         DEGREE SIGN
+<U010C>     /xa2         LATIN CAPITAL LETTER C WITH CARON
+<U00A3>     /xa3         POUND SIGN
+<U00A7>     /xa4         SECTION SIGN
+<U2022>     /xa5         BULLET
+<U00B6>     /xa6         PILCROW SIGN
+<U00DF>     /xa7         LATIN SMALL LETTER SHARP S (German)
+<U00AE>     /xa8         REGISTERED SIGN
+<U00A9>     /xa9         COPYRIGHT SIGN
+<U2122>     /xaa         TRADE MARK SIGN
+<U00B4>     /xab         ACUTE ACCENT
+<U00A8>     /xac         DIAERESIS
+<U2260>     /xad         NOT EQUAL TO
+<U00C6>     /xae         LATIN CAPITAL LETTER AE
+<U00D8>     /xaf         LATIN CAPITAL LETTER O WITH STROKE
+<U0110>     /xb0         LATIN CAPITAL LETTER D WITH STROKE
+<U014A>     /xb1         LATIN CAPITAL LETTER ENG
+<U821E>     /xb2         LATIN CAPITAL LETTER H WITH CARON
+<U821F>     /xb3         LATIN SMALL LETTER H WITH CARON
+<U0160>     /xb4         LATIN CAPITAL LETTER S WITH CARON
+<U0166>     /xb5         LATIN CAPITAL LETTER T WITH STROKE
+<U2202>     /xb6         PARTIAL DIFFERENTIAL
+<U017D>     /xb7         LATIN CAPITAL LETTER Z WITH CARON
+<U010D>     /xb8         LATIN SMALL LETTER C WITH CARON
+<U0111>     /xb9         LATIN SMALL LETTER D WITH STROKE
+<U014B>     /xba         LATIN SMALL LETTER ENG
+<U0161>     /xbb         LATIN SMALL LETTER S WITH CARON
+<U0167>     /xbc         LATIN SMALL LETTER T WITH STROKE
+<U017E>     /xbd         LATIN SMALL LETTER Z WITH CARON
+<U00E6>     /xbe         LATIN SMALL LETTER AE
+<U00F8>     /xbf         LATIN SMALL LETTER O WITH STROKE
+<U00BF>     /xc0         INVERTED QUESTION MARK
+<U00A1>     /xc1         INVERTED EXCLAMATION MARK
+<U00AC>     /xc2         NOT SIGN
+<U221A>     /xc3         SQUARE ROOT
+<U0192>     /xc4         LATIN SMALL LETTER F WITH HOOK
+<U2248>     /xc5         ALMOST EQUAL TO
+<U2206>     /xc6         INCREMENT
+<U00AB>     /xc7         LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00BB>     /xc8         RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U2026>     /xc9         HORIZONTAL ELLIPSIS
+<U00A0>     /xca         NO-BREAK SPACE
+<U00C0>     /xcb         LATIN CAPITAL LETTER A WITH GRAVE
+<U00C3>     /xcc         LATIN CAPITAL LETTER A WITH TILDE
+<U00D5>     /xcd         LATIN CAPITAL LETTER O WITH TILDE
+<U0152>     /xce         LATIN CAPITAL LETTER LIGATURE OE
+<U0153>     /xcf         LATIN SMALL LETTER LIGATURE OE
+<U2013>     /xd0         EN DASH
+<U2014>     /xd1         EM DASH
+<U201C>     /xd2         LEFT DOUBLE QUOTATION MARK
+<U201D>     /xd3         RIGHT DOUBLE QUOTATION MARK
+<U2018>     /xd4         LEFT SINGLE QUOTATION MARK
+<U2019>     /xd5         RIGHT SINGLE QUOTATION MARK
+<U00F7>     /xd6         DIVISION SIGN
+<U25CA>     /xd7         LOZENGE
+<U00FF>     /xd8         LATIN SMALL LETTER Y WITH DIAERESIS
+<U0178>     /xd9         LATIN CAPITAL LETTER Y WITH DIAERESIS
+<U2044>     /xda         FRACTION SLASH
+<U00A4>     /xdb         CURRENCY SIGN
+<U00D0>     /xdc         LATIN CAPITAL LETTER ETH
+<U00F0>     /xdd         LATIN SMALL LETTER ETH
+<U00DE>     /xde         LATIN CAPITAL LETTER THORN
+<U00FE>     /xdf         LATIN SMALL LETTER THORN
+<U00FD>     /xe0         LATIN SMALL LETTER Y WITH ACUTE
+<U00B7>     /xe1         MIDDLE DOT
+<U201A>     /xe2         SINGLE LOW-9 QUOTATION MARK
+<U201E>     /xe3         DOUBLE LOW-9 QUOTATION MARK
+<U2030>     /xe4         PER MILLE SIGN
+<U00C2>     /xe5         LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<U00CA>     /xe6         LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00C1>     /xe7         LATIN CAPITAL LETTER A WITH ACUTE
+<U00CB>     /xe8         LATIN CAPITAL LETTER E WITH DIAERESIS
+<U00C8>     /xe9         LATIN CAPITAL LETTER E WITH GRAVE
+<U00CD>     /xea         LATIN CAPITAL LETTER I WITH ACUTE
+<U00CE>     /xeb         LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<U00CF>     /xec         LATIN CAPITAL LETTER I WITH DIAERESIS
+<U00CC>     /xed         LATIN CAPITAL LETTER I WITH GRAVE
+<U00D3>     /xee         LATIN CAPITAL LETTER O WITH ACUTE
+<U00D4>     /xef         LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<UF8FF>     /xf0         APPLE SIGN
+<U00D2>     /xf1         LATIN CAPITAL LETTER O WITH GRAVE
+<U00DA>     /xf2         LATIN CAPITAL LETTER U WITH ACUTE
+<U00DB>     /xf3         LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U00D9>     /xf4         LATIN CAPITAL LETTER U WITH GRAVE
+<U0131>     /xf5         LATIN SMALL LETTER DOTLESS I
+<U01B7>     /xf6         LATIN CAPITAL LETTER EZH
+<U0292>     /xf7         LATIN SMALL LETTER EZH
+<U01EE>     /xf8         LATIN CAPITAL LETTER EZH WITH CARON
+<U01EF>     /xf9         LATIN SMALL LETTER EZH WITH CARON
+<U01E4>     /xfa         LATIN CAPITAL LETTER G WITH STROKE
+<U01E5>     /xfb         LATIN SMALLL LETTER G WITH STROKE
+<U01E6>     /xfc         LATIN CAPITAL LETTER G WITH CARON
+<U01E7>     /xfd         LATIN SMALL LETTER G WITH CARON
+<U01E8>     /xfe         LATIN CAPITAL LETTER K WITH CARON
+<U01E9>     /xff         LATIN SMALL LETTER K WITH CARON
+END CHARMAP