update.
[chise/ids.git] / ids-find.el
index 2af3021..c0b1832 100644 (file)
@@ -1,9 +1,9 @@
 ;;; ids-find.el --- search utility based on Ideographic-structures
 
-;; Copyright (C) 2002 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003,2005 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: Kanji, Ideographs, search, IDS
+;; Keywords: Kanji, Ideographs, search, IDS, CHISE, UCS, Unicode
 
 ;; This file is a part of Tomoyo-Tools.
 
 
 ;;; Code:
 
+(defun ids-index-store-char (product component)
+  (let ((ret (get-char-attribute ; char-feature
+             component 'ideographic-products)))
+    (unless (memq product ret)
+      (put-char-attribute component 'ideographic-products
+                         (cons product ret)))
+    ;; (when ret (setq ret (get-char-attribute ; char-feature
+    ;;                      component 'ideographic-structure))
+    ;;   (ids-index-store-structure product ret))
+    ))
+
+(defun ids-index-store-structure (product structure)
+  (let (ret)
+    (dolist (cell (cdr structure))
+      (if (char-ref-p cell)
+         (setq cell (plist-get cell :char)))
+      (cond ((characterp cell)
+            (ids-index-store-char product cell))
+           ((setq ret (assq 'ideographic-structure cell))
+            (ids-index-store-structure product (cdr ret)))
+            ;; ((setq ret (find-char cell))
+            ;;  (ids-index-store-char product ret))
+           ))))
+
+;;;###autoload
+(defun ids-update-index ()
+  (interactive)
+  (map-char-attribute
+   (lambda (c v)
+     (ids-index-store-structure c v)
+     nil)
+   'ideographic-structure)
+  (save-char-attribute-table 'ideographic-products))
+
+
+(mount-char-attribute-table 'ideographic-products)
+
+;;;###autoload
+(defun ids-find-all-products (char)
+  (let (dest)
+    (dolist (cell (char-feature char 'ideographic-products))
+      (unless (memq cell dest)
+       (setq dest (cons cell dest)))
+      (setq dest (union dest (ids-find-all-products cell))))
+    dest))
+
+;;;###autoload
+(defun char-component-variants (char)
+  (let (dest ret uchr)
+    (cond
+     ((setq ret (char-feature char '<-ideographic-component-forms))
+      (dolist (c ret)
+       (setq dest (union dest (char-component-variants c)))))
+     ((setq ret (get-char-attribute char '->ucs-unified))
+      (setq dest (cons char ret))
+      (dolist (c dest)
+       (setq dest (union dest
+                         (get-char-attribute
+                          c '->ideographic-component-forms))))
+      )
+     ((and (setq ret (get-char-attribute char '=>ucs))
+          (setq uchr (decode-char '=ucs ret)))
+      (setq dest (cons uchr (char-variants uchr)))
+      (dolist (c dest)
+       (setq dest (union dest
+                         (get-char-attribute
+                          c '->ideographic-component-forms))))
+      )
+     (t
+      (map-char-family (lambda (c)
+                        (unless (memq c dest)
+                          (setq dest (cons c dest)))
+                        (setq dest
+                              (union dest
+                                     (get-char-attribute
+                                      c '->ideographic-component-forms)))
+                        nil)
+                      char)))
+    dest))
+
+;;;###autoload
+(defun ideographic-products-find (&rest components)
+  (if (stringp (car components))
+      (setq components (car components)))
+  (let ((len (length components))
+       (i 1)
+       dest products)
+    (dolist (variant (char-component-variants (elt components 0)))
+      (dolist (product (get-char-attribute variant 'ideographic-products))
+       (unless (memq product products)
+         (setq products (cons product products)))))
+    (setq dest products)
+    (while (and
+           (< i len)
+           (progn
+             (setq products nil)
+             (dolist (variant (char-component-variants (elt components i)))
+               (dolist (product (get-char-attribute
+                                 variant 'ideographic-products))
+                 (unless (memq product products)
+                   (when (memq product dest)
+                     (setq products (cons product products))))))
+             (setq dest products)))
+      (setq i (1+ i)))
+    products))
+
+
 (defun ideographic-structure-char= (c1 c2)
   (or (eq c1 c2)
       (and c1 c2
                 (m2 (char-ucs c2)))
             (or (and m1 m2
                      (eq m1 m2))
+                (some (lambda (b2)
+                        (unless (characterp b2)
+                          (setq b2 (find-char b2)))
+                        (and b2
+                             (ideographic-structure-char= c1 b2)))
+                      (get-char-attribute
+                       c2 '<-ideographic-component-forms))
                 (progn
                   (setq m1 (car (get-char-attribute c1 '<-radical))
                         m2 (car (get-char-attribute c2 '<-radical)))
                   (unless (characterp m1)
-                    (setq m1 (or (find-char m1))))
+                    (setq m1 (find-char m1)))
                   (unless (characterp m2)
                     (setq m2 (find-char m2)))
                   (when (or m1 m2)
 ;;;###autoload
 (defun ideographic-structure-member (component structure)
   "Return non-nil if COMPONENT is included in STRUCTURE."
-  (or (progn
+  (or (memq component structure)
+      (progn
        (setq structure (cdr structure))
        (ideographic-structure-member-compare-components
         component (car structure)))
          (or (ideographic-structure-to-ids v)
              v)))
 
+(defun ids-insert-chars-including-components (components level)
+  (let (is dis i)
+    (dolist (c (ideographic-products-find components))
+      (setq is (char-feature c 'ideographic-structure))
+      ;; to avoid problems caused by wrong indexes
+      (when (every (lambda (cc)
+                    (ideographic-structure-member cc is))
+                  components)
+       ;;(ids-insert-chars-including-components (char-to-string c) (1+ level))
+       (setq i 0)
+       (while (< i level)
+         (insert "\t")
+         (setq i (1+ i)))
+       (insert (ids-find-format-line c is))
+       ;;(forward-line -1)
+       (ids-insert-chars-including-components
+        (char-to-string c) (1+ level))
+       )
+      )))
+
 ;;;###autoload
 (defun ids-find-chars-including-components (components)
   "Search Ideographs whose structures have COMPONENTS."
   (with-current-buffer (get-buffer-create ids-find-result-buffer)
     (setq buffer-read-only nil)
     (erase-buffer)
-    (map-char-attribute
-     (lambda (c v)
-       (when (every (lambda (p)
-                     (ideographic-structure-member p v))
-                   components)
-         (insert (ids-find-format-line c v)))
-       nil)
-     'ideographic-structure)
+    (ids-insert-chars-including-components components 0)
+    ;; (let (is dis)
+    ;;   (dolist (c (ideographic-products-find components))
+    ;;     (setq is (char-feature c 'ideographic-structure))
+    ;;     ;; to avoid problems caused by wrong indexes
+    ;;     ;; (when (every (lambda (cc)
+    ;;     ;;                (ideographic-structure-member cc is))
+    ;;     ;;              components)
+    ;;     (dolist (dc (ideographic-products-find (char-to-string c)))
+    ;;       (setq dis (char-feature dc 'ideographic-structure))
+    ;;     ;;     ;; to avoid problems caused by wrong indexes
+    ;;     ;;     (when (every (lambda (dcc)
+    ;;     ;;                    (ideographic-structure-member dcc is))
+    ;;     ;;                  components)
+    ;;       (insert "\t")
+    ;;       (insert (ids-find-format-line dc dis))
+    ;;       (forward-line -1)
+    ;;     ;;       )
+    ;;       )
+    ;;     (insert (ids-find-format-line c is))
+    ;;     (forward-line -1)
+    ;;     ;;   )
+    ;;     )
+    ;;   )
     (goto-char (point-min)))
   (view-buffer ids-find-result-buffer))
+;; (defun ids-find-chars-including-components (components)
+;;   "Search Ideographs whose structures have COMPONENTS."
+;;   (interactive "sComponents : ")
+;;   (with-current-buffer (get-buffer-create ids-find-result-buffer)
+;;     (setq buffer-read-only nil)
+;;     (erase-buffer)
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (when (every (lambda (p)
+;;                       (ideographic-structure-member p v))
+;;                     components)
+;;          (insert (ids-find-format-line c v)))
+;;        nil)
+;;      'ideographic-structure)
+;;     (goto-char (point-min)))
+;;   (view-buffer ids-find-result-buffer))
 
 ;;;###autoload
 (define-obsolete-function-alias 'ideographic-structure-search-chars
       (map-char-attribute
        (lambda (c v)
         (when (ideographic-structure-repertoire-p v components)
-          (insert
-           (ids-find-format-line c v)
-            ;; (format "%c\t%s\t%s\n"
-            ;;         c
-            ;;         (or
-            ;;          (when (setq ucs (char-ucs c))
-            ;;            (or
-            ;;             (when (setq jis
-            ;;                         (encode-char
-            ;;                          (decode-char
-            ;;                           'ucs-jis (char-ucs c))
-            ;;                          'japanese-jisx0208-1990))
-            ;;               (format "J0-%04X" jis))))
-            ;;          "")
-            ;;         (or (ideographic-structure-to-ids v)
-            ;;             v))
-           )))
+          (insert (ids-find-format-line c v))))
        'ideographic-structure))
     (goto-char (point-min)))
   (view-buffer ids-find-result-buffer))