Mercurial > emacs
changeset 90686:5b24bb105d42
(font-encoding-alist): Add gb18030.
(setup-default-fontset): Likewise.
(x-pixel-size-width-font-regexp, vertical-centering-font-regexp):
Add gbk and gb18030.
(charset-script-alist): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 27 Nov 2006 04:43:04 +0000 |
| parents | b3c13217d55b |
| children | 918439636cee |
| files | lisp/international/fontset.el |
| diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/fontset.el Mon Nov 27 04:40:25 2006 +0000 +++ b/lisp/international/fontset.el Mon Nov 27 04:43:04 2006 +0000 @@ -50,6 +50,7 @@ ("iso8859-15$" . iso-8859-15) ("gb2312.1980" . chinese-gb2312) ("gbk" . chinese-gbk) + ("gb18030" . gb18030) ("jisx0208.1978" . japanese-jisx0208-1978) ("jisx0208" . japanese-jisx0208) ("jisx0201" . jisx0201) @@ -306,6 +307,7 @@ (nil . "CNS11643.1992-6") (nil . "CNS11643.1992-7") (nil . "gbk-0") + (nil . "gb18030") (nil . "JISX0213.2000-1") (nil . "JISX0213.2000-2") (nil . "JISX0213.2004-1")) @@ -323,6 +325,7 @@ (nil . "CNS11643.1992-6") (nil . "CNS11643.1992-7") (nil . "gbk-0") + (nil . "gb18030") (nil . "JISX0213.2000-1") (nil . "JISX0213.2000-2")) @@ -363,6 +366,8 @@ ;; Fallback fonts (nil (nil . "gb2312.1980") + (nil . "gbk-0") + (nil . "gb18030") (nil . "jisx0208") (nil . "ksc5601.1987") (nil . "CNS11643.1992-1") @@ -515,11 +520,11 @@ ;; Setting for suppressing XLoadQueryFont on big fonts. (setq x-pixel-size-width-font-regexp - "gb2312\\|jisx0208\\|ksc5601\\|cns11643\\|big5") + "gb2312\\|gbk\\|gb18030\\|jisx0208\\|ksc5601\\|cns11643\\|big5") ;; These fonts require vertical centering. (setq vertical-centering-font-regexp - "gb2312\\|jisx0208\\|jisx0212\\|ksc5601\\|cns11643\\|big5") + "gb2312\\|gbk\\|gb18030\\|jisx0208\\|jisx0212\\|ksc5601\\|cns11643\\|big5") ;; CDAC fonts are actually smaller than their design sizes. (setq face-font-rescale-alist @@ -723,6 +728,11 @@ (katakana-jisx0201 . kana) (chinese-gb2312 . han) (chinese-gbk . han) + (gb18030-2-byte . han) + (gb18030-4-byte-bmp . han) + (gb18030-4-byte-ext-1 . han) + (gb18030-4-byte-ext-2 . han) + (gb18030-4-byte-smp . han) (chinese-big5-1 . han) (chinese-big5-2 . han) (chinese-cns11643-1 . han)