Sync up with r21-4-10-utf-2000-0_20-=gt-k.

[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 1bb7c38..39590bd 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -167,6 +167,7 @@
 ;;         ((null b) t)
 ;;         (t (< a b))))
 
+;;;###autoload
 (defun char-representative-of-daikanwa (char)
   (if (get-char-attribute char 'ideograph-daikanwa)
       char
@@ -236,8 +237,7 @@
 ;;;###autoload
 (defun char-ucs (char)
   (or (get-char-attribute char 'ucs)
-      (get-char-attribute char '=>ucs)
-      (get-char-attribute char '->ucs)))
+      (get-char-attribute char '=>ucs)))
 
 (defun char-id (char)
   (logand (char-int char) #x3FFFFFFF))
@@ -267,7 +267,11 @@
     (aset ideograph-radical-chars-vector radical chars)
     (dolist (char chars)
       (when (some (lambda (ccs)
-                   (encode-char char ccs))
+                   (let ((code (encode-char char ccs)))
+                     (and code
+                          ;;(not (memq ccs char-db-ignored-attributes))
+                          ;;(or (not (memq ccs '(ucs))
+                          (and (<= 0 code)(<= code #x10FFFF)))))
                  ccss)
        (insert-char-data char nil attributes ccss)))))
 
@@ -286,7 +290,6 @@
               file))))
   (with-temp-buffer
     (insert-ideograph-radical-char-data radical)
-    (char-db-update-comment)
     (let ((coding-system-for-write 'utf-8))
       (write-region (point-min)(point-max) file)
       )))