Takashi Hiromatsu
matsu****@users*****
2005年 11月 20日 (日) 22:53:51 JST
Index: fixed-width-fontset/Changelog diff -u fixed-width-fontset/Changelog:1.6 fixed-width-fontset/Changelog:1.7 --- fixed-width-fontset/Changelog:1.6 Thu Nov 17 23:00:52 2005 +++ fixed-width-fontset/Changelog Sun Nov 20 22:53:51 2005 @@ -1,3 +1,17 @@ +2005-11-20 Takashi HIROMATSU <matsu****@users*****> + + * carbon-font.el (fixed-width-encode-reg-alist): cjk registries + are set as iso10646. + (fixed-width-xlfd-template): ascii font is changed from mac-roman + to iso10646. + (carbon-font-encode-family-list-hiraginomaru): cjk fonts + registries are set as iso10646. + (carbon-font-encode-family-list-hiraginokaku): ditto + (carbon-font-encode-family-list-hiraginomin): ditto + (carbon-font-encode-family-list-osaka): ditto + (fixed-width-get-scale-alist): changed depend on fonts. + Doc. changed. + 2005-11-17 Takashi HIROMATSU <matsu****@users*****> * carbon-font.el: Doc. changed. Index: fixed-width-fontset/carbon-font.el diff -u fixed-width-fontset/carbon-font.el:1.7 fixed-width-fontset/carbon-font.el:1.8 --- fixed-width-fontset/carbon-font.el:1.7 Thu Nov 17 23:00:52 2005 +++ fixed-width-fontset/carbon-font.el Sun Nov 20 22:53:51 2005 @@ -1,8 +1,8 @@ ;;; carbon-font.el -- fontsets for Carbon Emacs -*- coding: iso-2022-7bit -*- ;; Copyright (C) 2004-2005 by T. Hiromatsu <matsu****@users*****> -;; Version 1_5_3 -;; 2005-11-17 +;; Version 1_5_4 +;; 2005-11-20 ;;; Commentary: @@ -128,13 +128,14 @@ ;; ;; example : courier and $B%R%i%.%N4]%4%7%C%/(B(hiragino maru gothic) ;; -;; (setq carbon-font-encode-family-list-courier -;; '((ascii . "courier") -;; (japanese-jisx0208 . "$B%R%i%.%N4]%4(B*") -;; (katakana-jisx0201 . "$B%R%i%.%N4]%4(B*") -;; (chinese-gb2312 . "$A;*$BJ8$(0E*$BBN(B*") -;; (chinese-big5-1 . "$BQ6$(0E*(B*") -;; (korean-ksc5601 . "applegothic*"))) +;; (setq carbon-font-encode-family-list-courier +;; '((ascii . "courier") +;; (japanese-jisx0208 . "hiragino maru gothic pro") +;; (katakana-jisx0201 . "hiragino maru gothic pro") +;; (thai-tis620 . "ayuthaya") +;; (chinese-gb2312 . "stheiti*") +;; (chinese-big5-1 . "lihei pro*") +;; (korean-ksc5601 . "applegothic*"))) ;; ;; (carbon-font-create-fontset "courier" ;; carbon-font-defined-sizes @@ -254,10 +255,11 @@ ;; ;; (setq carbon-font-encode-family-list-courier ;; '((ascii . "courier") -;; (japanese-jisx0208 . "$B%R%i%.%N4]%4(B*") -;; (katakana-jisx0201 . "$B%R%i%.%N4]%4(B*") -;; (chinese-gb2312 . "$A;*$BJ8$(0E*$BBN(B*") -;; (chinese-big5-1 . "$BQ6$(0E*(B*") +;; (japanese-jisx0208 . "hiragino maru gothic pro") +;; (katakana-jisx0201 . "hiragino maru gothic pro") +;; (thai-tis620 . "ayuthaya") +;; (chinese-gb2312 . "stheiti*") +;; (chinese-big5-1 . "lihei pro*") ;; (korean-ksc5601 . "applegothic*"))) ;; ;; $BEy$HDj5A$7$F$*$$$F!"(B @@ -298,19 +300,19 @@ (require 'fixed-width-fontset) (defvar fixed-width-encode-reg-alist - '((japanese-jisx0208 . "jisx0208.*") - (katakana-jisx0201 . "jisx0201.*") + '((japanese-jisx0208 . "iso10646-*") + (katakana-jisx0201 . "iso10646-*") (japanese-jisx0212 . "iso10646-*") (thai-tis620 . "iso10646-*") - (chinese-gb2312 . "gb2312.*") - (chinese-big5-1 . "big5-*") - (korean-ksc5601 . "ksc5601.*") + (chinese-gb2312 . "iso10646-*") + (chinese-big5-1 . "iso10646-*") + (korean-ksc5601 . "iso10646-*") (latin-iso8859-1 . "mac-roman") (latin-iso8859-2 . "mac-centraleurroman") (cyrillic-iso8859-5 . "mac-cyrillic"))) (defvar fixed-width-xlfd-template - "-apple-%s-medium-r-normal--%d-*-*-*-*-*-mac-roman") + "-apple-%s-medium-r-normal--%d-*-*-*-*-*-iso10646-1") (defalias 'fixed-width-create-fontset-func 'create-fontset-from-mac-roman-font) @@ -328,13 +330,13 @@ (defvar carbon-font-encode-family-list-hiraginomaru `((ascii . "monaco") - (japanese-jisx0208 . "$B%R%i%.%N4]%4(B*") - (katakana-jisx0201 . "$B%R%i%.%N4]%4(B*") + (japanese-jisx0208 . "hiragino maru gothic pro") + (katakana-jisx0201 . "hiragino maru gothic pro") (japanese-jisx0212 . "hiragino maru gothic pro") (thai-tis620 . "ayuthaya") - (chinese-gb2312 . "$A;*ND:ZLe(B*") - (chinese-big5-1 . ,(if (x-list-fonts "*apple ligothic medium*") - "apple ligothic medium*" "$(0\cE*(B*")) + (chinese-gb2312 . "stheiti*") + (chinese-big5-1 . ,(if (x-list-fonts "*apple ligothic*") + "apple ligothic*" "lihei pro*")) (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "hiraginomaru" @@ -347,12 +349,12 @@ (defvar carbon-font-encode-family-list-hiraginokaku `((ascii . "monaco") - (japanese-jisx0208 . "$B%R%i%.%N3Q%4(B*") - (katakana-jisx0201 . "$B%R%i%.%N3Q%4(B*") + (japanese-jisx0208 . "hiragino kaku gothic pro") + (katakana-jisx0201 . "hiragino kaku gothic pro") (japanese-jisx0212 . "hiragino kaku gothic pro") (thai-tis620 . "ayuthaya") - (chinese-gb2312 . ,(if (x-list-fonts "*$A;*NDO8:Z(B*") "$A;*NDO8:Z(B*" "$A;*ND:ZLe(B*")) - (chinese-big5-1 . "$(0\cE*(B*") + (chinese-gb2312 . ,(if (x-list-fonts "*-hei-*") "hei*" "stheiti*")) + (chinese-big5-1 . "lihei pro*") (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "hiraginokaku" @@ -365,11 +367,11 @@ (defvar carbon-font-encode-family-list-hiraginomin `((ascii . "courier") - (japanese-jisx0208 . "$B%R%i%.%NL ＠ D+(B*") - (katakana-jisx0201 . "$B%R%i%.%NL ＠ D+(B*") + (japanese-jisx0208 . "hiragino mincho pro") + (katakana-jisx0201 . "hiragino mincho pro") (japanese-jisx0212 . "hiragino mincho pro") - (chinese-gb2312 . ,(if (x-list-fonts "*$A;*NDKNLe(B*") "$A;*NDKNLe(B*" "$A;*ND:ZLe(B*")) - (chinese-big5-1 . ,(if (x-list-fonts "*$(0\c+{(B*") "$(0\c+{(B*" "$(0\cE*(B*")) + (chinese-gb2312 . ,(if (x-list-fonts "*stkaiti*") "stkaiti*" "stheiti*")) + (chinese-big5-1 . ,(if (x-list-fonts "*lisong pro*") "lisong pro*" "lihei pro*")) (korean-ksc5601 . ,(if (x-list-fonts "*applemyungjo*") "applemyungjo*" "applegothic*")))) @@ -386,8 +388,8 @@ (japanese-jisx0208 . "osaka") (katakana-jisx0201 . "osaka") (japanese-jisx0212 . "osaka") - (chinese-gb2312 . "$A;*ND:ZLe(B*") - (chinese-big5-1 . "$(0\cE*(B*") + (chinese-gb2312 . "stheiti*") + (chinese-big5-1 . "lihei pro*") (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "osaka" @@ -402,7 +404,7 @@ ;; $B%\!<%k%I$r%j%9%1!<%k$9$k0Y$N%U%!%/%?!<$NDj5A(B (defvar fixed-width-scale-alist-hiragino - '(("7" . 1.15) ("8" . 1.3) ("9" . 1.35) ("10" . 1.2) ("12" . 1.2) + '(("7" . 1.15) ("8" . 1.35) ("9" . 1.35) ("10" . 1.2) ("12" . 1.2) ("14" . 1.2) ("16" . 1.25) ("18" . 1.25) ("20" . 1.2) ("24" . 1.2))) (defvar fixed-width-scale-alist-two-byte-bold @@ -422,26 +424,20 @@ ("14" . 0.9) ("16" . 0.95) ("18" . 0.9) ("20" . 0.95) ("24" . 0.92))) (defvar fixed-width-get-scale-alist - `((".*monaco-bold.*" . ,fixed-width-scale-alist-monaco-bold) - (".*monaco cy-bold.*" . ,fixed-width-scale-alist-monaco-bold) - (".*courier-bold.*" . (( "9" . 0.9) ("10" . 0.9))) + `((".*monaco-bold-.*-mac-roman" . ,fixed-width-scale-alist-monaco-bold) + (".*monaco cy-bold-.*-mac-cyrillic" . ,fixed-width-scale-alist-monaco-bold) + (".*courier-bold-.*-mac-roman" . (( "9" . 0.9) ("10" . 0.9))) (".*osaka-medium.*" . ,fixed-width-scale-alist-osaka-normal) (".*osaka-bold.*" . ,fixed-width-scale-alist-osaka-bold) - ("^-apple-.*pro w[34]-.*" . ,fixed-width-scale-alist-hiragino) - ("^-apple-.*pro w[34]-.*" . ,fixed-width-scale-alist-hiragino) ("^-apple-hiragino.*" . ,fixed-width-scale-alist-hiragino) - ("^-apple-.*-bold-[ri]-normal-.*-gb2312\.1980-0$" . - ,fixed-width-scale-alist-two-byte-bold) - ("^-apple-.*-medium-[ri]-normal-.*-gb2312\.1980-0$" . - ,fixed-width-scale-alist-hiragino) - ("^-apple-.*-bold-[ri]-normal-.*-big5.*" . - ,fixed-width-scale-alist-two-byte-bold) - ("^-apple-.*-medium-[ri]-normal-.*-big5.*" . - ,fixed-width-scale-alist-hiragino) - ("^-apple-.*-bold-[ri]-normal-.*-ksc5601.*" . - ,fixed-width-scale-alist-two-byte-bold) - ("^-apple-.*-medium-[ri]-normal-.*-ksc5601.*" . - ,fixed-width-scale-alist-hiragino)) + ("^-apple-stheiti-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-lihei pro-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-applegothic-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-applemyungjo-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-lisong pro-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-stkaiti-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-hei-.*" . ,fixed-width-scale-alist-hiragino) + ("^-apple-apple ligothic-.*" . ,fixed-width-scale-alist-hiragino)) "ReScale factor alist for each fonts and size.") (provide 'carbon-font)
