Sync up with r21-4-21-chise-0_24-5.

[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 7b634a4..b50c2ff 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -155,18 +155,56 @@
     )
    ((find-charset ka)
     (if (find-charset kb)
-       (if (<= (charset-id ka) 1)
-           (if (<= (charset-id kb) 1)
+       (if (or (<= (charset-id ka) 1)
+               (and (charset-final ka)
+                    (>= (charset-final ka) ?@)))
+           (if (or (<= (charset-id kb) 1)
+                   (and (charset-final kb)
+                        (>= (charset-final kb) ?@)))
                (cond
                 ((= (charset-dimension ka)
                     (charset-dimension kb))
-                 (> (charset-id ka)(charset-id kb)))
+                 (if (and (<= (charset-id ka) 1)
+                          (<= (charset-id kb) 1))
+                     (> (charset-id ka)(charset-id kb))
+                   (if (and (charset-final ka)
+                            (charset-final kb))
+                       (cond
+                        ((= (charset-final ka)(charset-final kb))
+                         (if (<= (charset-id ka) 1)
+                             (if (<= (charset-id kb) 1)
+                                 (> (charset-id ka)(charset-id kb))
+                               t)
+                           (if (<= (charset-id kb) 1)
+                               nil
+                             (< (charset-id ka)(charset-id kb))))
+                         )
+                        ((< (charset-final ka)(charset-final kb))
+                         ))
+                     (if (<= (charset-id ka) 1)
+                         (if (<= (charset-id kb) 1)
+                             (> (charset-id ka)(charset-id kb))
+                           t)
+                       (if (<= (charset-id kb) 1)
+                           nil
+                         (cond ((and (charset-final ka)
+                                     (>= (charset-final ka) ?@))
+                                t)
+                               ((and (charset-final kb)
+                                     (>= (charset-final kb) ?@))
+                                nil)
+                               (t
+                                (< (charset-id ka)(charset-id kb))
+                                ))))))
+                 )
                 (t
                  (> (charset-dimension ka)
                     (charset-dimension kb))
                  ))
              t)
-         (if (<= (charset-id kb) 1)
+         (if (or (<= (charset-id kb) 1)
+                 (and (charset-final kb)
+                      (>= (charset-final kb) ?@)))
              nil
            (< (charset-id ka)(charset-id kb))))
       nil))
@@ -469,8 +507,12 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(shinjigen-1 shinjigen-2 shinjigen-2-p))
+    (cond ((memq name '(=shinjigen
+                       =shinjigen@1ed
+                       =shinjigen@rev =shinjigen/+p@rev))
           "(%-18s .  %04d)\t; %c")
+         ((eq name '=shinjigen@1ed/24pr)
+          "(%-18s . %04d)\t; %c")
          ((or (memq name '(=daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
                            =gt =gt-k =cbeta =zinbun-oracle))
@@ -534,7 +576,9 @@
        (setq required-features nil)
        (dolist (source sources)
          (cond
-          ((memq source '(JP JP/Jouyou shinjigen-1))
+          ((memq source '(JP
+                          JP/Jouyou
+                          shinjigen shinjigen@1ed shinjigen@rev))
            (setq required-features
                  (union required-features
                         '(=jis-x0208
@@ -543,7 +587,8 @@
                           =jis-x0213-2-2000
                           =jis-x0212
                           =jis-x0208@1983
-                          =jis-x0208@1978))))
+                          =jis-x0208@1978
+                          =shinjigen))))
           ((eq source 'CN)
            (setq required-features
                  (union required-features