From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Fri, 1 Oct 2021 13:33:42 +0000 (+0900)
Subject: (ideographic-structure-compare-functional-and-apparent): Implement
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=994bca837303d1238f0b9ebe712804696d22e398;p=chise%2Fids.git

(ideographic-structure-compare-functional-and-apparent): Implement
rule-640: ⿵⿵EML -> ⿵E⿱ML.
---

diff --git a/ids-find.el b/ids-find.el
index fa6ee5e..0ef26a5 100644
--- a/ids-find.el
+++ b/ids-find.el
@@ -1571,9 +1571,29 @@ COMPONENT can be a character or char-spec."
 		    new-str-c
 		    a-res
 		    (list ?⿲ (nth 1 enc2-str) new-str-c (nth 2 enc2-str))
-		    630))
-	    )
-	  )))
+		    630)))
+	  )
+	 ((eq (car enc-str) ?⿵)
+	  (unless conversion-only
+	    (setq f-res (ids-find-chars-including-ids enc-str)))
+	  (setq new-str (list ?⿱
+			      (nth 2 enc-str)
+			      (nth 2 structure)))
+	  (setq new-str-c
+		(if (setq ret (ideographic-structure-find-chars new-str))
+		    (car ret)
+		  (list (cons 'ideographic-structure new-str))))
+	  (if conversion-only
+	      (list ?⿵ (nth 1 enc-str) new-str-c)
+	    (setq a-res (ids-find-chars-including-ids new-str))
+	    (list enc
+		  f-res
+		  new-str-c
+		  a-res
+		  (list ?⿵ (nth 1 enc-str) new-str-c)
+		  640))
+	  )
+	 ))
       )
      ((eq (car structure) ?â¿·)
       (setq enc (nth 1 structure))