Seiji Zenitani
zenit****@users*****
2005年 12月 6日 (火) 20:55:16 JST
Index: CarbonEmacsPackage/GPL/mac/carbon-font.el diff -u CarbonEmacsPackage/GPL/mac/carbon-font.el:1.4 CarbonEmacsPackage/GPL/mac/carbon-font.el:1.5 --- CarbonEmacsPackage/GPL/mac/carbon-font.el:1.4 Sun Nov 20 23:36:42 2005 +++ CarbonEmacsPackage/GPL/mac/carbon-font.el Tue Dec 6 20:55:16 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_4 -;; 2005-11-20 +;; Version 1_5_3 +;; 2005-11-17 ;;; Commentary: @@ -128,14 +128,13 @@ ;; ;; 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 . "hiragino maru gothic pro") -;; (katakana-jisx0201 . "hiragino maru gothic pro") -;; (thai-tis620 . "ayuthaya") -;; (chinese-gb2312 . "stheiti*") -;; (chinese-big5-1 . "lihei pro*") -;; (korean-ksc5601 . "applegothic*"))) +;; (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*"))) ;; ;; (carbon-font-create-fontset "courier" ;; carbon-font-defined-sizes @@ -255,11 +254,10 @@ ;; ;; (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*") +;; (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*"))) ;; ;; $BEy$HDj5A$7$F$*$$$F!"(B @@ -300,19 +298,19 @@ (require 'fixed-width-fontset) (defvar fixed-width-encode-reg-alist - '((japanese-jisx0208 . "iso10646-*") - (katakana-jisx0201 . "iso10646-*") + '((japanese-jisx0208 . "jisx0208.*") + (katakana-jisx0201 . "jisx0201.*") (japanese-jisx0212 . "iso10646-*") (thai-tis620 . "iso10646-*") - (chinese-gb2312 . "iso10646-*") - (chinese-big5-1 . "iso10646-*") - (korean-ksc5601 . "iso10646-*") + (chinese-gb2312 . "gb2312.*") + (chinese-big5-1 . "big5-*") + (korean-ksc5601 . "ksc5601.*") (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-*-*-*-*-*-iso10646-1") + "-apple-%s-medium-r-normal--%d-*-*-*-*-*-mac-roman") (defalias 'fixed-width-create-fontset-func 'create-fontset-from-mac-roman-font) @@ -330,13 +328,13 @@ (defvar carbon-font-encode-family-list-hiraginomaru `((ascii . "monaco") - (japanese-jisx0208 . "hiragino maru gothic pro") - (katakana-jisx0201 . "hiragino maru gothic pro") + (japanese-jisx0208 . "$B%R%i%.%N4]%4(B*") + (katakana-jisx0201 . "$B%R%i%.%N4]%4(B*") (japanese-jisx0212 . "hiragino maru gothic pro") (thai-tis620 . "ayuthaya") - (chinese-gb2312 . "stheiti*") - (chinese-big5-1 . ,(if (x-list-fonts "*apple ligothic*") - "apple ligothic*" "lihei pro*")) + (chinese-gb2312 . "$A;*ND:ZLe(B*") + (chinese-big5-1 . ,(if (x-list-fonts "*apple ligothic medium*") + "apple ligothic medium*" "$(0\cE*(B*")) (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "hiraginomaru" @@ -349,12 +347,12 @@ (defvar carbon-font-encode-family-list-hiraginokaku `((ascii . "monaco") - (japanese-jisx0208 . "hiragino kaku gothic pro") - (katakana-jisx0201 . "hiragino kaku gothic pro") + (japanese-jisx0208 . "$B%R%i%.%N3Q%4(B*") + (katakana-jisx0201 . "$B%R%i%.%N3Q%4(B*") (japanese-jisx0212 . "hiragino kaku gothic pro") (thai-tis620 . "ayuthaya") - (chinese-gb2312 . ,(if (x-list-fonts "*-hei-*") "hei*" "stheiti*")) - (chinese-big5-1 . "lihei pro*") + (chinese-gb2312 . ,(if (x-list-fonts "*$A;*NDO8:Z(B*") "$A;*NDO8:Z(B*" "$A;*ND:ZLe(B*")) + (chinese-big5-1 . "$(0\cE*(B*") (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "hiraginokaku" @@ -367,11 +365,11 @@ (defvar carbon-font-encode-family-list-hiraginomin `((ascii . "courier") - (japanese-jisx0208 . "hiragino mincho pro") - (katakana-jisx0201 . "hiragino mincho pro") + (japanese-jisx0208 . "$B%R%i%.%NL ＠ D+(B*") + (katakana-jisx0201 . "$B%R%i%.%NL ＠ D+(B*") (japanese-jisx0212 . "hiragino mincho pro") - (chinese-gb2312 . ,(if (x-list-fonts "*stkaiti*") "stkaiti*" "stheiti*")) - (chinese-big5-1 . ,(if (x-list-fonts "*lisong pro*") "lisong pro*" "lihei 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*")) (korean-ksc5601 . ,(if (x-list-fonts "*applemyungjo*") "applemyungjo*" "applegothic*")))) @@ -388,8 +386,8 @@ (japanese-jisx0208 . "osaka") (katakana-jisx0201 . "osaka") (japanese-jisx0212 . "osaka") - (chinese-gb2312 . "stheiti*") - (chinese-big5-1 . "lihei pro*") + (chinese-gb2312 . "$A;*ND:ZLe(B*") + (chinese-big5-1 . "$(0\cE*(B*") (korean-ksc5601 . "applegothic*"))) (carbon-font-create-fontset "osaka" @@ -404,7 +402,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.35) ("9" . 1.35) ("10" . 1.2) ("12" . 1.2) + '(("7" . 1.15) ("8" . 1.3) ("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 @@ -424,20 +422,26 @@ ("14" . 0.9) ("16" . 0.95) ("18" . 0.9) ("20" . 0.95) ("24" . 0.92))) (defvar fixed-width-get-scale-alist - `((".*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))) + `((".*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))) (".*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-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)) + ("^-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)) "ReScale factor alist for each fonts and size.") (provide 'carbon-font) Index: CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el diff -u CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.4 CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.5 --- CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.4 Thu Nov 24 23:34:42 2005 +++ CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el Tue Dec 6 20:55:16 2005 @@ -100,7 +100,7 @@ (frm-font (frame-parameter frame 'font)) (def-font (cdr (assoc 'font default-frame-alist))) (fontset (or init-font frm-font def-font "fontset-default")) - (asc (if (x-list-fonts fontset) fontset (fontset-font fontset ?a))) + (asc (if (fontset-name-p fontset) (fontset-font fontset ?a) fontset)) (size (aref (x-decompose-font-name asc) xlfd-regexp-pixelsize-subnum))) (dolist (elt fixed-width-get-scale-alist) (let* ((font (car elt))
