update.

[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 cbe713b..6248115 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -73,7 +73,8 @@
   (aref ideographic-radicals number))
 
 (defconst shuowen-radicals
-  [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨 ?屮 ?艸 ?茻])
+  [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨
+   ?屮 ?艸 ?茻 ?小 ?八 ?釆 ?牛 ?告 ?口])
 
 (defun shuowen-radical (number)
   (aref shuowen-radicals (1- number)))
@@ -107,6 +108,22 @@
    ((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)
        (if (<= (charset-id ka) 1)
@@ -151,6 +168,7 @@
     =jis-x0208@1983
     japanese-jisx0212
     chinese-gb2312
+    =jis-x0208@1990
     chinese-cns11643-1
     chinese-cns11643-2
     chinese-cns11643-3
@@ -158,7 +176,6 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0208@1990
     =jis-x0213-1-2000
     =jis-x0213-2-2000
     korean-ksc5601
@@ -227,6 +244,7 @@
                                       '(=daikanwa
                                         =daikanwa@rev2
                                         ;; =gt-k
+                                        =jis-x0208@1997
                                         )))
                             (setq ccs (charset-name ccs))
                             (null (assq ccs char-spec))
@@ -422,9 +440,10 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(=daikanwa
-                       =daikanwa@rev1 =daikanwa@rev2
-                       =gt =gt-k =cbeta =zinbun-oracle))
+    (cond ((or (memq name '(=daikanwa
+                           =daikanwa@rev1 =daikanwa@rev2
+                           =gt =gt-k =cbeta =zinbun-oracle))
+              (string-match "^=adobe-" (symbol-name name)))
           "(%-18s . %05d)\t; %c")
          ((eq name 'mojikyo)
           "(%-18s . %06d)\t; %c")