(U+2D63E): Use "⿴午x" instead of "⿻午x".

[chise/ids.git] / ids-find.el

diff --git a/ids-find.el b/ids-find.el
index 1789b0c..181e948 100644 (file)
--- a/ids-find.el
+++ b/ids-find.el
@@ -1,6 +1,6 @@
 ;;; ids-find.el --- search utility based on Ideographic-structures
 
-;; Copyright (C) 2002,2003,2005,2006,2007,2017 MORIOKA Tomohiko
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2017, 2020 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: Kanji, Ideographs, search, IDS, CHISE, UCS, Unicode
@@ -54,6 +54,11 @@
      (ids-index-store-structure c v)
      nil)
    'ideographic-structure)
+  (map-char-attribute
+   (lambda (c v)
+     (ids-index-store-structure c v)
+     nil)
+   'ideographic-structure@apparent)
   (save-char-attribute-table 'ideographic-products))
 
 
@@ -74,8 +79,12 @@
       (when (string-match "^<-.*[@/]component\\(/[^*/]+\\)*$"
                          (symbol-name feature))
        (push feature dest)))
-    (cons '<-ideographic-component-forms
-         dest)))
+    (list* '<-mistakable '->mistakable
+          '<-formed '->formed
+          '<-same '->same
+          '<-original '->original
+          '<-ancient '->ancient
+          dest)))
 
 (defun to-component-features ()
   (let (dest)
@@ -83,8 +92,7 @@
       (when (string-match "^->.*[@/]component\\(/[^*/]+\\)*$"
                          (symbol-name feature))
        (push feature dest)))
-    (cons '->ideographic-component-forms
-         dest)))
+    dest))
 
 ;;;###autoload
 (defun char-component-variants (char)
@@ -281,7 +289,7 @@
              v)))
 
 (defun ids-insert-chars-including-components* (components
-                                             &optional level ignored-chars)
+                                              &optional level ignored-chars)
   (unless level
     (setq level 0))
   (let (is i as bs)
@@ -395,12 +403,11 @@
   (with-current-buffer (get-buffer-create ids-find-result-buffer)
     (setq buffer-read-only nil)
     (erase-buffer)
-    (let (ucs jis)
-      (map-char-attribute
-       (lambda (c v)
-        (when (ideographic-structure-repertoire-p v components)
-          (insert (ids-find-format-line c v))))
-       'ideographic-structure))
+    (map-char-attribute
+     (lambda (c v)
+       (when (ideographic-structure-repertoire-p v components)
+        (insert (ids-find-format-line c v))))
+     'ideographic-structure)
     (goto-char (point-min)))
   (view-buffer ids-find-result-buffer))