(J0-652F): Moved into U+7D72.

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

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 042c87b..2fc4402 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -474,18 +474,15 @@
            (unless (memq char checked)
              (catch 'tag
                (let ((rest
-                      (append (get-char-attribute char '<-subsumptive)
-                              (get-char-attribute char '<-denotational)))
+                      (append (get-char-attribute char '->subsumptive)
+                              (get-char-attribute char '->denotational)))
                      (i 0)
                      sc)
                  (setq checked (cons char checked))
                  (while rest
                    (setq sc (car rest))
-                   (when (setq ret (char-daikanwa sc radical checked))
-                     (throw 'tag
-                            (if (numberp ret)
-                                (list ret 0 i)
-                              (append ret (list i)))))
+                   (if (setq ret (char-daikanwa sc radical checked))
+                       (throw 'tag ret))
                    (setq checked (cons sc checked)
                          rest (cdr rest)
                          i (1+ i)))
@@ -500,12 +497,15 @@
                    (setq checked (cons sc checked)
                          rest (cdr rest)))
                  (setq rest
-                       (append (get-char-attribute char '->subsumptive)
-                               (get-char-attribute char '->denotational)))
+                       (append (get-char-attribute char '<-subsumptive)
+                               (get-char-attribute char '<-denotational)))
                  (while rest
                    (setq sc (car rest))
-                   (if (setq ret (char-daikanwa sc radical checked))
-                       (throw 'tag ret))
+                   (when (setq ret (char-daikanwa sc radical checked))
+                     (throw 'tag
+                            (if (numberp ret)
+                                (list ret 0 i)
+                              (append ret (list i)))))
                    (setq checked (cons sc checked)
                          rest (cdr rest))))))))))
 
@@ -558,7 +558,8 @@
 
 (defun write-ideograph-radical-char-data (radical file)
   (if (file-directory-p file)
-      (let ((name (get-char-attribute (int-char (+ #x2EFF radical)) 'name)))
+      (let ((name (char-feature (decode-char 'ucs (+ #x2EFF radical))
+                               'name)))
        (if (string-match "KANGXI RADICAL " name)
            (setq name (capitalize (substring name (match-end 0)))))
        (setq name (mapconcat (lambda (char)
@@ -570,11 +571,11 @@
               (format "Ideograph-R%03d-%s.el" radical name)
               file))))
   (with-temp-buffer
-    (insert ";; -*- coding: utf-8-mcs -*-\n")
+    (insert (format ";; -*- coding: %s -*-\n"
+                   char-db-file-coding-system))
     (insert-ideograph-radical-char-data radical)
-    (let ((coding-system-for-write 'utf-8-mcs))
-      (write-region (point-min)(point-max) file)
-      )))
+    (let ((coding-system-for-write char-db-file-coding-system))
+      (write-region (point-min)(point-max) file))))
 
 (defun ideographic-structure= (char1 char2)
   (if (char-ref-p char1)