X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=9a7e22b646878deb48eab9afb9d67319f9637fc8;hb=02cc46ca419f143263039b722f802717cfd45c84;hp=6ad87e44c6527f4314aa332a74ef61977e81b68e;hpb=dd1b36839d6043becd6b7d479f594eb86ac36797;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 6ad87e4..9a7e22b 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -168,7 +168,18 @@
 	      t)
 	  (if (<= (charset-id kb) 1)
 	      nil
-	    (< (charset-id ka)(charset-id kb))))
+	    (cond
+	     ((and (charset-final ka)
+		   (>= (charset-final ka) ?@))
+	      (if (and (charset-final kb)
+		       (>= (charset-final kb) ?@))
+		  (< (charset-final ka)(charset-final kb))
+		t))
+	     ((and (charset-final kb)
+		   (>= (charset-final kb) ?@))
+	      nil)
+	     (t
+	      (< (charset-id ka)(charset-id kb))))))
       nil))
    ((find-charset kb)
     t)
@@ -469,8 +480,12 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(shinjigen-1 shinjigen-2))
+    (cond ((memq name '(=shinjigen
+			=shinjigen@1ed
+			=shinjigen@rev =shinjigen/+p@rev))
 	   "(%-18s .  %04d)\t; %c")
+	  ((eq name '=shinjigen@1ed/24pr)
+	   "(%-18s . %04d)\t; %c")
 	  ((or (memq name '(=daikanwa
 			    =daikanwa@rev1 =daikanwa@rev2
 			    =gt =gt-k =cbeta =zinbun-oracle))
@@ -534,7 +549,9 @@
 	(setq required-features nil)
 	(dolist (source sources)
 	  (cond
-	   ((memq source '(JP JP/Jouyou shinjigen-1))
+	   ((memq source '(JP
+			   JP/Jouyou
+			   shinjigen shinjigen@1ed shinjigen@rev))
 	    (setq required-features
 		  (union required-features
 			 '(=jis-x0208
@@ -543,7 +560,8 @@
 			   =jis-x0213-2-2000
 			   =jis-x0212
 			   =jis-x0208@1983
-			   =jis-x0208@1978))))
+			   =jis-x0208@1978
+			   =shinjigen))))
 	   ((eq source 'CN)
 	    (setq required-features
 		  (union required-features