Re-generate charsets. Adjust for the change of admin/charset/mapfiles/*.gz

cde44a77 · Kenichi Handa · dade5fca · cde44a77 · cde44a77 · cde44a77
Commit cde44a77 authored Oct 11, 2012 by Kenichi Handa
30 changed files
--- a/ChangeLog
+++ b/ChangeLog
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+	* .bzrignore: Add several files under admin/charsets.
+
 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>

 	* configure.ac: Check that OSX is 10.4 or newer.

--- a/admin/ChangeLog
+++ b/admin/ChangeLog
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+	* charsets/mapconv: Adjusted for the change of mapfiles/*.gz to
+	mapfiles/*.
+
+	* charsets/gb180302.awk: Handle 4-byte sequences in the input file.
+
+	* charsets/Makefile: Be sure to call mapconv script of the current
+	directory.  Adjusted for the change of mapfiles/*.gz to
+	mapfiles/*.
+	(SED_SCRIPT): New variable.
+	(jisx2131-filter): New target.
+	(JISX2131.map): Use jisx2131-filter to filter out characters added
+	for the 2004 year version.
+	(clear): Remove ${SED_SCRIPT} too.
+
+	* charsets/mapfiles/MULE-ethiopic.map,
+	charsets/mapfiles/MULE-ipa.map,
+	charsets/mapfiles/MULE-is13194.map,
+	charsets/mapfiles/MULE-lviscii.map,
+	charsets/mapfiles/MULE-sisheng.map,
+	charsets/mapfiles/MULE-tibetan.map,
+	charsets/mapfiles/MULE-uviscii.map: Fix typo.
+
 2012-10-07  Glenn Morris  <rgm@gnu.org>

 	* admin.el (cusver-new-version): Set default.

--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -77,6 +77,7 @@ MULE =	MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
 	MULE-lviscii.map MULE-uviscii.map

 TRANS_TABLE = cp51932.el eucjp-ms.el
+SED_SCRIPT = jisx2131-filter

 all: ${CHARSETS} ${TRANS_TABLE}

@@ -86,11 +87,11 @@ AWK = gawk

 VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[0-9a-f].[ 	]/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[0-9a-f].[ 	]/' GLIBC-1 compact.awk > $@

 VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[2-7a-f].[ 	]/' GLIBC-1 compact.awk \
+	@./mapconv $< '/^<.*[ 	]\/x[2-7a-f].[ 	]/' GLIBC-1 compact.awk \
 	  | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@

 ALTERNATIVNYJ.map: IBM866.map
@@ -110,45 +111,45 @@ ALTERNATIVNYJ.map: IBM866.map
 	     -e '/0xFA/ s/ .*/ 0x00B1/' \
 	     -e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@

-MIK.map: mapfiles/bulgarian-mik.txt.gz mapconv compact.awk
+MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '1,$$' CZYBORRA compact.awk > $@
+	@./mapconv $< '1,$$' CZYBORRA compact.awk > $@

-PTCP154.map: mapfiles/PTCP154.gz mapconv compact.awk
+PTCP154.map: mapfiles/PTCP154 mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^0x/' IANA compact.awk > $@
+	@./mapconv $< '/^0x/' IANA compact.awk > $@

-stdenc.map: mapfiles/stdenc.txt.gz mapconv compact.awk
+stdenc.map: mapfiles/stdenc.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
+	@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@

-symbol.map: mapfiles/symbol.txt.gz mapconv compact.awk
+symbol.map: mapfiles/symbol.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
+	@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@

-CP720.map: mapfiles/CP720.map.gz
+CP720.map: mapfiles/CP720.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@

-CP858.map: mapfiles/CP858.map.gz
+CP858.map: mapfiles/CP858.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@

 CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@

 GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@

 GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@

 GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x..\/x..[ 	]/' GLIBC-2 gb180302.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x..\/x..[ 	]/' GLIBC-2 gb180302.awk > $@

 GB180304.map: GB180302.map gb180304.awk
 	# Generating $@...
@@ -156,35 +157,39 @@ GB180304.map: GB180302.map gb180304.awk

 JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 compact.awk > $@
 	@echo "# Generated by hand" >> $@
 	@echo "0xA1-0xDF 0xFF61" >> $@

 JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
 	  | sed 's/0x2015/0x2014/' > $@

 JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@

-JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
+jisx2131-filter: mapfiles/JISX213A.map
+	@sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
+
+JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	  | sed -f jisx2131-filter \
 	  | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@

 JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
+	@./mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@

-JISX213A.map: mapfiles/JISX213A.map.gz
+JISX213A.map: mapfiles/JISX213A.map
 	# Generating $@
