Update.

	* iconvdata/sjis.c (from_ucs4_lat1): Fix mappng of U005C and
	U007E.

11 files changed, 16 insertions, 48917 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d0bc1ab06..f79f4f2df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-07  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/sjis.c (from_ucs4_lat1): Fix mappng of U005C and
+	U007E.
+
 	* stdio-common/Makefile (tests): Remove tst-printf here...
 	(tests-srcs): ...and add it here.
 	(distribute): Add tst-unbputc.sh and tst-printf.sh.
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 08dce1c64b..29d558f60c 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -1924,7 +1924,7 @@ static const char from_ucs4_lat1[0xf8][2] =
   [0x0051] = "\x51\x00", [0x0052] = "\x52\x00", [0x0053] = "\x53\x00",
   [0x0054] = "\x54\x00", [0x0055] = "\x55\x00", [0x0056] = "\x56\x00",
   [0x0057] = "\x57\x00", [0x0058] = "\x58\x00", [0x0059] = "\x59\x00",
-  [0x005a] = "\x5a\x00", [0x005b] = "\x5b\x00", [0x005c] = "\x5c\x00",
+  [0x005a] = "\x5a\x00", [0x005b] = "\x5b\x00", [0x005c] = "\x81\x5c",
   [0x005d] = "\x5d\x00", [0x005e] = "\x5e\x00", [0x005f] = "\x5f\x00",
   [0x0060] = "\x60\x00", [0x0061] = "\x61\x00", [0x0062] = "\x62\x00",
   [0x0063] = "\x63\x00", [0x0064] = "\x64\x00", [0x0065] = "\x65\x00",
@@ -1936,7 +1936,7 @@ static const char from_ucs4_lat1[0xf8][2] =
   [0x0075] = "\x75\x00", [0x0076] = "\x76\x00", [0x0077] = "\x77\x00",
   [0x0078] = "\x78\x00", [0x0079] = "\x79\x00", [0x007a] = "\x7a\x00",
   [0x007b] = "\x7b\x00", [0x007c] = "\x7c\x00", [0x007d] = "\x7d\x00",
-  [0x007e] = "\x7e\x00",
+  [0x007e] = "\x00\x00",
   [0x00a2] = "\x81\x91", [0x00a3] = "\x81\x92", [0x00a5] = "\x5c\x00",
   [0x00a7] = "\x81\x98", [0x00a8] = "\x81\x4e", [0x00ac] = "\x81\xca",
   [0x00b0] = "\x81\x8b", [0x00b1] = "\x81\x7d", [0x00b4] = "\x81\x4c",
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 6067cd3883..1c15fa1b07 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,16 @@
 2000-07-07  Ulrich Drepper  <drepper@redhat.com>
 
+	* locales/POSIX: Remove repertoire map reference.
+	* locales/ar_SA: Remove repertoire map reference.
+
+	* locales/zh_CN.GBK: Removed.
+
+	* repertoiremaps/charids.894: Removed.
+	* repertoiremaps/mnemonics.ds: Removed.
+	* repertoiremaps/mnemonics.ja: Removed.
+	* repertoiremaps/mnemonics.ko: Removed.
+	* repertoiremaps/mnemonics.zh: Removed.
+
 	* charmaps/SJIS: New file.
 
 2000-07-06  Ulrich Drepper  <drepper@redhat.com>
diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX
index c1e24e1c43..9f8f0b221f 100644
--- a/localedata/locales/POSIX
+++ b/localedata/locales/POSIX
@@ -21,8 +21,6 @@
 # Distribution and use is free, also for
 # commercial purposes.
 
-repertoiremap mnemonic.ds
-
 LC_CTYPE
 # The following is the POSIX Locale LC_CTYPE.
 # "alpha" is by default "upper" and "lower"
diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA
index 751d326f3d..a5393697cb 100644
--- a/localedata/locales/ar_SA
+++ b/localedata/locales/ar_SA
@@ -3,7 +3,6 @@ escape_char  /
 
 % Arabic Locale
 % Charset: ISO-8859-6
-% repertoiremap mnemonic.ds
 % By: Salvador Sabanal, LinuxLab, SAP AG <salvador.sabanal@sap.com>
 % Date: Oct. 18, 1999
 % Adjusted to glibc mnemonics --drepper 2000-02-12
