From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Sun, 1 Nov 2020 14:22:32 +0000 (+0900)
Subject: (ideographic-structure-compare-functional-and-apparent):
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23db9cfb9450233e212a52c90f7afe55469e4d45;p=chise%2Fids.git

(ideographic-structure-compare-functional-and-apparent):
- Implement rule-421: ⿴⿰AAC -> ⿲ACA.
- Implement rule-422: ⿴⿰LRC -> ⿰L⿰CR.
---

diff --git a/ids-find.el b/ids-find.el
index c7276b7..c58d022 100644
--- a/ids-find.el
+++ b/ids-find.el
@@ -1194,7 +1194,50 @@ COMPONENT can be a character or char-spec."
 		    (list ?⿱  new-str-c (nth 3 enc-str))
 		    419))
 	    ))
-	  )))
+	  )
+	 ((eq (car enc-str) ?â¿°)
+	  (cond
+	   ((equal (nth 1 enc-str)(nth 2 enc-str))
+	    (unless conversion-only
+	      (setq f-res (ids-find-chars-including-ids enc-str)))
+	    (setq new-str (list ?⿲
+				(nth 1 enc-str)
+				(nth 2 structure)
+				(nth 2 enc-str)))
+	    (setq new-str-c
+		  (list (cons 'ideographic-structure new-str)))
+	    (if conversion-only
+		new-str
+	      (setq a-res (ids-find-chars-including-ids new-str))
+	      (list enc
+		    f-res
+		    new-str-c
+		    a-res
+		    new-str
+		    421))
+	    )
+	   (t
+	    (unless conversion-only
+	      (setq f-res (ids-find-chars-including-ids enc-str)))
+	    (setq new-str (list ?â¿°
+				(nth 2 structure)
+				(nth 2 enc-str)))
+	    (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)
+		    422))
+	    ))
+	  ))
+	)
       )
      ((eq (car structure) ?⿶)
       (setq enc (nth 1 structure))