Sync with r21-2-44-utf-2000-0_18m-uj90.

[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 431cfc1..4a706b7 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -71,10 +71,7 @@
       (aset v 34 (make-char 'chinese-gb2312 #x62 #x3A)))
     v))
 
-;;;###autoload
-(defun char-ref-p (obj)
-  (and (consp obj)
-       (keywordp (car obj))))
+(defvar char-db-ignored-attributes nil)
 
 ;;;###autoload
 (defun char-ref= (cr1 cr2)
@@ -159,13 +156,15 @@
                       arabic-digit
                       arabic-1-column
                       arabic-2-column)))
+             ((string-match "^chinese-big5" (symbol-name (car rest))))
              ((string-match "^ideograph-gt-pj-" (symbol-name (car rest)))
               (unless (memq 'ideograph-gt dest)
                 (setq dest (cons 'ideograph-gt dest))))
              (t
               (setq dest (cons (car rest) dest)))))
       (setq rest (cdr rest)))
-    (sort dest #'char-attribute-name<)))
+    (append (sort dest #'char-attribute-name<)
+           '(chinese-big5-cdp chinese-big5-eten chinese-big5))))
 
 (defun char-db-insert-char-spec (char &optional readable column)
   (unless column
@@ -210,10 +209,14 @@
          cal nil)
     (while char-spec
       (setq key (car (car char-spec)))
-      (if (find-charset key)
-         (setq cal (cons key cal))
-       (setq al (cons key al)))
+      (unless (memq key char-db-ignored-attributes)
+       (if (find-charset key)
+           (setq cal (cons key cal))
+         (setq al (cons key al))))
       (setq char-spec (cdr char-spec)))
+    (unless (or cal
+               (memq 'ideographic-structure al))
+      (push 'ideographic-structure al))
     (insert-char-attributes char
                            readable
                            (or al 'none) cal)
@@ -303,12 +306,14 @@
     (setq column (current-column)))
   (let ((line-breaking
         (concat "\n" (make-string (1+ column) ?\ )))
+       (separator "")
        name value)
     (insert "(")
     (while plist
       (setq name (pop plist))
       (setq value (pop plist))
       (cond ((eq name :char)
+            (insert separator)
             (insert ":char\t")
             (cond ((numberp value)
                    (setq value (decode-char 'ucs value)))
@@ -317,11 +322,18 @@
                    ;;                  value)))
                   )
             (char-db-insert-char-spec value readable)
-             (insert line-breaking))
-            (t
-            (insert (format "%s\t%S%s"
+             (insert line-breaking)
+            (setq separator ""))
+           ((eq name :radical)
+            (insert (format "%s%s\t%d ; %c%s"
+                            separator
                             name value
-                            line-breaking))))
+                            (aref ideographic-radicals value)
+                            line-breaking))
+            (setq separator ""))
+            (t
+            (insert (format "%s%s\t%S" separator name value))
+            (setq separator line-breaking)))
       ))
   (insert ")"))
 
@@ -362,18 +374,32 @@
     (setq attributes
          (sort (if attributes
                    (if (consp attributes)
-                       (copy-sequence attributes))
+                       (progn
+                         (dolist (name attributes)
+                           (unless (memq name char-db-ignored-attributes)
+                             (push name atr-d)))
+                         atr-d))
                  (dolist (name (char-attribute-list))
-                   (if (find-charset name)
-                       (push name ccs-d)
-                     (push name atr-d)))
+                   (unless (memq name char-db-ignored-attributes)
+                     (if (find-charset name)
+                         (push name ccs-d)
+                       (push name atr-d))))
                  atr-d)
                #'char-attribute-name<))
     (setq ccs-attributes
          (sort (if ccs-attributes
-                   (copy-sequence ccs-attributes)
+                   (progn
+                     (setq ccs-d nil)
+                     (dolist (name ccs-attributes)
+                       (unless (memq name char-db-ignored-attributes)
+                         (push name ccs-d)))
+                     ccs-d)
                  (or ccs-d
-                     (charset-list)))
+                     (progn
+                       (dolist (name (charset-list))
+                         (unless (memq name char-db-ignored-attributes)
+                           (push name ccs-d)))
+                       ccs-d)))
                #'char-attribute-name<)))
   (unless column
     (setq column (current-column)))
@@ -603,6 +629,38 @@
            (setq radical value)))
       (setq attributes (delq 'shinjigen-1-radical attributes))
       )
+    (when (and (memq 'ideographic- attributes)
+              (setq value (get-char-attribute char 'ideographic-)))
+      (insert "(ideographic-       ")
+      (setq lbs (concat "\n" (make-string (current-column) ?\ ))
+           separator nil)
+      (while (consp value)
+       (setq cell (car value))
+       (if (integerp cell)
+           (setq cell (decode-char 'ucs cell)))
+       (cond ((characterp cell)
+              (if separator
+                  (insert lbs))
+              (if readable
+                  (insert (format "%S" cell))
+                (char-db-insert-char-spec cell readable))
+              (setq separator lbs))
+             ((consp cell)
+              (if separator
+                  (insert lbs))
+              (if (consp (car cell))
+                  (char-db-insert-char-spec cell readable)
+                (char-db-insert-char-reference cell readable))
+              (setq separator lbs))
+             (t
+              (if separator
+                  (insert separator))
+              (insert (prin1-to-string cell))
+              (setq separator " ")))
+       (setq value (cdr value)))
+      (insert ")")
+      (insert line-breaking)
+      (setq attributes (delq 'ideographic- attributes)))
     (when (and (memq 'total-strokes attributes)
               (setq value (get-char-attribute char 'total-strokes)))
       (insert (format "(total-strokes       . %S)%s"
@@ -673,10 +731,13 @@
                      value line-breaking))
       (setq attributes (delq 'hanyu-dazidian-char attributes))
       )
-    (when (and (not readable)
-              (memq '->ucs-variants attributes))
-      (setq attributes (delq '->ucs-variants attributes))
-      )
+    (unless readable
+      (when (memq '->ucs-variants attributes)
+       (setq attributes (delq '->ucs-variants attributes))
+       )
+      (when (memq 'composition attributes)
+       (setq attributes (delq 'composition attributes))
+       ))
     (setq rest ccs-attributes)
     (while (and rest
                (progn
@@ -697,6 +758,7 @@
                                 name value
                                 line-breaking)))
                ((or (eq name 'ideographic-structure)
+                    (eq name 'ideographic-)
                     (string-match "^\\(->\\|<-\\)" (symbol-name name)))
                  ;; (memq name '(->lowercase
                  ;;              ->uppercase ->titlecase