Seiji Zenitani
zenit****@users*****
2005年 11月 1日 (火) 00:48:26 JST
Index: CarbonEmacsPackage/GPL/mac/carbon-font.el
diff -u CarbonEmacsPackage/GPL/mac/carbon-font.el:1.1 CarbonEmacsPackage/GPL/mac/carbon-font.el:1.2
--- CarbonEmacsPackage/GPL/mac/carbon-font.el:1.1 Sun Oct 23 13:18:04 2005
+++ CarbonEmacsPackage/GPL/mac/carbon-font.el Tue Nov 1 00:48:26 2005
@@ -245,6 +245,8 @@
(defvar fixed-width-encode-reg-alist
'((japanese-jisx0208 . "jisx0208.*")
(katakana-jisx0201 . "jisx0201.*")
+ (japanese-jisx0212 . "iso10646-*")
+ (thai-tis620 . "iso10646-*")
(chinese-gb2312 . "gb2312.*")
(chinese-big5-1 . "big5-*")
(korean-ksc5601 . "ksc5601.*")
@@ -273,6 +275,8 @@
`((ascii . "monaco")
(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 . "$A;*ND:ZLe(B*")
(chinese-big5-1 . ,(if (x-list-fonts "*apple ligothic medium*")
"apple ligothic medium*" "$(0\cE*(B*"))
@@ -290,6 +294,8 @@
`((ascii . "monaco")
(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 "*$A;*NDO8:Z(B*") "$A;*NDO8:Z(B*" "$A;*ND:ZLe(B*"))
(chinese-big5-1 . "$(0\cE*(B*")
(korean-ksc5601 . "applegothic*")))
@@ -306,6 +312,7 @@
`((ascii . "courier")
(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 "*$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*")
@@ -321,8 +328,9 @@
(defvar carbon-font-encode-family-list-osaka
'((ascii . "monaco")
- (japanese-jisx0208 . "osaka*")
- (katakana-jisx0201 . "osaka*")
+ (japanese-jisx0208 . "osaka")
+ (katakana-jisx0201 . "osaka")
+ (japanese-jisx0212 . "osaka")
(chinese-gb2312 . "$A;*ND:ZLe(B*")
(chinese-big5-1 . "$(0\cE*(B*")
(korean-ksc5601 . "applegothic*")))
@@ -360,10 +368,13 @@
(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)))
(".*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$" .
Index: CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el
diff -u CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.1 CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.2
--- CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el:1.1 Sun Oct 23 13:18:04 2005
+++ CarbonEmacsPackage/GPL/mac/fixed-width-fontset.el Tue Nov 1 00:48:26 2005
@@ -6,8 +6,8 @@
;;; Commentary:
-;; This package defines fixed-width multilingual fontsets for Carbon Emacs
-;; on Mac OS X. Comments, questions and feedback will be sent to an english
+;; This package defines fixed-width multilingual fontsets for Emacs on Mac
+;; OSX and Win32. Comments, questions and feedback will be sent to an english
;; list <http://lists.sourceforge.jp/mailman/listinfo/macemacsjp-english>
;; of MacEmacs JP project <http://macemacsjp.sourceforge.jp/en/>.
;;----------------------------------------------------------------------
@@ -49,14 +49,14 @@
;;
;; 1. Introduction
;;
-;; This file provide the functions for Emacs on Mac OSX and W32.
+;; This file provides functions for Emacs on Mac OSX and W32.
;; create CJK fontset
;; compensate width of ascii bold font that have different width
;; from normal font.
;; compensate width of CJK fonts that we want to use 2 times
;; width of ascii font.
;;
-;; This file required from carbon-font.el or ntemacs-font.el.
+;; This file is required by carbon-font.el or ntemacs-font.el.
;;
;; 2. installation
;;