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

diff --git a/ChangeLog b/ChangeLog
index 1a7b9f618283f25dc92c2a76ed5390997e75c218..50450bbc5069d96c745821121d98350a265259f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7d4921887cea7ab13cdbee98399721215a94b5e1..ef8ff5ce65ce8aca17026cd683ee62cad7efbe0d 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,27 @@
+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.

diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index b16e7ccd7483dd3a157605d9a14f7289660aded5..91f541979da970ddf5855b6f2c0e0c11f9dbd04f 100644 (file)
--- 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}
 

diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 6cd9521ce90c9c6936250ea0f13eea991811ded8..40d92bf9be45adc675541621209f0816665494d8 100644 (file)
--- 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;
     }

diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 4f7a8b96f5466e4c70de46d171cc706844eb07ec..8433d222b8db43adaaa369fac69b26bfbfe8d1d6 100755 (executable)
--- 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

diff --git a/admin/charsets/mapfiles/MULE-ethiopic.map b/admin/charsets/mapfiles/MULE-ethiopic.map
index d2720bd10ba389a6216c597ecf39e6d22842fa8f..30cf5736763a8c33e39911ead4716f24bff75c2b 100644 (file)
--- a/admin/charsets/mapfiles/MULE-ethiopic.map
+++ b/admin/charsets/mapfiles/MULE-ethiopic.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-ipa.map b/admin/charsets/mapfiles/MULE-ipa.map
index 35e5d50ecec1e9e8d646d69f8a8528aedc015075..0a6c61d5a95481d49558e85490570fdeeb908f8e 100644 (file)
--- a/admin/charsets/mapfiles/MULE-ipa.map
+++ b/admin/charsets/mapfiles/MULE-ipa.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-is13194.map b/admin/charsets/mapfiles/MULE-is13194.map
index 1fa9b21dcf8cb28d5019a663d97b4f46edccf9c9..390132cd37517a3aa1a17a0ff50886977f7a7797 100644 (file)
--- a/admin/charsets/mapfiles/MULE-is13194.map
+++ b/admin/charsets/mapfiles/MULE-is13194.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-lviscii.map b/admin/charsets/mapfiles/MULE-lviscii.map
index 3b6a38be6169eec5f54ff36fe543a34716131872..e4d2eca90ac9b44285b9a8fb802154cacb930541 100644 (file)
--- a/admin/charsets/mapfiles/MULE-lviscii.map
+++ b/admin/charsets/mapfiles/MULE-lviscii.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-sisheng.map b/admin/charsets/mapfiles/MULE-sisheng.map
index 405bb1ffa2c127f9c257a1689fad88973b5f523f..144a3ff51347e4408e4fdb4c8eec98b7e9f1902b 100644 (file)
--- a/admin/charsets/mapfiles/MULE-sisheng.map
+++ b/admin/charsets/mapfiles/MULE-sisheng.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-tibetan.map b/admin/charsets/mapfiles/MULE-tibetan.map
index 0d6ff3a0a39f55fa14632d27f2dae2fd2019bc7a..b885585c094100ea21124156d70175565e2912e3 100644 (file)
--- a/admin/charsets/mapfiles/MULE-tibetan.map
+++ b/admin/charsets/mapfiles/MULE-tibetan.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/admin/charsets/mapfiles/MULE-uviscii.map b/admin/charsets/mapfiles/MULE-uviscii.map
index 65e5d2968e576182e04ed1b62044828f3248cdd3..dc19583bdfe72e7ab2b77d2df1efc62b085ea07d 100644 (file)
--- a/admin/charsets/mapfiles/MULE-uviscii.map
+++ b/admin/charsets/mapfiles/MULE-uviscii.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 001bfe271af53c0264a0cbc2d3c61f32e5d33eee..2bfae3696c528863d7ff6743de0bf6243c697d0d 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/etc/charsets/CNS-2.map b/etc/charsets/CNS-2.map
index 7fdd4ae04980ef863dfc5b40f8e04fdc5544bf4d..1285859a36decf07618c09b12169aa9fb3f45cd8 100644 (file)
--- a/etc/charsets/CNS-2.map
+++ b/etc/charsets/CNS-2.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CNS-3.map b/etc/charsets/CNS-3.map
index f1542f9da9138315ea3ced95337ef3f017d56118..d7306a9d81fd15f621f9ef40d1e9e614e25aca87 100644 (file)
--- a/etc/charsets/CNS-3.map
+++ b/etc/charsets/CNS-3.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CNS-4.map b/etc/charsets/CNS-4.map
index 8f9f2333c958e926c5677d655a5eb4336f5e343f..ba4f0e7a1fb2cc0f7ba96a33733a3d16c1c1a74e 100644 (file)
--- a/etc/charsets/CNS-4.map
+++ b/etc/charsets/CNS-4.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CNS-5.map b/etc/charsets/CNS-5.map
index c893f164961bf39440ad2c8c06119d19286339bd..bf6bb9d4653d949a3aad18061a159b25d72a3246 100644 (file)
--- a/etc/charsets/CNS-5.map
+++ b/etc/charsets/CNS-5.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CNS-6.map b/etc/charsets/CNS-6.map
index 90c048035c0efa8b676eb137cd9218267bfedde1..348416c1c1e38224f94e47e167351dda9f903b48 100644 (file)
--- a/etc/charsets/CNS-6.map
+++ b/etc/charsets/CNS-6.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CNS-7.map b/etc/charsets/CNS-7.map
index 96c1ad0efed32e22a6350f13d8407ff32c078c0f..5a621737444ad4409e960ac401b81a5f873245d6 100644 (file)
--- a/etc/charsets/CNS-7.map
+++ b/etc/charsets/CNS-7.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/CP932-2BYTE.map b/etc/charsets/CP932-2BYTE.map
index 045fdc98659c52c8e2c24ac2258e8ff9bad82155..d31770892a6965b0baa48b5e379f718857ce2f8d 100644 (file)
--- a/etc/charsets/CP932-2BYTE.map
+++ b/etc/charsets/CP932-2BYTE.map
@@ -1,4 +1,4 @@
-# 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

