(M-13739): Unify GT-17371 and GT-K2303.

[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 1f8a5d6..5395803 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -25,7 +25,8 @@
 
 ;;; Code:
 
-(require 'alist)
+(require 'chise-subr)
+(require 'ideograph-subr)
 
 (defconst unidata-normative-category-alist
   '(("Lu" letter       uppercase)
@@ -62,19 +63,6 @@
     ("So" symbol       other)
     ))
 
-(defconst ideographic-radicals
-  (let ((v (make-vector 215 nil))
-       (i 1))
-    (while (< i 215)
-      (aset v i (decode-char '=ucs (+ #x2EFF i)))
-      (setq i (1+ i)))
-    v))
-
-;;;###autoload
-(defun ideographic-radical (number)
-  "Return character corresponding with Kangxi-radical number."
-  (aref ideographic-radicals number))
-
 (defconst shuowen-radicals
   [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨 ; 010
    ?屮 ?艸 ?蓐 ?茻 ?小 ?八 ?釆 ?半 ?牛 ?犛 ; 020
@@ -112,80 +100,8 @@
 
 (defvar char-db-file-coding-system 'utf-8-mcs-er)
 
-(defvar char-db-feature-domains
-  '(ucs ucs/compat daikanwa cns gt jis jis/alt jis/a jis/b
-       jis-x0212 jis-x0213 cdp shinjigen misc unknown))
-
 (defvar char-db-ignored-attributes '(ideographic-products))
 
-(defun char-attribute-name< (ka kb)
-  (cond
-   ((eq '->denotational kb)
-    t)
-   ((eq '->subsumptive kb)
-    (not (eq '->denotational ka)))
-   ((eq '->denotational ka)
-    nil)
-   ((eq '->subsumptive ka)
-    nil)
-   ((and (symbolp ka)
-        (string-match "^->" (symbol-name ka)))
-    (cond ((and (symbolp kb)
-               (string-match "^->" (symbol-name kb)))
-          (string< (symbol-name ka)
-                   (symbol-name kb))
-          ))
-    )
-   ((and (symbolp kb)
-        (string-match "^->" (symbol-name kb)))
-    t)
-   ((and (symbolp ka)
-        (string-match "^<-" (symbol-name ka)))
-    (cond ((symbolp kb)
-          (cond ((string-match "^<-" (symbol-name kb))
-                 (string< (symbol-name ka)
-                          (symbol-name kb))
-                 )
-                 ;; ((string-match "^->" (symbol-name kb))
-                 ;;  t)
-                )))
-    )
-   ((and (symbolp kb)
-        (string-match "^<-" (symbol-name kb)))
-    t
-    ;; (not (string-match "^->" (symbol-name ka)))
-    )
-   ((find-charset ka)
-    (if (find-charset kb)
-       (let (a-ir b-ir)
-         (if (setq a-ir (charset-property ka 'iso-ir))
-             (if (setq b-ir (charset-property kb 'iso-ir))
-                 (cond
-                  ((= a-ir b-ir)
-                   (< (charset-id ka)(charset-id kb))
-                   )
-                  ((= a-ir 177)
-                   t)
-                  ((= b-ir 177)
-                   nil)
-                  ((< a-ir
-                      b-ir)
-                   ))
-               t)
-           (if (charset-property kb 'iso-ir)
-               nil
-             (< (charset-id ka)(charset-id kb)))))
-      nil)
-    )
-   ((find-charset kb))
-   ((symbolp ka)
-    (cond ((symbolp kb)
-          (string< (symbol-name ka)
-                   (symbol-name kb)))
-         (t)))
-   ((symbolp kb)
-    nil)))
-
 (defvar char-db-coded-charset-priority-list
   '(ascii
     control-1
@@ -224,10 +140,10 @@
     ethiopic-ucs
     =big5-cdp
     =gt
-    =>>gt
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
+    =gt-k
     ideograph-hanziku-1
     ideograph-hanziku-2
     ideograph-hanziku-3
@@ -240,21 +156,26 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
-    =gt-k
     =ucs@iso
     =ucs@unicode
+    =>>ucs@unicode
+    =>>gt
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
     =>>jis-x0213-1@2004
     =>>jis-x0213-2
     =>>jis-x0208@1978
+    =>>big5-cdp
+    =>>gt-k
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
     =>jis-x0213-1@2000
     =>jis-x0213-1@2004
     =>jis-x0213-2
+    =>gt
+    =>big5-cdp
     =big5
     =big5-eten
     =zinbun-oracle
@@ -263,6 +184,10 @@
     =jef-china3
     =shinjigen))
 
+
+;;; @ char-db formatters
+;;;
+
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
     (cond ((characterp char)
@@ -506,7 +431,7 @@
           "(%-18s . %04d)\t; %c")
          ((or (memq name '(=daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
-                           =gt =>>gt =>gt =gt-k =cbeta
+                           =gt =>>gt =>gt =gt-k =>>gt-k =cbeta
                            =zinbun-oracle =>zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
           "(%-18s . %05d)\t; %c")
@@ -1344,6 +1269,10 @@
                what-character-original-window-configuration)
               (signal (car err) (cdr err)))))))
 
+
+;;; @ end
+;;;
+
 (provide 'char-db-util)
 
 ;;; char-db-util.el ends here