From: tomo <tomo>
Date: Mon, 12 Apr 2004 05:51:25 +0000 (+0000)
Subject: (insert-char-attributes): Add some CCSs corresponding with JP,
X-Git-Tag: r21-4-14-chise-0_21-26^2~46
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b0227b8f84dd1c383ac8812abaf90339134404;p=chise%2Fxemacs-chise.git-

(insert-char-attributes): Add some CCSs corresponding with JP,
JP/Jouyou and CN specified in {<-|->}FOO*sources into
required-features; add special code for {<-|->}FOO@CN to add Chinese
CCSs into required-features.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 94beb34..a5d8195 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -945,24 +945,45 @@
 				 (intern (format "%s*sources" name))))
 			  (setq required-features nil)
 			  (dolist (source sources)
-			    (setq required-features
-				  (cons
-				   (if (find-charset
-					(setq ret (intern
-						   (format "=%s" source))))
-				       ret
-				     source)
-				   required-features)))
-			  (when (string-match "@JP" (symbol-name name))
-			    (setq required-features
-				  (union required-features
-					 '(=jis-x0208
-					   =jis-x0208-1990
-					   =jis-x0213-1-2000
-					   =jis-x0213-2-2000
-					   =jis-x0212
-					   =jis-x0208-1983
-					   =jis-x0208-1978))))
+			    (cond
+			     ((find-charset
+			       (setq ret (intern (format "=%s" source))))
+			      (setq required-features
+				    (cons ret required-features)))
+			     ((memq source '(JP JP/Jouyou))
+			      (setq required-features
+				    (union required-features
+					   '(=jis-x0208
+					     =jis-x0208-1990
+					     =jis-x0213-1-2000
+					     =jis-x0213-2-2000
+					     =jis-x0212
+					     =jis-x0208-1983
+					     =jis-x0208-1978))))
+			     ((eq source 'CN)
+			      (setq required-features
+				    (union required-features
+					   '(=gb2312
+					     =gb12345
+					     =iso-ir165))))
+			     (t (setq required-features
+				      (cons source required-features)))))
+			  (cond ((string-match "@JP" (symbol-name name))
+				 (setq required-features
+				       (union required-features
+					      '(=jis-x0208
+						=jis-x0208-1990
+						=jis-x0213-1-2000
+						=jis-x0213-2-2000
+						=jis-x0212
+						=jis-x0208-1983
+						=jis-x0208-1978))))
+				((string-match "@CN" (symbol-name name))
+				 (setq required-features
+				       (union required-features
+					      '(=gb2312
+						=gb12345
+						=iso-ir165)))))
 			  (if separator
 			      (insert lbs))
 			  (if readable