From: Kenichi Handa <handa@m17n.org>
Date: Tue, 30 Jun 2009 02:16:32 +0000 (+0000)
Subject: (setup-default-fontset): Add CJK fonts
X-Git-Tag: emacs-pretest-23.1.90~2384
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ad6626b5fa01472bc16878f50a7616f54250123;p=emacs.git

(setup-default-fontset): Add CJK fonts
for symbols and the other miscellaneous characters.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31a7c470515..f65bb546be7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2009-06-30  Kenichi Handa  <handa@m17n.org>
+
+	* international/fontset.el (setup-default-fontset): Add CJK fonts
+	for symbols and the other miscellaneous characters.
+
+	* language/korea-util.el (setup-korean-environment-internal): Make
+	char-widht-table suitable for Korean environments.
+	(exit-korean-environment): Cancel above.
+
+	* language/chinese.el ("Chinese-GB", "Chinese-BIG5")
+	("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK"): Add a
+	setup-funcion to make char-widht-table suitable for respective
+	environments, and an exit-function to cancel that.
+
+	* language/japan-util.el (setup-japanese-environment-internal):
+	Call use-cjk-char-width-table with arg `ja_JP'.
+
+	* international/characters.el (cjk-char-width-table): Delete it.
+	(cjk-char-width-table-list): New variable.
+	(use-cjk-char-width-table): New arg local-name.
+	(use-default-char-width-table): Fix for the case that Emacs is
+	already using the default char-width-table.
+
 2009-06-29  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-do-copy-or-rename-file-directly): Set file
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index d041f161cc6..fa7e8b1e117 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -565,6 +565,20 @@
      (cons (car math-subgroup) (nth 1 math-subgroup))
      (font-spec :registry "iso10646-1" :script (nth 2 math-subgroup))))
 
+  ;; Append CJK fonts for characters other than han, kana, cjk-misc.
+  ;;             CHARSET-REGISTRY  CHARSET            FROM-CODE TO-CODE
+  (let ((list '(("JISX0208.1983-0" japanese-jisx0208  #x2121    #x287E)
+		("GB2312.1980-0"   chinese-gb2312     #x2121    #x297E)
+		("BIG5-0"          big5               #xA140    #xA3FE)
+		("CNS11643.1992-1" chinese-cns11643-1 #x2121    #x427E)
+		("KSC5601.1987-0"  korean-ksc5601     #x2121    #x2C7E))))
+    (dolist (elt list)
+      (map-charset-chars
+       #'(lambda (range arg)
+	   (set-fontset-font "fontset-default" range
+			     (cons nil (car elt)) nil 'append))
+       (nth 1 elt) nil (nth 2 elt) (nth 3 elt))))
+
   ;; Append Unicode fonts.
   ;; This may find fonts with more variants (bold, italic) but which
   ;; don't cover many characters.