-	@zcat $< > $@
+	@cp $<  $@

-CP932-2BYTE.map: mapfiles/CP932.TXT.gz mapconv cp932.awk
+CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk
 	# Generating $@...
-	@mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
+	@./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@

 cp51932.el: CP932-2BYTE.map cp51932.awk
 	@$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@
@@ -192,17 +197,17 @@ cp51932.el: CP932-2BYTE.map cp51932.awk
 eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk
 	@zcat $< | $(AWK) -f eucjp-ms.awk > $@

-JISC6226.map : mapfiles/Uni2JIS.gz mapconv kuten.awk
+JISC6226.map : mapfiles/Uni2JIS mapconv kuten.awk
 	# Generating $@...
-	@mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@
+	@./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@

 KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@

 BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2 > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2 > $@

 BIG5-1.map: BIG5.map mapconv big5.awk
 	# Generating $@...
@@ -216,52 +221,52 @@ BIG5-2.map: BIG5.map mapconv big5.awk

 BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f].\//' GLIBC-2 compact.awk > $@

 JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@

 CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@

 # CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 # 	# Generating $@...
-# 	@mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
+# 	@./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@

-CNS-2.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@

-CNS-3.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@

-CNS-4.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@

-CNS-5.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@

-CNS-6.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@

-CNS-7.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@

 CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@

 # General target to produce map files for mule charsets.
-MULE-%.map: mapfiles/MULE-%.map.gz
+MULE-%.map: mapfiles/MULE-%.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@

 # General target to produce map files for ISO-8859, GEORGIAN, and
 # EBCDIC charsets.  We can not use the original file name because of
@@ -269,21 +274,21 @@ MULE-%.map: mapfiles/MULE-%.map.gz

 8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@

 KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@

 EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@

 # General target to produce map files for single-byte charsets.

 %.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@

 install:
 	@for f in ${CHARSETS}; do \
@@ -305,5 +310,5 @@ install:

 # Clear files that are automatically generated.
 clean:
-	rm -f ${CHARSETS} ${TRANS_TABLE}
+	rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT}

--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -74,19 +74,30 @@ function index_to_gb(idx) {

 {
  gb = gb_to_index(decode_hex(substr($1, 3, 4)));
-  unicode = decode_hex(substr($2, 3, 4));
+  unicode = decode_hex(substr($2, 3));
  if ((gb == to_gb + 1) && (unicode == to_unicode + 1))
    {
      to_gb++;
      to_unicode++;
    }
-  else
+  else if (gb > to_gb) # ignore the case gb == to_gb that is a duplication
    {
      if (from_gb == to_gb)
-	printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
+        {
+	  if (from_unicode <= 65535)
+	    printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
+	  else
+	    printf "0x%04X 0x%08X\n", index_to_gb(from_gb), from_unicode;
+	}
      else if (from_gb < to_gb)
-	printf "0x%04X-0x%04X 0x%04X\n",
-	  index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+        {
+	  if (from_unicode <= 65535)
+	    printf "0x%04X-0x%04X 0x%04X\n",
+		index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+	  else
+	    printf "0x%04X-0x%04X 0x%08X\n",
+		index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+	}
      from_gb = to_gb = gb;
      from_unicode = to_unicode = unicode;
    }

--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -98,18 +98,17 @@ elif [ "$3" = "GLIBC-2-7" ] ; then
 	| sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
 	      -e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
 	      -e 's,<U\([^>]*\)>[ 	]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
-	| tee temp \
 	| sort | ${AWKPROG}
 elif [ "$3" = "CZYBORRA" ] ; then
    # Source format is:
    #   =XX	U+YYYY
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "IANA" ] ; then
    # Source format is:
    #   0xXX	0xYYYY
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "UNICODE" ] ; then
@@ -117,25 +116,25 @@ elif [ "$3" = "UNICODE" ] ; then
    #   YYYY	XX
    # We perform reverse sort to prefer the first one in the
    # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
 	| sort -r
 elif [ "$3" = "UNICODE2" ] ; then
    # Source format is:
    #   0xXXXX	0xYYYY	# ...
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
 	| ${AWKPROG} | sort -n -k 4,4
 elif [ "$3" = "YASUOKA" ] ; then
    # Source format is:
    # YYYY	0-XXXX (XXXX is a Kuten code)
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "KANJI-DATABASE" ] ; then
    # Source format is:
    # C?-XXXX U+YYYYY .....
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
 	| sort | ${AWKPROG}
 else

--- a/admin/charsets/mapfiles/MULE-ethiopic.map
+++ b/admin/charsets/mapfiles/MULE-ethiopic.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2121 0x1200
 0x2122 0x1201
 0x2123 0x1202

