update.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / ideograph-util.el

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index c435990..800bb05 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -33,7 +33,7 @@
   (let (ret)
     (or (catch 'tag
          (dolist (domain char-db-feature-domains)
-           (if (and (setq ret (get-char-attribute
+           (if (and (setq ret (char-feature
                                char
                                (intern
                                 (format "%s@%s"
@@ -47,7 +47,7 @@
                     (or (eq ret radical)
                         (null radical)))
                (throw 'tag ret))))
-       (get-char-attribute char 'ideographic-radical)
+       (char-feature char 'ideographic-radical)
        (progn
          (setq ret
                (or (get-char-attribute char 'daikanwa-radical)
@@ -90,16 +90,16 @@
   (let (ret)
     (catch 'tag
       (dolist (domain domains)
-       (if (and (setq ret (or (get-char-attribute
+       (if (and (setq ret (or (char-feature
                                char
                                (intern
                                 (format "%s@%s"
                                         'ideographic-radical domain)))
-                              (get-char-attribute
+                              (char-feature
                                char 'ideographic-radical)))
                 (or (eq ret radical)
                     (null radical))
-                (setq ret (get-char-attribute
+                (setq ret (char-feature
                            char
                            (intern
                             (format "%s@%s"
@@ -111,7 +111,7 @@
   (let (ret)
     (or (char-ideographic-strokes-from-domains
         char preferred-domains radical)
-       (get-char-attribute char 'ideographic-strokes)
+       (char-feature char 'ideographic-strokes)
        (char-ideographic-strokes-from-domains
         char char-db-feature-domains radical)
        (catch 'tag
@@ -240,9 +240,13 @@
   (if (or (encode-char char 'ideograph-daikanwa 'defined-only)
          (encode-char char '=daikanwa-rev2 'defined-only))
       char
-    (let ((m (get-char-attribute char 'morohashi-daikanwa))
+    (let ((m (char-feature char '=>daikanwa))
          m-m m-s pat)
-      (or (when m
+      (or (and (integerp m)
+              (or (decode-char '=daikanwa-rev2 m 'defined-only)
+                  (decode-char 'ideograph-daikanwa m)))
+         (when (or m
+                   (setq m (get-char-attribute char 'morohashi-daikanwa)))
            (setq m-m (pop m))
            (setq m-s (pop m))
            (if (= m-s 0)
@@ -301,6 +305,7 @@
 (defun char-daikanwa (char)
   (or (encode-char char 'ideograph-daikanwa 'defined-only)
       (encode-char char '=daikanwa-rev2 'defined-only)
+      (get-char-attribute char '=>daikanwa)
       (get-char-attribute char 'morohashi-daikanwa)))
 
 ;;;###autoload
@@ -404,26 +409,35 @@
                        'ideographic-structure)))
 
 ;;;###autoload
-(defun total-strokes-string< (string1 string2 &optional preferred-domains)
+(defun chise-string< (string1 string2 accessors)
   (let ((len1 (length string1))
        (len2 (length string2))
        len
        (i 0)
        c1 c2
-       s1 s2)
+       rest func
+       v1 v2)
     (setq len (min len1 len2))
     (catch 'tag
       (while (< i len)
        (setq c1 (aref string1 i)
              c2 (aref string2 i))
-       (setq s1 (or (char-total-strokes c1 preferred-domains)
-                    0)
-             s2 (or (char-total-strokes c2 preferred-domains)
-                    0))
-       (cond ((< s1 s2)
-              (throw 'tag t))
-             ((> s1 s2)
-              (throw 'tag nil)))
+       (setq rest accessors)
+       (while (and rest
+                   (setq func (car rest))
+                   (setq v1 (funcall func c1)
+                         v2 (funcall func c2))
+                   (eq v1 v2))
+         (setq rest (cdr rest)))
+       (if v1
+           (if v2
+               (cond ((< v1 v2)
+                      (throw 'tag t))
+                     ((> v1 v2)
+                      (throw 'tag nil)))
+             (throw 'tag nil))
+         (if v2
+             (throw 'tag t)))
        (setq i (1+ i)))
       (< len1 len2))))