X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=ids-find.el;h=9c3ab87972dc623eb9ceafa8333f95ba5a327413;hb=a5d2bf6586454a5271eb50a137c357e33c47182c;hp=c0b18322a388ce5a42ab0d96a6cc5b24f46d1273;hpb=4d98e76d208bbca8e7af8bbde5a83a9ef489f522;p=chise%2Fids.git

diff --git a/ids-find.el b/ids-find.el
index c0b1832..9c3ab87 100644
--- a/ids-find.el
+++ b/ids-find.el
@@ -1,11 +1,11 @@
 ;;; ids-find.el --- search utility based on Ideographic-structures
 
-;; Copyright (C) 2002,2003,2005 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003,2005,2006 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: Kanji, Ideographs, search, IDS, CHISE, UCS, Unicode
 
-;; This file is a part of Tomoyo-Tools.
+;; This file is a part of CHISE IDS.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -25,14 +25,12 @@
 ;;; Code:
 
 (defun ids-index-store-char (product component)
-  (let ((ret (get-char-attribute ; char-feature
-	      component 'ideographic-products)))
+  (let ((ret (get-char-attribute 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))
+			  (cons product ret))
+      (when (setq ret (char-feature component 'ideographic-structure))
+	(ids-index-store-structure product ret)))
     ))
 
 (defun ids-index-store-structure (product structure)
@@ -44,8 +42,8 @@
 	     (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))
+	    ((setq ret (find-char cell))
+	     (ids-index-store-char product ret))
 	    ))))
 
 ;;;###autoload
@@ -70,65 +68,117 @@
       (setq dest (union dest (ids-find-all-products cell))))
     dest))
 
+(defun of-component-features ()
+  (let (dest)
+    (dolist (feature (char-attribute-list))
+      (when (string-match "^<-.*[@/]component\\(/[^*/]+\\)*$"
+			  (symbol-name feature))
+	(push feature dest)))
+    (cons '<-ideographic-component-forms
+	  dest)))
+
+(defun to-component-features ()
+  (let (dest)
+    (dolist (feature (char-attribute-list))
+      (when (string-match "^->.*[@/]component\\(/[^*/]+\\)*$"
+			  (symbol-name feature))
+	(push feature dest)))
+    (cons '->ideographic-component-forms
+	  dest)))
+
 ;;;###autoload
 (defun char-component-variants (char)
-  (let (dest ret uchr)
+  (let ((dest (list char))
+	ret uchr)
+    (dolist (feature (to-component-features))
+      (if (setq ret (get-char-attribute char feature))
+	  (dolist (c ret)
+	    (setq dest (union dest (char-component-variants c))))))
     (cond
-     ((setq ret (char-feature char '<-ideographic-component-forms))
-      (dolist (c ret)
-	(setq dest (union dest (char-component-variants c)))))
+     ;; ((setq ret (some (lambda (feature)
+     ;;                    (get-char-attribute char feature))
+     ;;                  (to-component-features)))
+     ;;  (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))))
+                          (some (lambda (feature)
+				  (get-char-attribute char feature))
+				(of-component-features))
+			  )))
       )
      ((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))))
+                          (some (lambda (feature)
+				  (get-char-attribute char feature))
+				(of-component-features))
+			  )))
       )
      (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)))
+      (map-char-family
+       (lambda (c)
+	 (unless (memq c dest)
+	   (setq dest (cons c dest)))
+	 (setq dest
+	       (union dest
+		      (some (lambda (feature)
+			      (char-feature c feature))
+			    (of-component-features))
+		      ))
+	 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 components (string-to-char-list (car components))))
+  (let (dest products)
+    (dolist (variant (char-component-variants (car components)))
+      (setq products
+	    (union products
+		   (get-char-attribute variant 'ideographic-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))
+    (while (and dest
+		(setq components (cdr components)))
+      (setq products nil)
+      (dolist (variant (char-component-variants (car components)))
+      (setq products
+	    (union products
+		   (get-char-attribute variant 'ideographic-products))))
+      (setq dest (intersection dest products)))
+    dest))
+;; (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)))
+;;       (setq products
+;;             (union products
+;;                    (get-char-attribute variant 'ideographic-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)
@@ -138,13 +188,17 @@
 		 (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))
+		 (some (lambda (feature)
+			 (some (lambda (b2)
+				 (unless (characterp b2)
+				   (setq b2 (find-char b2)))
+				 (and b2
+				      (ideographic-structure-char= c1 b2)))
+                               (char-feature c2 feature)
+			       ;; (get-char-attribute
+                               ;;  c2 '<-ideographic-component-forms)
+			       ))
+		       (of-component-features))
 		 (progn
 		   (setq m1 (car (get-char-attribute c1 '<-radical))
 			 m2 (car (get-char-attribute c2 '<-radical)))
@@ -225,25 +279,46 @@
 	  (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))
+(defun ids-insert-chars-including-components (components
+					      &optional level ignored-chars)
+  (unless level
+    (setq level 0))
+  (let (is dis i as bs)
+    (dolist (c (sort (copy-tree (ideographic-products-find components))
+		     (lambda (a b)
+		       (if (setq as (char-total-strokes a))
+			   (if (setq bs (char-total-strokes b))
+			       (if (= as bs)
+				   (ideograph-char< a b)
+				 (< as bs))
+			     t)
+			 (ideograph-char< a b)))))
+      (unless (memq c ignored-chars)
+	(setq is (char-feature c 'ideographic-structure))
 	(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))
-	)
-      )))
+	(setq ignored-chars
+	      (ids-insert-chars-including-components
+	       (char-to-string c) (1+ level)
+	       (cons c ignored-chars))))
+      ))
+  ignored-chars)
+;; (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))
+;;       (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)