--- a/admin/charsets/mapfiles/MULE-ipa.map
+++ b/admin/charsets/mapfiles/MULE-ipa.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x20 0x0069
 0x21 0x026A
 0x22 0x0065

--- a/admin/charsets/mapfiles/MULE-is13194.map
+++ b/admin/charsets/mapfiles/MULE-is13194.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0901
 0x22 0x0902
 0x23 0x0903

--- a/admin/charsets/mapfiles/MULE-lviscii.map
+++ b/admin/charsets/mapfiles/MULE-lviscii.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAF
 0x22 0x1EB1
 0x23 0x1EB7

--- a/admin/charsets/mapfiles/MULE-sisheng.map
+++ b/admin/charsets/mapfiles/MULE-sisheng.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0101
 0x22 0x00E1
 0x23 0x01CE

--- a/admin/charsets/mapfiles/MULE-tibetan.map
+++ b/admin/charsets/mapfiles/MULE-tibetan.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2130 0x0F00
 0x2131 0x0F01
 0x2132 0x0F02

--- a/admin/charsets/mapfiles/MULE-uviscii.map
+++ b/admin/charsets/mapfiles/MULE-uviscii.map
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAE
 0x22 0x1EB0
 0x23 0x1EB6

--- a/etc/ChangeLog
+++ b/etc/ChangeLog
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+	* charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,
+	charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map,
+	charsets/CP932-2BYTE.map, charsets/GB180302.map,
+	charsets/GB180304.map, charsets/JISC6226.map,
+	charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map,
+	charsets/stdenc.map, charsets/symbol.map: Re-generated.
+
 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>

 	* NEWS (NextStep/OSX port changes): OSX 10.4 or newer is required.

--- a/etc/charsets/CNS-2.map
+++ b/etc/charsets/CNS-2.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x4E42
 0x2122 0x4E5C

--- a/etc/charsets/CNS-3.map
+++ b/etc/charsets/CNS-3.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x4E28
 0x2122 0x4E36

--- a/etc/charsets/CNS-4.map
+++ b/etc/charsets/CNS-4.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x20086
 0x2122-0x2123 0x4E40

--- a/etc/charsets/CNS-5.map
+++ b/etc/charsets/CNS-5.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x200D1
 0x2122 0x200CB

--- a/etc/charsets/CNS-6.map
+++ b/etc/charsets/CNS-6.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x2F802
 0x2122 0x20062

--- a/etc/charsets/CNS-7.map
+++ b/etc/charsets/CNS-7.map
-# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
 # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x20055
 0x2122 0x20182

--- a/etc/charsets/CP932-2BYTE.map
+++ b/etc/charsets/CP932-2BYTE.map
-# Generated from admin/charsets/mapfiles/CP932.TXT.gz which is a copy of
+# Generated from admin/charsets/mapfiles/CP932.TXT which is a copy of
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
 0x8140 0x3000 # 0 2121
 0x8141 0x3001 # 0 2122

--- a/etc/charsets/GB180302.map
+++ b/etc/charsets/GB180302.map
@@ -2048,20 +2048,17 @@
 0xA6B9-0xA6C0 0xE785
 0xA6C1-0xA6D1 0x03B1
 0xA6D2-0xA6D8 0x03C3
-0xA6D9 0xFE10
-0xA6DA 0xFE12
-0xA6DB 0xFE11
-0xA6DC-0xA6DF 0xFE13
+0xA6D9-0xA6DF 0xE78D
 0xA6E0-0xA6E1 0xFE35
 0xA6E2-0xA6E3 0xFE39
 0xA6E4-0xA6E5 0xFE3F
 0xA6E6-0xA6E7 0xFE3D
 0xA6E8-0xA6EB 0xFE41
-0xA6EC-0xA6ED 0xFE17
+0xA6EC-0xA6ED 0xE794
 0xA6EE-0xA6EF 0xFE3B
 0xA6F0-0xA6F1 0xFE37
 0xA6F2 0xFE31
-0xA6F3 0xFE19
+0xA6F3 0xE796
 0xA6F4-0xA6F5 0xFE33
 0xA6F6-0xA6FE 0xE797
 0xA740-0xA77E 0xE706
@@ -10396,7 +10393,7 @@
 0xFE56 0x3447
 0xFE57 0x2E88
 0xFE58 0x2E8B
-0xFE59 0x9FB4
+0xFE59 0xE81E
 0xFE5A 0x359E
 0xFE5B 0x361A
 0xFE5C 0x360E
@@ -10404,18 +10401,18 @@
 0xFE5E 0x2E97
 0xFE5F 0x396E
 0xFE60 0x3918
