(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 (file)
--- 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