diff --git a/localedata/locales/zh_CN.GBK b/localedata/locales/zh_CN.GBK
deleted file mode 100644
index 2258eea8b3..0000000000
--- a/localedata/locales/zh_CN.GBK
+++ /dev/null
@@ -1,2275 +0,0 @@
-escape_char  /
-comment_char %
-repertoiremap mnemonic.zh
-
-% Chinese language locale for People's Repulic of China
-%    
-% The work is based on
-%        Ha Shao's locale definition file for zh_CN.GB2312 revision 1.0
-%    and HANATAKA, Shinya's locale definition file for ja_JP revision 0.7
-%
-% Source:
-% Address: TurboLinux, Inc. (China)
-%          5th Floor, China World Trade Center West Wing
-%          No.1 Jian Guo Men Wai Ave.
-%          Beijing, 100004, P.R.China
-% Contact: Sean Chen
-% Email: sean.chen@turbolinux.com
-% Tel: +86 - 10 - 65054018
-% Fax: +86 - 10 - 65054017
-% Language: zh
-% Territory: CN
-% Revision: 0.1
-% Date: 2000-02-15
-% Application: general
-% Users: general
-% Repertoiremap: mnemonic.zh
-% Charset: GBK
-% Distribution and use is free, also for
-% commercial purposes.
-
-LC_CTYPE
-
-% The following is the GBK Locale LC_CTYPE.
-% "alpha" is by default "upper" and "lower"
-% "alnum" is by definiton "alpha" and "digit"
-% "print" is by default "alnum", "punct" and the <space> character
-% "graph" is by default "alnum" and "punct"
-%
-%
-% upper class:
-%       alphabets in portable character set,
-%       Roman letters in GBK,
-%       Greek letters in GBK,
-%       Russian letters in GBK.
-
-upper   <A>;<B>;<C>;<D>;<E>;<F>;<G>;<H>;<I>;<J>;<K>;<L>;<M>;/
-        <N>;<O>;<P>;<Q>;<R>;<S>;<T>;<U>;<V>;<W>;<X>;<Y>;<Z>;/
-        <c0333>....<c0358>;/
-        <c0601>....<c0624>;/
-        <c0701>....<c0733>
-        
-%
-% lower class:
-%       Alphabets in portable character set,
-%       Roman letters in GBK,
-%       Greek letters in GBK,
-%       Russian letters in GBK.
-
-lower   <a>;<b>;<c>;<d>;<e>;<f>;<g>;<h>;<i>;<j>;<k>;<l>;<m>;/
-        <n>;<o>;<p>;<q>;<r>;<s>;<t>;<u>;<v>;<w>;<x>;<y>;<z>;/
-        <c0365>....<c0390>;/
-        <c0633>....<c0656>;/
-        <c0749>....<c0781>
-
-%
-% alpha class (default):
-% It includes, by default, all the characters defined to be in
-% upper or lower classes.
-%
-
-%
-% digit class
-%
-digit   <zero>;<one>;<two>;<three>;<four>;/
-        <five>;<six>;<seven>;<eight>;<nine>;/
-        <c0316>;<c0317>;<c0318>;<c0319>;<c0320>;/
-        <c0321>;<c0322>;<c0323>;<c0324>;<c0325>
-        
-%
-% space class:
-%       Space characters defined in ISO DIS 9945-2 "POSIX" locale
-%       Space in GBK
-%
-
-space   <tab>;<newline>;<vertical-tab>;<form-feed>;/
-        <carriage-return>;<space>;/
-        <c0101>
-
-%
-% cntrl class: C0 and C1 control characters as per ISO 6429.
-% SS2 and SS3 may be excluded if an acompanying charmap uses them
-% as single shifts to invoke graphic characters (as in EUC). 
-% Control characters in udc or vdc may be added.
-% 
-
-cntrl   <alert>;<backspace>;<tab>;<newline>;<vertical-tab>;/
-        <form-feed>;<carriage-return>;/
-        <NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;/
-        <SI>;<DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;/
-        <ETB>;<CAN>;<EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;/
-        <IS1>;<DEL>;/
-        <PA>
-        
-%
-% punct class:
-% Special characters in udc or vdc may be added as long as they
-% do not belong to classes cntrl, alpha, digit.
-%
-
-punct   <exclamation-mark>;<quotation-mark>;<number-sign>;/
-        <dollar-sign>;<percent-sign>;<ampersand>;<apostrophe>;/
-        <left-parenthesis>;<right-parenthesis>;<asterisk>;/
-        <plus-sign>;<comma>;<hyphen>;<period>;<slash>;/
-        <colon>;<semicolon>;<less-than-sign>;<equals-sign>;/
-        <greater-than-sign>;<question-mark>;<commercial-at>;/
-        <left-square-bracket>;<backslash>;<right-square-bracket>;/
-        <circumflex>;<underscore>;<grave-accent>;/
-        <left-curly-bracket>;<vertical-line>;<right-curly-bracket>;<tilde>;/
-        <c0102>....<c0110>;/
-        <c0113>....<c0131>;/
-        <c0301>;<c0312>;<c0326>;<c0327>;<c0311>
-
-%
-% graph class:
-%       upper, lower, alpha, digit, xdigit
-%       GBK printable characters
-%       Printable characters in udc or vdc classes may be added.
-
-graph   <exclamation-mark>;<quotation-mark>;<number-sign>;/
-        <dollar-sign>;<percent-sign>;<ampersand>;<apostrophe>;/
-        <left-parenthesis>;<right-parenthesis>;<asterisk>;/
-        <plus-sign>;<comma>;<hyphen>;<period>;<slash>;/
-        <zero>;<one>;<two>;<three>;<four>;/
-        <five>;<six>;<seven>;<eight>;<nine>;/
-        <colon>;<semicolon>;<less-than-sign>;<equals-sign>;/
-        <greater-than-sign>;<question-mark>;/
-        <commercial-at>;/
-        <A>;<B>;<C>;<D>;<E>;<F>;<G>;<H>;<I>;<J>;<K>;<L>;<M>;/
-        <N>;<O>;<P>;<Q>;<R>;<S>;<T>;<U>;<V>;<W>;<X>;<Y>;<Z>;/
-        <left-square-bracket>;<backslash>;<right-square-bracket>;/
-        <circumflex>;<underscore>;/
-        <grave-accent>;/
-        <a>;<b>;<c>;<d>;<e>;<f>;<g>;<h>;<i>;<j>;<k>;<l>;<m>;/
-        <n>;<o>;<p>;<q>;<r>;<s>;<t>;<u>;<v>;<w>;<x>;<y>;<z>;/
-        <left-curly-bracket>;<vertical-line>;<right-curly-bracket>;<tilde>;/
-        <b0100>....<b0162>;/
-        <b0164>....<b0196>;/
-        <a0101>....<a0194>;/
-        <b0200>....<b0262>;/
-        <b0264>....<b0296>;/
-        <a0201>....<a0294>;/
-        <b0300>....<b0362>;/
-        <b0364>....<b0396>;/
-        <a0301>....<a0394>;/
-        <b0400>....<b0462>;/
-        <b0464>....<b0496>;/
-        <a0401>....<a0494>;/
-        <b0500>....<b0562>;/
-        <b0564>....<b0596>;/
-        <a0501>....<a0594>;/
-        <b0600>....<b0662>;/
-        <b0664>....<b0696>;/
-        <a0601>....<a0694>;/
-        <b0700>....<b0762>;/
-        <b0764>....<b0796>;/
-        <a0701>....<a0794>;/
-        <b0800>....<b0862>;/
-        <b0864>....<b0896>;/
-        <a0801>....<a0894>;/
-        <b0900>....<b0962>;/
-        <b0964>....<b0996>;/
-        <a0901>....<a0994>;/
-        <b1000>....<b1062>;/
-        <b1064>....<b1096>;/
-        <a1001>....<a1094>;/
-        <b1100>....<b1162>;/
-        <b1164>....<b1196>;/
-        <a1101>....<a1194>;/
-        <b1200>....<b1262>;/
-        <b1264>....<b1296>;/
-        <a1201>....<a1294>;/
-        <b1300>....<b1362>;/
-        <b1364>....<b1396>;/
-        <a1301>....<a1394>;/
-        <b1400>....<b1462>;/
-        <b1464>....<b1496>;/
-        <a1401>....<a1494>;/
-        <b1500>....<b1562>;/
-        <b1564>....<b1596>;/
-        <a1501>....<a1594>;/
-        <b1600>....<b1662>;/
-        <b1664>....<b1696>;/
-        <a1601>....<a1694>;/
-        <b1700>....<b1762>;/
-        <b1764>....<b1796>;/
-        <a1701>....<a1794>;/
-        <b1800>....<b1862>;/
-        <b1864>....<b1896>;/
-        <a1801>....<a1894>;/
-        <b1900>....<b1962>;/
-        <b1964>....<b1996>;/
-        <a1901>....<a1994>;/
-        <b2000>....<b2062>;/
-        <b2064>....<b2096>;/
-        <a2001>....<a2094>;/
-        <b2100>....<b2162>;/
-        <b2164>....<b2196>;/
-        <a2101>....<a2194>;/
-        <b2200>....<b2262>;/
-        <b2264>....<b2296>;/
-        <a2201>....<a2294>;/
-        <b2300>....<b2362>;/
-        <b2364>....<b2396>;/
-        <a2301>....<a2394>;/
-        <b2400>....<b2462>;/
-        <b2464>....<b2496>;/
-        <a2401>....<a2494>;/
-        <b2500>....<b2562>;/
-        <b2564>....<b2596>;/
-        <a2501>....<a2594>;/
-        <b2600>....<b2662>;/
-        <b2664>....<b2696>;/
-        <a2601>....<a2694>;/
-        <b2700>....<b2762>;/
-        <b2764>....<b2796>;/
-        <a2701>....<a2794>;/
-        <b2800>....<b2862>;/
-        <b2864>....<b2896>;/
-        <a2801>....<a2894>;/
-        <b2900>....<b2962>;/
-        <b2964>....<b2996>;/
-        <a2901>....<a2994>;/
-        <b3000>....<b3062>;/
-        <b3064>....<b3096>;/
-        <a3001>....<a3094>;/
-        <b3100>....<b3162>;/
-        <b3164>....<b3196>;/
-        <a3101>....<a3194>;/
-        <b3200>....<b3262>;/
-        <b3264>....<b3296>;/
-        <a3201>....<a3294>;/
-        <c0101>....<c0194>;/
-        <c0201>....<c0210>;/
-        <c0217>....<c0266>;/
-        <c0269>....<c0278>;/
-        <c0281>....<c0292>;/
-        <c0301>....<c0394>;/
-        <c0401>....<c0483>;/
-        <c0501>....<c0586>;/
-        <c0601>....<c0624>;/
-        <c0633>....<c0656>;/
-        <c0664>....<c0675>;/
-        <c0678>....<c0685>;/
-        <c0701>....<c0733>;/
-        <c0749>....<c0781>;/
-        <d0800>....<d0862>;/
-        <d0864>....<d0885>;/
-        <c0801>....<c0832>;/
-        <c0837>....<c0873>;/
-        <d0900>....<d0926>;/
-        <d0928>;/
-        <d0932>....<d0962>;/
-        <d0964>....<d0986>;/
-        <c0904>....<c0979>;/
-        <d1000>....<d1062>;/
-        <d1064>....<d1096>;/
-        <d1100>....<d1162>;/
-        <d1164>....<d1196>;/
-        <d1200>....<d1262>;/
-        <d1264>....<d1296>;/
-        <d1300>....<d1362>;/
-        <d1364>....<d1396>;/
-        <d1400>....<d1462>;/
-        <d1464>....<d1496>;/
-        <d1500>....<d1562>;/
-        <d1564>....<d1596>;/
-        <d1600>....<d1662>;/
-        <d1664>....<d1696>;/
-        <c1601>....<c1694>;/
-        <d1700>....<d1762>;/
-        <d1764>....<d1796>;/
-        <c1701>....<c1794>;/
-        <d1800>....<d1862>;/
-        <d1864>....<d1896>;/
-        <c1801>....<c1894>;/
-        <d1900>....<d1962>;/
-        <d1964>....<d1996>;/
-        <c1901>....<c1994>;/
-        <d2000>....<d2062>;/
-        <d2064>....<d2096>;/
-        <c2001>....<c2094>;/
-        <d2100>....<d2162>;/
-        <d2164>....<d2196>;/
-        <c2101>....<c2194>;/
-        <d2200>....<d2262>;/
-        <d2264>....<d2296>;/
-        <c2201>....<c2294>;/
-        <d2300>....<d2362>;/
-        <d2364>....<d2396>;/
-        <c2301>....<c2394>;/
-        <d2400>....<d2462>;/
-        <d2464>....<d2496>;/
-        <c2401>....<c2494>;/
-        <d2500>....<d2562>;/
-        <d2564>....<d2596>;/
-        <c2501>....<c2594>;/
-        <d2600>....<d2662>;/
-        <d2664>....<d2696>;/
-        <c2601>....<c2694>;/
-        <d2700>....<d2762>;/
-        <d2764>....<d2796>;/
-        <c2701>....<c2794>;/
-        <d2800>....<d2862>;/
-        <d2864>....<d2896>;/
-        <c2801>....<c2894>;/
-        <d2900>....<d2962>;/
-        <d2964>....<d2996>;/
-        <c2901>....<c2994>;/
-        <d3000>....<d3062>;/
-        <d3064>....<d3096>;/
-        <c3001>....<c3094>;/
-        <d3100>....<d3162>;/
-        <d3164>....<d3196>;/
-        <c3101>....<c3194>;/
-        <d3200>....<d3262>;/
-        <d3264>....<d3296>;/
-        <c3201>....<c3294>;/
-        <d3300>....<d3362>;/
-        <d3364>....<d3396>;/
-        <c3301>....<c3394>;/
-        <d3400>....<d3462>;/
-        <d3464>....<d3496>;/
-        <c3401>....<c3494>;/
-        <d3500>....<d3562>;/
-        <d3564>....<d3596>;/
-        <c3501>....<c3594>;/
-        <d3600>....<d3662>;/
-        <d3664>....<d3696>;/
-        <c3601>....<c3694>;/
-        <d3700>....<d3762>;/
-        <d3764>....<d3796>;/
-        <c3701>....<c3794>;/
-        <d3800>....<d3862>;/
-        <d3864>....<d3896>;/
-        <c3801>....<c3894>;/
-        <d3900>....<d3962>;/
-        <d3964>....<d3996>;/
-        <c3901>....<c3994>;/
-        <d4000>....<d4062>;/
-        <d4064>....<d4096>;/
-        <c4001>....<c4094>;/
-        <d4100>....<d4162>;/
-        <d4164>....<d4196>;/
-        <c4101>....<c4194>;/
-        <d4200>....<d4262>;/
-        <d4264>....<d4296>;/
-        <c4201>....<c4294>;/
-        <d4300>....<d4362>;/
-        <d4364>....<d4396>;/
-        <c4301>....<c4394>;/
-        <d4400>....<d4462>;/
-        <d4464>....<d4496>;/
-        <c4401>....<c4494>;/
-        <d4500>....<d4562>;/
-        <d4564>....<d4596>;/
-        <c4501>....<c4594>;/
-        <d4600>....<d4662>;/
-        <d4664>....<d4696>;/
-        <c4601>....<c4694>;/
-        <d4700>....<d4762>;/
-        <d4764>....<d4796>;/
-        <c4701>....<c4794>;/
-        <d4800>....<d4862>;/
-        <d4864>....<d4896>;/
-        <c4801>....<c4894>;/
-        <d4900>....<d4962>;/
-        <d4964>....<d4996>;/
-        <c4901>....<c4994>;/
-        <d5000>....<d5062>;/
-        <d5064>....<d5096>;/
-        <c5001>....<c5094>;/
-        <d5100>....<d5162>;/
-        <d5164>....<d5196>;/
-        <c5101>....<c5194>;/
-        <d5200>....<d5262>;/
-        <d5264>....<d5296>;/
-        <c5201>....<c5294>;/
-        <d5300>....<d5362>;/
-        <d5364>....<d5396>;/
-        <c5301>....<c5394>;/
-        <d5400>....<d5462>;/
-        <d5464>....<d5496>;/
-        <c5401>....<c5494>;/
-        <d5500>....<d5562>;/
-        <d5564>....<d5596>;/
-        <c5501>....<c5594>;/
-        <d5600>....<d5662>;/
-        <d5664>....<d5696>;/
-        <c5601>....<c5694>;/
-        <d5700>....<d5762>;/
-        <d5764>....<d5796>;/
-        <c5701>....<c5794>;/
-        <d5800>....<d5862>;/
-        <d5864>....<d5896>;/
-        <c5801>....<c5894>;/
-        <d5900>....<d5962>;/
-        <d5964>....<d5996>;/
-        <c5901>....<c5994>;/
-        <d6000>....<d6062>;/
-        <d6064>....<d6096>;/
-        <c6001>....<c6094>;/
-        <d6100>....<d6162>;/
-        <d6164>....<d6196>;/
-        <c6101>....<c6194>;/
-        <d6200>....<d6262>;/
-        <d6264>....<d6296>;/
-        <c6201>....<c6294>;/
-        <d6300>....<d6362>;/
-        <d6364>....<d6396>;/
-        <c6301>....<c6394>;/
-        <d6400>....<d6462>;/
-        <d6464>....<d6496>;/
-        <c6401>....<c6494>;/
-        <d6500>....<d6562>;/
-        <d6564>....<d6596>;/
-        <c6501>....<c6594>;/
-        <d6600>....<d6662>;/
-        <d6664>....<d6696>;/
-        <c6601>....<c6694>;/
-        <d6700>....<d6762>;/
-        <d6764>....<d6796>;/
-        <c6701>....<c6794>;/
-        <d6800>....<d6862>;/
-        <d6864>....<d6896>;/
-        <c6801>....<c6894>;/
-        <d6900>....<d6962>;/
-        <d6964>..