-0xFE61 0x9FB5
+0xFE61 0xE826
 0xFE62 0x39CF
 0xFE63 0x39DF
 0xFE64 0x3A73
 0xFE65 0x39D0
-0xFE66-0xFE67 0x9FB6
+0xFE66-0xFE67 0xE82B
 0xFE68 0x3B4E
 0xFE69 0x3C6E
 0xFE6A 0x3CE0
 0xFE6B 0x2EA7
 0xFE6C 0x000215D7
-0xFE6D 0x9FB8
+0xFE6D 0xE832
 0xFE6E 0x2EAA
 0xFE6F 0x4056
 0xFE70 0x415F
@@ -10431,7 +10428,7 @@
 0xFE7B 0x44D6
 0xFE7C 0x4661
 0xFE7D 0x464C
-0xFE7E 0x9FB9
+0xFE7E 0xE843
 0xFE80 0x4723
 0xFE81 0x4729
 0xFE82 0x477C
@@ -10446,7 +10443,7 @@
 0xFE8D 0x499B
 0xFE8E 0x49B7
 0xFE8F 0x49B6
-0xFE90 0x9FBA
+0xFE90 0xE854
 0xFE91 0x000241FE
 0xFE92 0x4CA3
 0xFE93-0xFE95 0x4C9F
@@ -10454,5 +10451,5 @@
 0xFE97 0x4CA2
 0xFE98-0xFE9E 0x4D13
 0xFE9F 0x4DAE
-0xFEA0 0x9FBB
+0xFEA0 0xE864
 0xFEA1-0xFEFE 0xE468
--- a/etc/charsets/GB180304.map
+++ b/etc/charsets/GB180304.map
@@ -41,171 +41,166 @@
 0x8130D135-0x8130D238	0x0402
 0x8130D239		0x0450
 0x8130D330-0x8135F436	0x0452
-0x8135F438-0x8136A531	0x1E40
-0x8136A532-0x8136A533	0x2011
-0x8136A534		0x2017
-0x8136A535-0x8136A536	0x201A
-0x8136A537-0x8136A633	0x201E
-0x8136A634-0x8136A732	0x2027
-0x8136A733		0x2031
-0x8136A734		0x2034
-0x8136A735-0x8136A739	0x2036
-0x8136A830-0x8136B331	0x203C
-0x8136B332-0x8136BB37	0x20AD
-0x8136BB38		0x2104
-0x8136BB39-0x8136BC31	0x2106
-0x8136BC32-0x8136BD33	0x210A
-0x8136BD34-0x8136BE33	0x2117
-0x8136BE34-0x8136C435	0x2122
-0x8136C436-0x8136C439	0x216C
-0x8136C530-0x8136C731	0x217A
-0x8136C732-0x8136C733	0x2194
-0x8136C734-0x8136D233	0x219A
-0x8136D234-0x8136D239	0x2209
-0x8136D330		0x2210
-0x8136D331-0x8136D333	0x2212
-0x8136D334-0x8136D337	0x2216
-0x8136D338-0x8136D339	0x221B
-0x8136D430-0x8136D431	0x2221
-0x8136D432		0x2224
-0x8136D433		0x2226
-0x8136D434-0x8136D435	0x222C
-0x8136D436-0x8136D530	0x222F
-0x8136D531-0x8136D535	0x2238
-0x8136D536-0x8136D635	0x223E
-0x8136D636-0x8136D638	0x2249
-0x8136D639-0x8136D733	0x224D
-0x8136D734-0x8136D836	0x2253
-0x8136D837-0x8136D838	0x2262
-0x8136D839-0x8136D934	0x2268
-0x8136D935-0x8136DD31	0x2270
-0x8136DD32-0x8136DD34	0x2296
-0x8136DD35-0x8136DE35	0x229A
-0x8136DE36-0x8136E130	0x22A6
-0x8136E131-0x8136E932	0x22C0
-0x8136E933-0x81378C35	0x2313
-0x81378C36-0x81378D35	0x246A
-0x81378D36-0x81379735	0x249C
-0x81379736-0x81379739	0x254C
-0x81379830-0x81379932	0x2574
-0x81379933-0x81379935	0x2590
-0x81379936-0x81379A35	0x2596
-0x81379A36-0x81379C31	0x25A2
-0x81379C32-0x81379C39	0x25B4
-0x81379D30-0x81379D37	0x25BE
-0x81379D38-0x81379E30	0x25C8
-0x81379E31-0x81379E32	0x25CC
-0x81379E33-0x8137A030	0x25D0
-0x8137A031-0x8137A331	0x25E6
-0x8137A332-0x8137A333	0x2607