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

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 6ad87e4..232904a 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008 MORIOKA Tomohiko.
+;;   2007, 2008, 2009 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -155,18 +155,56 @@
     )
    ((find-charset ka)
     (if (find-charset kb)
-	(if (<= (charset-id ka) 1)
-	    (if (<= (charset-id kb) 1)
+	(if (or (<= (charset-id ka) 1)
+		(and (charset-final ka)
+		     (>= (charset-final ka) ?@)))
+	    (if (or (<= (charset-id kb) 1)
+		    (and (charset-final kb)
+			 (>= (charset-final kb) ?@)))
 		(cond
 		 ((= (charset-dimension ka)
 		     (charset-dimension kb))
-		  (> (charset-id ka)(charset-id kb)))
+		  (if (and (<= (charset-id ka) 1)
+			   (<= (charset-id kb) 1))
+		      (> (charset-id ka)(charset-id kb))
+		    (if (and (charset-final ka)
+			     (charset-final kb))
+			(cond
+			 ((= (charset-final ka)(charset-final kb))
+			  (if (<= (charset-id ka) 1)
+			      (if (<= (charset-id kb) 1)
+				  (> (charset-id ka)(charset-id kb))
+				t)
+			    (if (<= (charset-id kb) 1)
+				nil
+			      (< (charset-id ka)(charset-id kb))))
+			  )
+			 ((< (charset-final ka)(charset-final kb))
+			  ))
+		      (if (<= (charset-id ka) 1)
+			  (if (<= (charset-id kb) 1)
+			      (> (charset-id ka)(charset-id kb))
+			    t)
+			(if (<= (charset-id kb) 1)
+			    nil
+			  (cond ((and (charset-final ka)
+				      (>= (charset-final ka) ?@))
+				 t)
+				((and (charset-final kb)
+				      (>= (charset-final kb) ?@))
+				 nil)
+				(t
+				 (< (charset-id ka)(charset-id kb))
+				 ))))))
+		  )
 		 (t
 		  (> (charset-dimension ka)
 		     (charset-dimension kb))
 		  ))
 	      t)
-	  (if (<= (charset-id kb) 1)
+	  (if (or (<= (charset-id kb) 1)
+		  (and (charset-final kb)
+		       (>= (charset-final kb) ?@)))
 	      nil
 	    (< (charset-id ka)(charset-id kb))))
       nil))
@@ -287,6 +325,12 @@
 			((setq ret (get-char-attribute char 'name*))
 			 (setq char-spec (cons (cons 'name* ret) char-spec))
 			 ))
+		  )
+		 ((setq ret (get-char-attribute
+			     char 'ideographic-combination))
+		  (setq char-spec
+			(cons (cons 'ideographic-combination ret)
+			      char-spec))
 		  ))
 	   char-spec)
 	  ((consp char)
@@ -469,8 +513,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 +582,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 +593,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