(JSP-3042): Unify HD-JB1634.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 5395803..1b30ec1 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010, 2011 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -156,31 +156,44 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
-    =ucs@iso
-    =ucs@unicode
-    =>>ucs@unicode
-    =>>gt
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
     =>>jis-x0213-1@2004
     =>>jis-x0213-2
     =>>jis-x0208@1978
-    =>>big5-cdp
-    =>>gt-k
+    =>>gt
+    =>jis-x0208@usual
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
     =>jis-x0213-1@2000
     =>jis-x0213-1@2004
+    =>jis-x0213-2@usual
     =>jis-x0213-2
+    ==>ucs@bucs
+    =>ucs@iso
+    =>ucs@unicode
+    =>ucs@jis
+    =>ucs@JP
+    =>ucs@cns
+    =>ucs@ks
+    =>>ucs@unicode
+    =>>ucs@jis
+    =>>ucs@cns
+    =ucs@iso
+    =ucs@unicode
+    =>>big5-cdp
+    =>>gt-k
     =>gt
     =>big5-cdp
+    =>daikanwa
     =big5
     =big5-eten
     =zinbun-oracle
     =>zinbun-oracle
     =ruimoku-v6
+    =>>ruimoku-v6
     =jef-china3
     =shinjigen))
 
@@ -431,6 +444,7 @@
           "(%-18s . %04d)\t; %c")
          ((or (memq name '(=daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
+                           =>>daikanwa =>daikanwa
                            =gt =>>gt =>gt =gt-k =>>gt-k =cbeta
                            =zinbun-oracle =>zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
@@ -500,8 +514,9 @@
                  (union required-features
                         '(=jis-x0208
                           =jis-x0208@1990
-                          =jis-x0213-1-2000
-                          =jis-x0213-2-2000
+                          =jis-x0213-1@2000
+                          =jis-x0213-1@2004
+                          =jis-x0213-2
                           =jis-x0212
                           =jis-x0208@1983
                           =jis-x0208@1978
@@ -635,7 +650,7 @@
                        name value (decode-char '=ucs value)
                        line-breaking))
        (setq attributes (delq name attributes))))
-    (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5))
+    (dolist (name '(=>ucs@gb =>ucs@big5))
       (when (and (memq name attributes)
                 (setq value (get-char-attribute char name)))
        (insert (format "(%-18s . #x%04X)\t; %c%s"
@@ -648,21 +663,21 @@
                        line-breaking))
        (setq attributes (delq name attributes))
        ))
-    (dolist (name '(=>daikanwa))
-      (when (and (memq name attributes)
-                (setq value (get-char-attribute char name)))
-       (insert
-        (if (integerp value)
-            (format "(%-18s . %05d)\t; %c%s"
-                    name value (decode-char '=daikanwa value)
-                    line-breaking)
-          (format "(%-18s %s)\t; %c%s"
-                  name
-                  (mapconcat (function prin1-to-string)
-                             value " ")
-                  (char-representative-of-daikanwa char)
-                  line-breaking)))
-       (setq attributes (delq name attributes))))
+    ;; (dolist (name '(=>daikanwa))
+    ;;   (when (and (memq name attributes)
+    ;;              (setq value (get-char-attribute char name)))
+    ;;     (insert
+    ;;      (if (integerp value)
+    ;;          (format "(%-18s . %05d)\t; %c%s"
+    ;;                  name value (decode-char '=daikanwa value)
+    ;;                  line-breaking)
+    ;;        (format "(%-18s %s)\t; %c%s"
+    ;;                name
+    ;;                (mapconcat (function prin1-to-string)
+    ;;                           value " ")
+    ;;                (char-representative-of-daikanwa char)
+    ;;                line-breaking)))
+    ;;     (setq attributes (delq name attributes))))
     (when (and (memq 'general-category attributes)
               (setq value (get-char-attribute char 'general-category)))
       (insert (format