X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=a305b3941f5553c821087fe407238ffa50b275e8;hb=1d84f738bfdc75ff76aa3a391034c389b52b36f6;hp=2b880e46189deae732ca3e80bb7f2d26418bd29f;hpb=a739c12c974209f70555393efc67e3b626f0270e;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 2b880e4..a305b39 100644
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -252,13 +252,20 @@
 ;;;###autoload
 (defun update-ideograph-radical-table ()
   (interactive)
-  (let (ret radical script dest)
+  (let (ret rret radical script dest)
     (dolist (feature
 	     (cons 'ideographic-radical
-		   (mapcar
-		    (lambda (domain)
-		      (intern (format "%s@%s" 'ideographic-radical domain)))
-		    char-db-feature-domains)))
+		   (progn
+		     (dolist (feature (char-attribute-list))
+		       (if (string-match "^ideographic-radical@[^@*]+$"
+					 (symbol-name feature))
+			   (setq dest (cons feature dest))))
+		     dest)
+                   ;; (mapcar
+                   ;;  (lambda (domain)
+                   ;;    (intern (format "%s@%s" 'ideographic-radical domain)))
+                   ;;  char-db-feature-domains)
+		   ))
       (map-char-attribute
        (lambda (chr radical)
 	 (dolist (char (append
@@ -270,7 +277,11 @@
 				(unless (eq (get-char-attribute
 					     pc 'ideographic-radical)
 					    radical)
-				  (setq dest (cons pc dest))))
+				  (if (setq rret
+					    (get-char-attribute
+					     pc '<-subsumptive))
+				      (setq ret (append ret rret))
+				    (setq dest (cons pc dest)))))
 			      dest)
 			  (list chr))
 			(let ((rest (append