[Emacs-diffs] emacs/admin/charsets mapconv [EMACS_23_1_RC]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Kenichi Handa <handa>   09/06/25 00:33:45

Modified files:
        admin/charsets : mapconv 

Log message:
        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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/admin/charsets/mapconv?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.6&r2=1.6.2.1

Patches:
Index: mapconv
===================================================================
RCS file: /cvsroot/emacs/emacs/admin/charsets/mapconv,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- mapconv     12 Jun 2009 07:22:48 -0000      1.6
+++ mapconv     25 Jun 2009 00:33:45 -0000      1.6.2.1
@@ -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" = "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  # ...