diff --git a/etc/charsets/GB180302.map b/etc/charsets/GB180302.map
index ee7e0ecd42eaf6a1f6e7887bc868143130d3d2d2..4fe8e530a2bcedf2fa0b89c16510aa06acba748b 100644 (file)
--- 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

diff --git a/etc/charsets/GB180304.map b/etc/charsets/GB180304.map
index 31352e266c851981946d32274bd2342bd0c922c3..042c7514fabcf1c66a3de7f35c8cd7026171c0b2 100644 (file)
--- 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
-0x8137A334-0x8137A837  0x260A
-0x8137A838             0x2641
-0x8137A839-0x8138FD38  0x2643
-0x8138FD39-0x8138FE30  0x2E82
-0x8138FE31-0x8138FE33  0x2E85
-0x8138FE34-0x8138FE35  0x2E89
-0x8138FE36-0x81398135  0x2E8D
-0x81398136-0x81398330  0x2E98
-0x81398331-0x81398332  0x2EA8
-0x81398333-0x81398335  0x2EAB
-0x81398336-0x81398339  0x2EAF
-0x81398430-0x81398431  0x2EB4
-0x81398432-0x81398434  0x2EB8
-0x81398435-0x81398538  0x2EBC
-0x81398539-0x8139A331  0x2ECB
-0x8139A332-0x8139A335  0x2FFC
-0x8139A336             0x3004
-0x8139A337-0x8139A431  0x3018
-0x8139A432-0x8139A433  0x301F
-0x8139A434-0x8139A633  0x302A
-0x8139A634-0x8139A635  0x303F
-0x8139A636-0x8139A732  0x3094
-0x8139A733-0x8139A734  0x309F
-0x8139A735-0x8139A739  0x30F7
-0x8139A830-0x8139A835  0x30FF
-0x8139A836-0x8139C131  0x312A
-0x8139C132-0x8139C138  0x322A
-0x8139C139-0x8139CD31  0x3232
-0x8139CD32-0x8139E435  0x32A4
-0x8139E436-0x8139E537  0x3390
-0x8139E538-0x8139E539  0x339F
-0x8139E630-0x8139E933  0x33A2
-0x8139E934-0x8139EA32  0x33C5
-0x8139EA33-0x8139EA34  0x33CF
-0x8139EA35-0x8139EA36  0x33D3
-0x8139EA37-0x8139F539  0x33D6
-0x8139F630-0x8139FA32  0x3448
-0x8139FA33-0x82309A30  0x3474
-0x82309A31-0x8230A531  0x359F
-0x8230A532-0x8230A632  0x360F
-0x8230A633-0x8230F237  0x361B
-0x8230F238-0x8230FB32  0x3919
-0x8230FB33-0x82318638  0x396F
-0x82318639-0x82318832  0x39D1
-0x82318833-0x82319639  0x39E0
-0x82319730-0x8231AC37  0x3A74
-0x8231AC38-0x8231C934  0x3B4F
-0x8231C935-0x8231D437  0x3C6F
-0x8231D438-0x8232AF32  0x3CE1
-0x8232AF33-0x8232C936  0x4057
-0x8232C937-0x8232F837  0x4160
-0x8232F838-0x82338633  0x4338
-0x82338634-0x82338637  0x43AD
-0x82338638-0x82338B30  0x43B2
-0x82338B31-0x8233A338  0x43DE
-0x8233A339-0x8233C931  0x44D7
-0x8233C932-0x8233CB31  0x464D
-0x8233CB32-0x8233DE34  0x4662
-0x8233DE35-0x8233DE39  0x4724
-0x8233DF30-0x8233E731  0x472A
-0x8233E732-0x8233E837  0x477D
-0x8233E838-0x82349638  0x478E
-0x82349639-0x82349B38  0x4948
-0x82349B39-0x82349C30  0x497B
-0x82349C31-0x82349C34  0x497E
-0x82349C35             0x4984
-0x82349C36-0x82349E35  0x4987
-0x82349E36-0x82349E38  0x499C
-0x82349E39-0x8234A130  0x49A0
-0x8234A131-0x8234E733  0x49B8
-0x8234E734-0x8234EB32  0x4C78
-0x8234EB33-0x8234F633  0x4CA4
-0x8234F634-0x82358731  0x4D1A
-0x82358732-0x82358F32  0x4DAF
-0x82358F33-0x82359036  0x9FA6
-0x82359135-0x8336C738  0x9FBC
-0x8336C739             0xE76C
-0x8135F437             0xE7C7
-0x8336C830             0xE7C8
+0x8135F437-0x8136A530  0x1E40
+0x8136A531-0x8136A532  0x2011
+0x8136A533             0x2017
+0x8136A534-0x8136A535  0x201A
+0x8136A536-0x8136A632  0x201E
+0x8136A633-0x8136A731  0x2027
+0x8136A732             0x2031
+0x8136A733             0x2034
+0x8136A734-0x8136A738  0x2036
+0x8136A739-0x8136B330  0x203C
+0x8136B331-0x8136BB36  0x20AD
+0x8136BB37             0x2104
+0x8136BB38-0x8136BC30  0x2106
+0x8136BC31-0x8136BD32  0x210A
+0x8136BD33-0x8136BE32  0x2117
+0x8136BE33-0x8136C434  0x2122
+0x8136C435-0x8136C438  0x216C
+0x8136C439-0x8136C730  0x217A
+0x8136C731-0x8136C732  0x2194
+0x8136C733-0x8136D232  0x219A
+0x8136D233-0x8136D238  0x2209
+0x8136D239             0x2210
+0x8136D330-0x8136D332  0x2212
+0x8136D333-0x8136D336  0x2216
+0x8136D337-0x8136D338  0x221B
+0x8136D339-0x8136D430  0x2221
+0x8136D431             0x2224
+0x8136D432             0x2226
+0x8136D433-0x8136D434  0x222C
+0x8136D435-0x8136D439  0x222F
+0x8136D530-0x8136D534  0x2238
+0x8136D535-0x8136D634  0x223E
+0x8136D635-0x8136D637  0x2249
+0x8136D638-0x8136D732  0x224D
+0x8136D733-0x8136D835  0x2253
+0x8136D836-0x8136D837  0x2262
+0x8136D838-0x8136D933  0x2268
+0x8136D934-0x8136DD30  0x2270
+0x8136DD31-0x8136DD33  0x2296
+0x8136DD34-0x8136DE34  0x229A
+0x8136DE35-0x8136E039  0x22A6
+0x8136E130-0x8136E931  0x22C0
+0x8136E932-0x81378C34  0x2313
+0x81378C35-0x81378D34  0x246A
+0x81378D35-0x81379734  0x249C
+0x81379735-0x81379738  0x254C
+0x81379739-0x81379931  0x2574
+0x81379932-0x81379934  0x2590
+0x81379935-0x81379A34  0x2596
+0x81379A35-0x81379C30  0x25A2
+0x81379C31-0x81379C38  0x25B4
+0x81379C39-0x81379D36  0x25BE
+0x81379D37-0x81379D39  0x25C8
+0x81379E30-0x81379E31  0x25CC
+0x81379E32-0x81379F39  0x25D0
+0x8137A030-0x8137A330  0x25E6
+0x8137A331-0x8137A332  0x2607
+0x8137A333-0x8137A836  0x260A
+0x8137A837             0x2641
+0x8137A838-0x8138FD37  0x2643
+0x8138FD38-0x8138FD39  0x2E82
+0x8138FE30-0x8138FE32  0x2E85
+0x8138FE33-0x8138FE34  0x2E89
+0x8138FE35-0x81398134  0x2E8D
+0x81398135-0x81398239  0x2E98
+0x81398330-0x81398331  0x2EA8
+0x81398332-0x81398334  0x2EAB
+0x81398335-0x81398338  0x2EAF
+0x81398339-0x81398430  0x2EB4
+0x81398431-0x81398433  0x2EB8
+0x81398434-0x81398537  0x2EBC
+0x81398538-0x8139A330  0x2ECB
+0x8139A331-0x8139A334  0x2FFC
+0x8139A335             0x3004
+0x8139A336-0x8139A430  0x3018
+0x8139A431-0x8139A432  0x301F
+0x8139A433-0x8139A632  0x302A
+0x8139A633-0x8139A634  0x303F
+0x8139A635-0x8139A731  0x3094
+0x8139A732-0x8139A733  0x309F
+0x8139A734-0x8139A738  0x30F7
+0x8139A739-0x8139A834  0x30FF
+0x8139A835-0x8139C130  0x312A
+0x8139C131-0x8139C137  0x322A
+0x8139C138-0x8139CD30  0x3232
+0x8139CD31-0x8139E434  0x32A4
+0x8139E435-0x8139E536  0x3390
+0x8139E537-0x8139E538  0x339F
+0x8139E539-0x8139E932  0x33A2
+0x8139E933-0x8139EA31  0x33C5
+0x8139EA32-0x8139EA33  0x33CF
+0x8139EA34-0x8139EA35  0x33D3
+0x8139EA36-0x8139F538  0x33D6
+0x8139F539-0x8139FA31  0x3448
+0x8139FA32-0x82309939  0x3474
+0x82309A30-0x8230A530  0x359F
+0x8230A531-0x8230A631  0x360F
+0x8230A632-0x8230F236  0x361B
+0x8230F237-0x8230FB31  0x3919
+0x8230FB32-0x82318637  0x396F
+0x82318638-0x82318831  0x39D1
+0x82318832-0x82319638  0x39E0
+0x82319639-0x8231AC36  0x3A74
+0x8231AC37-0x8231C933  0x3B4F
+0x8231C934-0x8231D436  0x3C6F
+0x8231D437-0x8232AF31  0x3CE1
+0x8232AF32-0x8232C935  0x4057
+0x8232C936-0x8232F836  0x4160
+0x8232F837-0x82338632  0x4338
+0x82338633-0x82338636  0x43AD
+0x82338637-0x82338A39  0x43B2
+0x82338B30-0x8233A337  0x43DE
+0x8233A338-0x8233C930  0x44D7
+0x8233C931-0x8233CB30  0x464D
+0x8233CB31-0x8233DE33  0x4662
+0x8233DE34-0x8233DE38  0x4724
+0x8233DE39-0x8233E730  0x472A
+0x8233E731-0x8233E836  0x477D
+0x8233E837-0x82349637  0x478E
+0x82349638-0x82349B37  0x4948
+0x82349B38-0x82349B39  0x497B
+0x82349C30-0x82349C33  0x497E
+0x82349C34             0x4984
+0x82349C35-0x82349E34  0x4987
+0x82349E35-0x82349E37  0x499C
+0x82349E38-0x8234A039  0x49A0
+0x8234A130-0x8234E732  0x49B8
+0x8234E733-0x8234EB31  0x4C78
+0x8234EB32-0x8234F632  0x4CA4
+0x8234F633-0x82358730  0x4D1A
+0x82358731-0x82358F31  0x4DAF
+0x82358F32-0x8336C737  0x9FA6
+0x8336C738             0xE76C
+0x8336C739-0x8336C830  0xE7C7
 0x8336C831-0x8336C933  0xE7E7
