(insert-char-attributes): Use `ucs-{jis|cns}'

character in the comment for a '=>ucs-{jis|cns}' property.
(insert-char-attributes): Add setting for `=>ucs-cns'.

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index e68ba44..89a606e 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -461,10 +461,17 @@
     (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 value)
+                     value (decode-char 'ucs-jis value)
                      line-breaking))
       (setq attributes (delq '=>ucs-jis 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 attributes)
               (setq value (get-char-attribute char '->ucs)))
       (insert (format (if char-db-convert-obsolete-format
@@ -777,22 +784,6 @@
                ((or (eq name 'ideographic-structure)
                     (eq name 'ideographic-)
                     (string-match "^\\(->\\|<-\\)" (symbol-name name)))
-                 ;; (memq name '(->lowercase
-                 ;;              ->uppercase ->titlecase
-                 ;;              ->fullwidth <-fullwidth
-                 ;;              ->identical
-                 ;;              ->vulgar-ideograph <-vulgar-ideograph
-                 ;;              ->ancient-ideograph <-ancient-ideograph
-                 ;;              ->original-ideograph <-original-ideograph
-                 ;;              ->simplified-ideograph <-simplified-ideograph
-                 ;;              ->wrong-ideograph <-wrong-ideograph
-                 ;;              ->same-ideograph
-                 ;;              ->ideographic-variants
-                 ;;              ->synonyms
-                 ;;              ->radical <-radical
-                 ;;              ->bopomofo <-bopomofo
-                 ;;              ->ideographic <-ideographic
-                 ;;              ideographic-structure))
                 (insert (format "(%-18s%s " name line-breaking))
                 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
                       separator nil)