X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fideograph-util.el;h=b051ead70def4805e54a44abf41869d7877b0ab5;hb=837afae9d3cc9630a1128c5f3bb5f85dbacf5113;hp=4907d9ae3f736a1d03f5ccc4d1a468721bee98f3;hpb=2b2669155e23384dfdb5691e302fae746a1a7fd3;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index 4907d9a..b051ead 100644
--- 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)