-0x8336C934             0xE815
-0x8336C935-0x8336C939  0xE819
-0x8336CA30-0x8336CA36  0xE81F
-0x8336CA37-0x8336CB30  0xE827
-0x8336CB31-0x8336CB34  0xE82D
-0x8336CB35-0x8336CC32  0xE833
-0x8336CC33-0x8336CC39  0xE83C
-0x8336CD30-0x8336CE35  0xE844
-0x8336CE36-0x8336CF39  0xE856
-0x8336D030-0x84308534  0xE865
-0x84308535-0x84308D30  0xF92D
-0x84308D31-0x84308F37  0xF97A
-0x84308F38-0x84309738  0xF996
-0x84309739-0x84309837  0xF9E8
-0x84309838-0x84309B33  0xF9F2
-0x84309B34             0xFA10
-0x84309B35             0xFA12
-0x84309B36-0x84309B38  0xFA15
-0x84309B39-0x84309C34  0xFA19
-0x84309C35             0xFA22
-0x84309C36-0x84309C37  0xFA25
-0x84309C38-0x84318235  0xFA2A
-0x84318336-0x84318537  0xFE1A
-0x84318538             0xFE32
-0x84318539-0x84318632  0xFE45
-0x84318633             0xFE53
-0x84318634             0xFE58
-0x84318635             0xFE67
-0x84318636-0x84319534  0xFE6C
-0x84319535-0x8431A233  0xFF5F
-0x8431A234-0x8431A439  0xFFE6
+0x8336C934-0x8336CA32  0xE815
+0x8336CA33-0x8336CA39  0xE81F
+0x8336CB30-0x8336CB33  0xE827
+0x8336CB34-0x8336CB38  0xE82D
+0x8336CB39-0x8336CD34  0xE833
+0x8336CD35-0x8336CF30  0xE844
+0x8336CF31-0x8336D035  0xE855
+0x8336D036-0x84308630  0xE865
+0x84308631-0x84308D36  0xF92D
+0x84308D37-0x84309033  0xF97A
+0x84309034-0x84309834  0xF996
+0x84309835-0x84309933  0xF9E8
+0x84309934-0x84309B39  0xF9F2
+0x84309C30             0xFA10
+0x84309C31             0xFA12
+0x84309C32-0x84309C34  0xFA15
+0x84309C35-0x84309D30  0xFA19
+0x84309D31             0xFA22
+0x84309D32-0x84309D33  0xFA25
+0x84309D34-0x84318633  0xFA2A
+0x84318634             0xFE32
+0x84318635-0x84318638  0xFE45
+0x84318639             0xFE53
+0x84318730             0xFE58
+0x84318731             0xFE67
+0x84318732-0x84319630  0xFE6C
+0x84319631-0x8431A239  0xFF5F
+0x8431A330-0x8431A535  0xFFE6

