(M17046): Separate U+6C18; add C6-2529.

[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 4907d9a..b051ead 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -61,6 +61,8 @@
                    japanese-jisx0208
                    japanese-jisx0208-1990
                    japanese-jisx0212
+                   japanese-jisx0213-1
+                   japanese-jisx0213-2
                    chinese-cns11643-1
                    chinese-cns11643-2
                    chinese-cns11643-3
@@ -156,18 +158,22 @@
                 nil)
                (t (< (car (cdr ra))(car (cdr rb))))))
         (t (< (car ra)(car rb)))))
-       ((setq ra (get-char-attribute a 'ucs))
-       (cond
-        ((setq rb (get-char-attribute b 'ucs))
-         (< ra rb))))
-       (t
-       (cond
-        ((setq ra (char-ideograph-strokes a))
-         (cond ((setq rb (char-ideograph-strokes b))
-                (cond ((= ra rb)
-                       (not (char-ideograph-strokes b)))
-                      ((< ra rb))))))
-        )))))))
+       (t)))
+     ((or (get-char-attribute b 'morohashi-daikanwa)
+         (get-char-attribute b 'non-morohashi))
+      nil)
+     ((setq ra (get-char-attribute a 'ucs))
+      (cond
+       ((setq rb (get-char-attribute b 'ucs))
+       (< ra rb))))
+     (t
+      (cond
+       ((setq ra (char-ideograph-strokes a))
+       (cond ((setq rb (char-ideograph-strokes b))
+              (cond ((= ra rb)
+                     (not (char-ideograph-strokes b)))
+                    ((< ra rb))))))
+       )))))
 
 (defun insert-ideograph-radical-char-data (radical)
   (let ((chars
@@ -192,7 +198,10 @@
               file))))
   (with-temp-buffer
     (insert-ideograph-radical-char-data radical)
-    (write-region (point-min)(point-max) file)))
+    (char-db-update-comment)
+    (let ((coding-system-for-write 'utf-8))
+      (write-region (point-min)(point-max) file)
+      )))
 
 (provide 'ideograph-util)