Separate JIS X0213 characters from UCS characters.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / ideograph-util.el

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 2b880e4..a305b39 100644 (file)
--- 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