Handle UNICODE2.

1 files changed, 8 insertions, 0 deletions

diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index f686ea3799c..e8892607380 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -45,6 +45,8 @@ case "$3" in
         SOURCE="http://www.iana.org/assignments/charset-reg/${BASE}";;
     UNICODE)
         SOURCE="http://www.unicode.org/Public/MAPPINGS/.../${BASE}";;
+    UNICODE2)
+        SOURCE="http://www.unicode.org/Public/MAPPINGS/.../${BASE}";;
     YASUOKA)
         SOURCE="http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/.../${BASE}";;
     MICROSOFT)
@@ -107,6 +109,12 @@ elif [ "$3" == "UNICODE" ] ; then
     sed -n -e "$2 p" < $1 \
         | sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
         | sort | ${AWKPROG}
+elif [ "$3" == "UNICODE2" ] ; then
+    # Source format is:
+    #   0xXXXX  0xYYYY  # ...
+    sed -n -e "$2 p" < $1 \
+        | sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
+        | sort | ${AWKPROG}
 elif [ "$3" == "YASUOKA" ] ; then
     # Source format is:
     # YYYY      0-XXXX (XXXX is a Kuten code)