From: tomo <tomo>
Date: Tue, 19 Jun 2001 10:27:46 +0000 (+0000)
Subject: (morohashi-daikanwa<): New function.
X-Git-Tag: r21-2-38-utf-2000-0_17-1~533
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4b203e4d66a8894949993047793fd633020d17d8;p=chise%2Fxemacs-chise.git-

(morohashi-daikanwa<): New function.
(ideograph-char<): Use `morohashi-daikanwa<'.
---

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