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 dea1a15..c18d2f0 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -156,40 +156,21 @@
    ((find-charset ka)
     (if (find-charset kb)
        (let (a-ir b-ir)
-         (if (and (setq a-ir (charset-property ka 'iso-ir))
-                  (if (= a-ir 177)
-                      (if (= (charset-id ka) -177)
-                          t
-                        (setq a-ir nil))
-                    t))
-             (if (and (setq b-ir (charset-property kb 'iso-ir))
-                      (if (= b-ir 177)
-                          (if (= (charset-id kb) -177)
-                              t
-                            (setq b-ir nil))
-                        t))
+         (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)
-                  ((= (charset-dimension ka)
-                      (charset-dimension kb))
-                   (< a-ir b-ir)
-                   )
-                  ((> (charset-dimension ka)
-                      (charset-dimension kb))
+                  ((= a-ir 177)
+                   t)
+                  ((= b-ir 177)
+                   nil)
+                  ((< a-ir
+                      b-ir)
                    ))
                t)
-           (if (and (setq b-ir (charset-property kb 'iso-ir))
-                    (if (= b-ir 177)
-                        (if (= (charset-id kb) -177)
-                            t
-                          (setq b-ir nil))
-                      t))
+           (if (charset-property kb 'iso-ir)
                nil
              (< (charset-id ka)(charset-id kb)))))
       nil)
@@ -228,8 +209,10 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0213-1-2000
-    =jis-x0213-2-2000
+    =jis-x0213-1
+    =jis-x0213-1@2000
+    =jis-x0213-1@2004
+    =jis-x0213-2
     korean-ksc5601
     chinese-isoir165
     katakana-jisx0201
@@ -239,6 +222,7 @@
     ethiopic-ucs
     =big5-cdp
     =gt
+    =>>gt
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
@@ -257,12 +241,21 @@
     =gt-k
     =ucs@iso
     =ucs@unicode
+    =>>jis-x0208
+    =>jis-x0208
+    =>jis-x0208@1997
+    =>>jis-x0213-1
+    =>jis-x0213-1
+    =>jis-x0213-1@2000
+    =>jis-x0213-1@2004
+    =>>jis-x0213-2
+    =>jis-x0213-2
     =big5
     =big5-eten
-    =jis-x0208@1997
     =zinbun-oracle
     =ruimoku-v6
-    =jef-china3))
+    =jef-china3
+    =shinjigen))
 
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
@@ -298,8 +291,7 @@
                                         ;; =gt-k
                                         =jis-x0208@1997
                                         ))
-                                 ;; (string-match "=ucs@" (symbol-name ccs))
-                                )
+                                (string-match "=ucs@" (symbol-name ccs)))
                             (setq ccs (charset-name ccs))
                             (null (assq ccs char-spec))
                             (setq ret (encode-char char ccs 'defined-only)))
@@ -508,7 +500,7 @@
           "(%-18s . %04d)\t; %c")
          ((or (memq name '(=daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
-                           =gt =gt-k =cbeta =zinbun-oracle))
+                           =gt =>>gt =>gt =gt-k =cbeta =zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
           "(%-18s . %05d)\t; %c")
          ((eq name 'mojikyo)