X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=097d33f4a6c61c170356ed9500caaba61582ce9d;hb=ea91eceda2cb1b08f425668b776aee51f5a7438a;hp=4612b30d65c9c0b7fb0ed64eed9d39ea8a8d9831;hpb=1a457ecfa8bbb121c48cccd70779a0a23cf95e46;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 4612b30..097d33f 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -237,6 +237,30 @@
       (write-region (point-min)(point-max) file)
       )))
 
+(defun ideographic-structure= (char1 char2)
+  (if (char-ref-p char1)
+      (setq char1 (plist-get char1 :char)))
+  (if (char-ref-p char2)
+      (setq char2 (plist-get char2 :char)))
+  (let ((s1 (if (characterp char1)
+		(get-char-attribute char1 'ideographic-structure)
+	      (cdr (assq 'ideographic-structure char1))))
+	(s2 (if (characterp char2)
+		(get-char-attribute char2 'ideographic-structure)
+	      (cdr (assq 'ideographic-structure char2))))
+	e1 e2)
+    (if (or (null s1)(null s2))
+	(char-spec= char1 char2)
+      (catch 'tag
+	(while (and s1 s2)
+	  (setq e1 (car s1)
+		e2 (car s2))
+	  (unless (ideographic-structure= e1 e2)
+	    (throw 'tag nil))
+	  (setq s1 (cdr s1)
+		s2 (cdr s2)))
+	(and (null s1)(null s2))))))
+
 ;;;###autoload
 (defun ideographic-structure-find-char (structure)
   (let (rest)
@@ -244,7 +268,8 @@
 			  (setq rest structure)
 			  (catch 'tag
 			    (while (and rest value)
-			      (unless (char-ref= (car rest)(car value))
+			      (unless (ideographic-structure=
+				       (car rest)(car value))
 				(throw 'tag nil))
 			      (setq rest (cdr rest)
 				    value (cdr value)))