(M-45906): Unify K0-582A.

[chise/xemacs-chise.git-] / 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 26888dc..ce40042 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -121,12 +121,9 @@
     (setq column (current-column)))
   (let (char-spec ret al cal key temp-char)
     (cond ((characterp char)
-          (cond ((setq ret (get-char-attribute char 'ucs))
-                 (unless (and (<= #xE000 ret)(<= ret #xF8FF))
-                   (setq char-spec (list (cons 'ucs ret))))
-                 (if (setq ret (get-char-attribute char 'chinese-big5-cdp))
-                     (setq char-spec (cons (cons 'chinese-big5-cdp ret)
-                                           char-spec)))
+          (cond ((and (setq ret (get-char-attribute char 'ucs))
+                      (not (and (<= #xE000 ret)(<= ret #xF8FF))))
+                 (setq char-spec (list (cons 'ucs ret)))
                  (if (setq ret (get-char-attribute char 'name))
                      (setq char-spec (cons (cons 'name ret) char-spec)))
                  )
@@ -582,6 +579,24 @@
                      line-breaking))
       (setq attributes (delq '->mojikyo attributes))
       )
+    (when (and (memq 'hanyu-dazidian-vol attributes)
+              (setq value (get-char-attribute char 'hanyu-dazidian-vol)))
+      (insert (format "(hanyu-dazidian-vol  . %d)%s"
+                     value line-breaking))
+      (setq attributes (delq 'hanyu-dazidian-vol attributes))
+      )
+    (when (and (memq 'hanyu-dazidian-page attributes)
+              (setq value (get-char-attribute char 'hanyu-dazidian-page)))
+      (insert (format "(hanyu-dazidian-page . %d)%s"
+                     value line-breaking))
+      (setq attributes (delq 'hanyu-dazidian-page attributes))
+      )
+    (when (and (memq 'hanyu-dazidian-char attributes)
+              (setq value (get-char-attribute char 'hanyu-dazidian-char)))
+      (insert (format "(hanyu-dazidian-char . %d)%s"
+                     value line-breaking))
+      (setq attributes (delq 'hanyu-dazidian-char attributes))
+      )
     (setq rest ccs-attributes)
     (while (and rest
                (progn
@@ -604,6 +619,7 @@
                ((memq name '(->lowercase
                              ->uppercase ->titlecase
                              ->fullwidth <-fullwidth
+                             ->identical
                              ->vulgar-ideograph <-vulgar-ideograph
                              ->ancient-ideograph <-ancient-ideograph
                              ->original-ideograph <-original-ideograph
@@ -730,7 +746,8 @@
               (setq value (get-char-attribute char name)))
          (insert
           (format
-           (cond ((memq name '(ideograph-daikanwa ideograph-gt))
+           (cond ((memq name '(ideograph-daikanwa ideograph-gt
+                                                  ideograph-cbeta))
                   (if has-long-ccs-name
                       "(%-26s . %05d)\t; %c%s"
                     "(%-18s . %05d)\t; %c%s"))