diff --git a/etc/charsets/JISC6226.map b/etc/charsets/JISC6226.map
index 97d24651628e4aae6dbee0a82169c471118efc67..cba6df50b7519afe0e302995e91438a5b9005f8f 100644 (file)
--- a/etc/charsets/JISC6226.map
+++ b/etc/charsets/JISC6226.map
@@ -1,4 +1,4 @@
-# Generated from admin/charsets/mapfiles/Uni2JIS.gz which is a copy of
+# Generated from admin/charsets/mapfiles/Uni2JIS which is a copy of
 # http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z
 0x2121 0x3000
 0x2122 0x3001

diff --git a/etc/charsets/JISX2131.map b/etc/charsets/JISX2131.map
index 5d62e99650b86a61a3eff95d9beb24aa7b413da3..5219a0ef1efd3d25bb9234b792570a36680ce79d 100644 (file)
--- a/etc/charsets/JISX2131.map
+++ b/etc/charsets/JISX2131.map
@@ -1157,7 +1157,6 @@
 0x2d79 0x22BF
 0x2d7d 0x2756
 0x2d7e 0x261E
-0x2e21 0x4FF1
 0x2e22 0x0002000B
 0x2e23 0x3402
 0x2e24 0x4E28
@@ -1344,7 +1343,6 @@
 0x2f7b 0x000218BD
 0x2f7c 0x5B19
 0x2f7d 0x5B25
