From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Mon, 19 Apr 2021 08:21:31 +0000 (+0900)
Subject: (ideographic-structure-compare-functional-and-apparent): In the
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=2aaea770d28ec7fbcbfea2dbc8ebee362b8c6230;p=chise%2Fids.git

(ideographic-structure-compare-functional-and-apparent): In the
rule-813, treat A-compU+2123C, A-compU+58EC and A-IWDSU+7389 as the
same as U+2123C/U+58EC/U+7389.
---

diff --git a/ids-find.el b/ids-find.el
index a4acb71..d6aff2d 100644
--- a/ids-find.el
+++ b/ids-find.el
@@ -1623,11 +1623,15 @@ COMPONENT can be a character or char-spec."
 		    code))
 	    )
 	   ((and (characterp (nth 2 enc-str))
-		 (memq (char-ucs (nth 2 enc-str))
-		       '(#x4E00
-			 #x706C
-			 #x65E5 #x66F0 #x5FC3
-			 #x2123C #x58EC #x738B #x7389)))
+		 (or (memq (char-ucs (nth 2 enc-str))
+			   '(#x4E00
+			     #x706C
+			     #x65E5 #x66F0 #x5FC3
+			     #x2123C #x58EC #x738B #x7389))
+		     (memq (encode-char (nth 2 enc-str) '=>ucs@component)
+			   '(#x2123C #x58EC))
+		     (eq (encode-char (nth 2 enc-str) '=>ucs@iwds-1)
+			 #x7389)))
 	    (unless conversion-only
 	      (setq f-res (ids-find-chars-including-ids enc-str)))
 	    (setq new-str (list ?â¿°