(M-41676): Add `ideograph=' for M-41704; unify M041676; separate

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

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 98be81e..a03cf12 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -185,6 +185,20 @@
        nil)
     (numberp (car b))))
 
+(defun morohashi-daikanwa< (a b)
+  (cond ((eq (car a) 'ho)
+        (if (eq (car b) 'ho)
+            (int-list< (cdr a)(cdr b))
+          nil))
+       ((numberp (car a))
+        (if (eq (car b) 'ho)
+            t
+          (int-list< a b)))
+       (t
+        (if (eq (car b) 'ho)
+            t
+          (int-list< a b)))))
+
 (defun ideograph-char< (a b)
   (let ((a-m-m (get-char-attribute a 'ideograph-daikanwa))
        (b-m-m (get-char-attribute b 'ideograph-daikanwa))
@@ -234,8 +248,8 @@
            (if (= a-s b-s)
                (if a-m-m
                    (if b-m-m
-                       (int-list< (cons a-m-m a-m-r)
-                                  (cons b-m-m b-m-r))
+                       (morohashi-daikanwa< (cons a-m-m a-m-r)
+                                            (cons b-m-m b-m-r))
                      t)
                  (if b-m-m
                      nil