From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Sat, 14 Nov 2020 14:28:51 +0000 (+0900)
Subject: (ideographic-structure-compare-functional-and-apparent):
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=19573c0f2925166fcc42324ec872c1c46576a6b5;p=chise%2Fids.git

(ideographic-structure-compare-functional-and-apparent):
- In the implementation of rule-813 (⿺⿱LBC -> ⿱⿰LCB if B is
  flat-head), refer `ideographic-structure@apparent' as the same as
  `ideographic-structure'; accept U+4E00 as B.
---

diff --git a/ids-find.el b/ids-find.el
index c410984..576718f 100644
--- a/ids-find.el
+++ b/ids-find.el
@@ -1526,11 +1526,19 @@ COMPONENT can be a character or char-spec."
       (setq enc (nth 1 structure))
       (when (setq enc-str
 		  (cond ((characterp enc)
-			 (get-char-attribute enc 'ideographic-structure)
+			 (or (get-char-attribute enc 'ideographic-structure)
+			     (get-char-attribute enc 'ideographic-structure@apparent))
 			 )
 			((consp enc)
-			 (cdr (assq 'ideographic-structure enc))
+			 (or (cdr (assq 'ideographic-structure enc))
+			     (cdr (assq 'ideographic-structure@apparent enc)))
 			 )))
+	(setq enc-str
+	      (mapcar (lambda (cell)
+			(or (and (listp cell)
+				 (find-char cell))
+			    cell))
+		      enc-str))
 	(cond
 	 ((eq (car enc-str) ?⿱)
 	  (cond
@@ -1562,7 +1570,8 @@ COMPONENT can be a character or char-spec."
 	    )
 	   ((and (characterp (nth 2 enc-str))
 		 (memq (char-ucs (nth 2 enc-str))
-		       '(#x706C
+		       '(#x4E00
+			 #x706C
 			 #x65E5 #x66F0 #x5FC3
 			 #x2123C #x58EC #x738B #x7389)))
 	    (unless conversion-only