-0x2f7e 0x525D
 0x3021 0x4E9C
 0x3022 0x5516
 0x3023 0x5A03
@@ -4310,7 +4308,6 @@
 0x4f51 0x6E7E
 0x4f52 0x7897
 0x4f53 0x8155
-0x4f54 0x00020B9F
 0x4f55 0x5B41
 0x4f56 0x5B56
 0x4f57 0x5B7D
@@ -4352,7 +4349,6 @@
 0x4f7b 0x5DA7
 0x4f7c 0x5DB8
 0x4f7d 0x5DCB
-0x4f7e 0x541E
 0x5021 0x5F0C
 0x5022 0x4E10
 0x5023 0x4E15
@@ -7743,7 +7739,6 @@
 0x7424 0x7464
 0x7425 0x51DC
 0x7426 0x7199
-0x7427 0x5653
 0x7428 0x5DE2
 0x7429 0x5E14
 0x742a 0x5E18
@@ -8766,8 +8761,3 @@
 0x7e77 0x9F94
 0x7e78 0x9F97
 0x7e79 0x9FA2
-0x7e7a 0x59F8
-0x7e7b 0x5C5B
-0x7e7c 0x5E77
-0x7e7d 0x7626
-0x7e7e 0x7E6B

diff --git a/etc/charsets/MIK.map b/etc/charsets/MIK.map
index 5a1176f9f505042ce202482a01a4dadc617b8f80..3bf3d0eb3041c1935c2598da2c767628b294a5e3 100644 (file)
--- a/etc/charsets/MIK.map
+++ b/etc/charsets/MIK.map
@@ -1,4 +1,4 @@
-# Generated from admin/charsets/mapfiles/bulgarian-mik.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/bulgarian-mik.txt which is a copy of
 # http://czyborra.com/charsets/bulgarian-mik.txt.gz
 0x20-0x7E 0x0020
 0x80-0xBF 0x0410

