X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=66d3995c005a14f3f29aca74337c79124f4e49c5;hb=516dead98e8c8515487bec5c474c3f0a2299f907;hp=f427369f514f0e24e20aaafa7b830155b0bc5488;hpb=1b12d8beaea055d9469a11e04ee763828e7a000d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index f427369..66d3995 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -127,9 +127,9 @@
     greek-iso8859-7
     thai-tis620
     =jis-x0208
-    japanese-jisx0208
+    =jis-x0208@1978
+    =jis-x0208@1983
     japanese-jisx0212
-    japanese-jisx0208-1978
     chinese-gb2312
     chinese-cns11643-1
     chinese-cns11643-2
@@ -138,7 +138,7 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0208-1990
+    =jis-x0208@1990
     =jis-x0213-1-2000
     =jis-x0213-2-2000
     korean-ksc5601
@@ -165,9 +165,10 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =gt-k
+    =ucs@unicode
     =big5
     =big5-eten
-    =gt-k
     =jis-x0208@1997
     =jef-china3))
 
@@ -204,6 +205,8 @@
 					 =daikanwa@rev2
 					 ;; =gt-k
 					 )))
+			     (setq ccs (charset-name ccs))
+			     (null (assq ccs char-spec))
 			     (setq ret (encode-char char ccs 'defined-only)))
 			(setq char-spec (cons (cons ccs ret) char-spec))))
 		  (if (null char-spec)
@@ -621,19 +624,18 @@
       )
     (let (key)
       (dolist (domain
-	       ;; char-db-feature-domains
-	       (let* ((dest char-db-feature-domains)
-		      (dlast (last dest))
-		      domain)
-		 (dolist (feature (char-attribute-list))
-		   (setq feature (symbol-name feature))
-		   (when (string-match
-			  "\\(radical\\|strokes\\)@\\([^@*]+\\)\\(\\*\\|$\\)"
-			  feature)
-		     (setq domain (intern (match-string 2 feature)))
+	       (append
+		char-db-feature-domains
+		(let (dest domain)
+		  (dolist (feature (char-attribute-list))
+		    (setq feature (symbol-name feature))
+		    (when (string-match
+			   "\\(radical\\|strokes\\)@\\([^@*]+\\)\\(\\*\\|$\\)"
+			   feature)
+		      (setq domain (intern (match-string 2 feature)))
 		     (unless (memq domain dest)
-		       (setcdr dlast (setq dlast (list domain))))))
-		 dest))
+		       (setq dest (cons domain dest)))))
+		  (sort dest #'string<))))
 	(setq key (intern (format "%s@%s" 'ideographic-radical domain)))
 	(when (and (memq key attributes)
 		   (setq value (get-char-attribute char key)))
@@ -1111,20 +1113,26 @@
 		      (let ((ucs (get-char-attribute char '->ucs)))
 			(if ucs
 			    (delete char (char-variants (int-char ucs)))))))
-	variant vs)
+	variant vs ret)
     (setq variants (sort variants #'<))
     (while variants
       (setq variant (car variants))
-      (if (and (or (null script)
-		   (null (setq vs (get-char-attribute variant 'script)))
-		   (memq script vs))
-	       (or (null excluded-script)
-		   (null (setq vs (get-char-attribute variant 'script)))
-		   (not (memq excluded-script vs))))
-	  (or (and no-ucs-unified (get-char-attribute variant '=ucs))
-	      (insert-char-data variant printable)))
-      (setq variants (cdr variants))
-      )))
+      (unless (get-char-attribute variant '<-subsumptive)
+	(if (and (or (null script)
+		     (null (setq vs (get-char-attribute variant 'script)))
+		     (memq script vs))
+		 (or (null excluded-script)
+		     (null (setq vs (get-char-attribute variant 'script)))
+		     (not (memq excluded-script vs))))
+	    (unless (and no-ucs-unified (get-char-attribute variant '=ucs))
+	      (insert-char-data variant printable)
+	      (if (setq ret (char-variants variant))
+		  (while ret
+		    (or (memq (car ret) variants)
+                        ;; (get-char-attribute (car ret) '<-subsumptive)
+			(setq variants (append variants (list (car ret)))))
+		    (setq ret (cdr ret)))))))
+      (setq variants (cdr variants)))))
 
 (defun insert-char-range-data (min max &optional script excluded-script)
   (let ((code min)