update.

[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 f2397d4..6fac55d 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -200,6 +200,7 @@
                    (if (and (or (charset-iso-final-char ccs)
                                 (memq ccs
                                       '(ideograph-daikanwa
+                                        =daikanwa-rev2
                                         ;; =gt-k
                                         )))
                             (setq ret (get-char-attribute char ccs)))
@@ -474,55 +475,83 @@
                      line-breaking))
       (setq attributes (delq 'script attributes))
       )
-    (when (and (memq '=>ucs attributes)
-              (setq value (get-char-attribute char '=>ucs)))
-      (insert (format "(=>ucs\t\t. #x%04X)\t; %c%s"
-                     value (decode-char '=ucs value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs attributes))
-      )
-    (when (and (memq '=>ucs* attributes)
-              (setq value (get-char-attribute char '=>ucs*)))
-      (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
-                     value (decode-char '=ucs value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs* attributes))
-      )
-    (when (and (memq '=>ucs-gb attributes)
-              (setq value (get-char-attribute char '=>ucs-gb)))
-      (insert (format "(=>ucs-gb\t\t. #x%04X)\t; %c%s"
-                     value (decode-char '=ucs value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs-gb attributes))
-      )
-    (when (and (memq '=>ucs-cns attributes)
-              (setq value (get-char-attribute char '=>ucs-cns)))
-      (insert (format "(=>ucs-cns\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs-cns value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs-cns attributes))
-      )
-    (when (and (memq '=>ucs-big5 attributes)
-              (setq value (get-char-attribute char '=>ucs-big5)))
-      (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs-big5 value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs-big5 attributes))
-      )
-    (when (and (memq '=>ucs-jis attributes)
-              (setq value (get-char-attribute char '=>ucs-jis)))
-      (insert (format "(=>ucs-jis\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs-jis value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs-jis attributes))
-      )
-    (when (and (memq '=>ucs-ks attributes)
-              (setq value (get-char-attribute char '=>ucs-ks)))
-      (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s"
-                     value (decode-char 'ucs-ks value)
-                     line-breaking))
-      (setq attributes (delq '=>ucs-ks attributes))
-      )
+    (dolist (name '(=>ucs =>ucs*))
+      (when (and (memq name attributes)
+                (setq value (get-char-attribute char name)))
+       (insert (format "(%-18s . #x%04X)\t; %c%s"
+                       name value (decode-char '=ucs value)
+                       line-breaking))
+       (setq attributes (delq name attributes))))
+    ;; (when (and (memq '=>ucs* attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs*)))
+    ;;   (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char '=ucs value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs* attributes))
+    ;;   )
+    (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5))
+      (when (and (memq name attributes)
+                (setq value (get-char-attribute char name)))
+       (insert (format "(%-18s . #x%04X)\t; %c%s"
+                       name value
+                       (decode-char (intern
+                                     (concat "="
+                                             (substring
+                                              (symbol-name name) 2)))
+                                    value)
+                       line-breaking))
+       (setq attributes (delq name attributes))
+       ))
+    (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks =>ucs-big5))
+      (when (and (memq name attributes)
+                (setq value (get-char-attribute char name)))
+       (insert (format "(%-18s . #x%04X)\t; %c%s"
+                       (intern
+                        (concat "=>ucs@"
+                                (substring (symbol-name name) 6)))
+                       value
+                       (decode-char (intern
+                                     (concat "=ucs@"
+                                             (substring
+                                              (symbol-name name) 6)))
+                                    value)
+                       line-breaking))
+       (setq attributes (delq name attributes))))
+    ;; (when (and (memq '=>ucs-gb attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs-gb)))
+    ;;   (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char '=ucs@gb value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs-gb attributes))
+    ;;   )
+    ;; (when (and (memq '=>ucs-cns attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs-cns)))
+    ;;   (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char '=ucs@cns value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs-cns attributes))
+    ;;   )
+    ;; (when (and (memq '=>ucs-big5 attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs-big5)))
+    ;;   (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char 'ucs-big5 value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs-big5 attributes))
+    ;;   )
+    ;; (when (and (memq '=>ucs-jis attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs-jis)))
+    ;;   (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char '=ucs@jis value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs-jis attributes))
+    ;;   )
+    ;; (when (and (memq '=>ucs-ks attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs-ks)))
+    ;;   (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char 'ucs-ks value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs-ks attributes))
+    ;;   )
     (when (and (memq '->ucs attributes)
               (setq value (get-char-attribute char '->ucs)))
       (insert (format (if char-db-convert-obsolete-format
@@ -828,7 +857,12 @@
     (while attributes
       (setq name (car attributes))
       (if (setq value (get-char-attribute char name))
-         (cond ((eq name 'jisx0208-1978/4X)
+         (cond ((string-match "^=>ucs@" (symbol-name name))
+                (insert (format "(%-18s . #x%04X)\t; %c%s"
+                                name value (decode-char '=ucs value)
+                                line-breaking))
+                )
+               ((eq name 'jisx0208-1978/4X)
                 (insert (format "(%-18s . #x%04X)%s"
                                 name value
                                 line-breaking)))
@@ -951,8 +985,9 @@
               (setq value (get-char-attribute char name)))
          (insert
           (format
-           (cond ((memq name '(ideograph-daikanwa-2
-                               ideograph-daikanwa
+           (cond ((memq name '(ideograph-daikanwa
+                               =daikanwa-rev1
+                               =daikanwa-rev2
                                =gt =gt-k =cbeta))
                   (if has-long-ccs-name
                       "(%-26s . %05d)\t; %c%s"