For the UNICODE format files, do reverse sort

and don't compact the map.  This is to prefer the first one in the
duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0ceb348825c9a38b43337f94eb7f10fc1112c10f..88aac773bc9de9b28f3e0f476dac2296942b971c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-24  Kenichi Handa  <handa@m17n.org>
+
+       * charsets/mapconv: For the UNICODE format files, do reverse sort
+       and don't compact the map.  This is to prefer the first one in the
+       duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
+
 2009-06-12  Kenichi Handa  <handa@m17n.org>
 
        * charsets/Makefile (JISX213A.map): Make it depend on

diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 1913449f898ba86591932c738e701d6d2ff3ca34..64c0772af52a46599749e5e3bb57e566a52e87b8 100755 (executable)
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -30,7 +30,7 @@
 #   $1: source map file
 #   $2: address pattern for sed (optionally with substitution command)
 #   $3: format of source map file
-#      GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE YASUOKA
+#      GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE UNICODE2 YASUOKA
 #   $4: awk script
 
 FILE="admin/charsets/$1"
@@ -115,9 +115,11 @@ elif [ "$3" = "IANA" ] ; then
 elif [ "$3" = "UNICODE" ] ; then
     # Source format is:
     #   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 -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
-       | sort | ${AWKPROG}
+       | sort -r
 elif [ "$3" = "UNICODE2" ] ; then
     # Source format is:
     #   0xXXXX 0xYYYY  # ...