X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=a03cf1217dae24d95610d9f46f633e86e3905a45;hb=a2bc237c12cced56e7b6235c8ffcddbe812dd4bc;hp=98be81ebc84c367622226369506203945e934af4;hpb=4e18f4602f8bfa44b39936b69e268a654c62511a;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 98be81e..a03cf12 100644
--- 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