(GT-00008): Unify U-00020089; use `ideographic-' attribute instead of
[chise/xemacs-chise.git] / lisp / utf-2000 / char-db-util.el
index 7cd5bf6..8e17440 100644 (file)
@@ -1,6 +1,6 @@
 ;;; char-db-util.el --- Character Database utility
 
-;; Copyright (C) 1998,1999,2000,2001 MORIOKA Tomohiko.
+;; Copyright (C) 1998,1999,2000,2001,2002 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE.
@@ -71,6 +71,8 @@
       (aset v 34 (make-char 'chinese-gb2312 #x62 #x3A)))
     v))
 
+(defvar char-db-ignored-attributes nil)
+
 ;;;###autoload
 (defun char-ref-p (obj)
   (and (consp obj)
                       t)))
                 (if (charset-iso-final-char kb)
                     nil
-                  (> (charset-id ka)(charset-id kb)))))
+                  (< (charset-id ka)(charset-id kb)))))
              ((<= (charset-chars ka)(charset-chars kb)))))
        (t
        (< (charset-dimension ka)
                       arabic-digit
                       arabic-1-column
                       arabic-2-column)))
+             ((string-match "^mojikyo-" (symbol-name (car rest))))
+             ((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
          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)
     (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)))
                    ;;                  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 ")"))
 
     (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)))
                      line-breaking))
       (setq attributes (delq '=>ucs* 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 value)
+                     line-breaking))
+      (setq attributes (delq '=>ucs-jis attributes))
+      )
     (when (and (memq '->ucs attributes)
               (setq value (get-char-attribute char '->ucs)))
       (insert (format (if char-db-convert-obsolete-format
                      line-breaking))
       (setq attributes (delq 'morohashi-daikanwa attributes))
       )
+    ;; (when (and (memq 'hanyu-dazidian attributes)
+    ;;            (setq value (get-char-attribute char 'hanyu-dazidian)))
+    ;;   (insert (format "(hanyu-dazidian     %s)%s"
+    ;;                   (mapconcat #'number-to-string value " ")
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq 'hanyu-dazidian attributes))
+    ;;   )
     (setq radical nil
          strokes nil)
     (when (and (memq 'ideographic-radical attributes)
            (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"
                 (insert (format "(%-18s . #x%04X)%s"
                                 name value
                                 line-breaking)))
-               ((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))
+               ((or (eq name 'ideographic-structure)
+                    (eq name 'ideographic-)
+                    (string-match "^\\(->\\|<-\\)" (symbol-name name)))
                 (insert (format "(%-18s%s " name line-breaking))
                 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
                       separator nil)
                   (cond ((characterp cell)
                          (if separator
                              (insert lbs))
-                         (char-db-insert-char-spec cell readable)
+                         (if readable
+                             (insert (format "%S" cell))
+                           (char-db-insert-char-spec cell readable))
                          (setq separator lbs))
                         ((consp cell)
                          (if separator
                   (setq value (cdr value)))
                 (insert ")")
                 (insert line-breaking))
-               ((string-match "^->" (symbol-name name))
-                (insert
-                 (format "(%-18s %s)%s"
-                         name
-                         (mapconcat (lambda (code)
-                                      (cond ((symbolp code)
-                                             (symbol-name code))
-                                            ((integerp code)
-                                             (format "#x%04X" code))
-                                            (t
-                                             (format "%s%S"
-                                                     line-breaking code))))
-                                    value " ")
-                         line-breaking)))
+                ;; ((string-match "^->" (symbol-name name))
+                ;;  (insert
+                ;;   (format "(%-18s %s)%s"
+                ;;           name
+                ;;           (mapconcat (lambda (code)
+                ;;                        (cond ((symbolp code)
+                ;;                               (symbol-name code))
+                ;;                              ((integerp code)
+                ;;                               (format "#x%04X" code))
+                ;;                              (t
+                ;;                               (format "%s%S"
+                ;;                                       line-breaking code))))
+                ;;                      value " ")
+                ;;           line-breaking)))
                ((consp value)
                 (insert (format "(%-18s " name))
                 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
               (setq value (get-char-attribute char name)))
          (insert
           (format
-           (cond ((memq name '(ideograph-daikanwa ideograph-gt
-                                                  ideograph-cbeta))
+           (cond ((memq name '(ideograph-daikanwa-2
+                               ideograph-daikanwa
+                               ideograph-gt
+                               ideograph-cbeta))
                   (if has-long-ccs-name
                       "(%-26s . %05d)\t; %c%s"
                     "(%-18s . %05d)\t; %c%s"))