diff --git a/etc/charsets/PTCP154.map b/etc/charsets/PTCP154.map
index 72c6b3484d41caa1ef2b3a2be4c919c33c89993d..c4aa33ac2385115f77b63193222232bed3659c11 100644 (file)
--- a/etc/charsets/PTCP154.map
+++ b/etc/charsets/PTCP154.map
@@ -1,4 +1,4 @@
-# Generated from admin/charsets/mapfiles/PTCP154.gz which is a copy of
+# Generated from admin/charsets/mapfiles/PTCP154 which is a copy of
 # http://www.iana.org/assignments/charset-reg/PTCP154
 0x00-0x7F 0x0000
 0x80 0x0496

diff --git a/etc/charsets/stdenc.map b/etc/charsets/stdenc.map
index ab23002b15503b1a62e528ab6d3db517fa8e63f5..08985141ed2d42ca154f6ce44edd716510810279 100644 (file)
--- a/etc/charsets/stdenc.map
+++ b/etc/charsets/stdenc.map
@@ -1,4 +1,4 @@
-# Generated from admin/charsets/mapfiles/stdenc.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/stdenc.txt which is a copy of
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt
 0xFB 0x00DF
 0xFA 0x0153

diff --git a/etc/charsets/symbol.map b/etc/charsets/symbol.map
index 95dd2b65eead830774a799cd90e2ade436ec0236..8404bd407badd0b8870194464215e4c6e0bf647e 100644 (file)
--- a/etc/charsets/symbol.map
+++ b/etc/charsets/symbol.map
@@ -1,4 +1,4 @@
-# Generated from admin/charsets/mapfiles/symbol.txt.gz which is a copy of
+# Generated from admin/charsets/mapfiles/symbol.txt which is a copy of
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt
 0xFE 0xF8FE
 0xFD 0xF8FD

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2cc65a0ca38fcc7c7099590b1138e9089d3e5e4..8c83912e96d517f67e28994ffc80b52fb6effc3e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+       * international/eucjp-ms.el: Re-generated.
+
 2012-10-07  Kenichi Handa  <handa@gnu.org>
 
        * international/mule-conf.el (compound-text-with-extensions): Add

diff --git a/lisp/international/eucjp-ms.el b/lisp/international/eucjp-ms.el
index a16848a0c7c87886d5cb27076fff7d8e407b6f7f..6e4e1e798b0f85f741dee5579d16fe8dd4965403 100644 (file)
--- a/lisp/international/eucjp-ms.el
+++ b/lisp/international/eucjp-ms.el
@@ -2085,4 +2085,3 @@
              (setcar x (cdr x)) (setcdr x tmp)))
        map)
   (define-translation-table 'eucjp-ms-encode map))
-