Seiji Zenitani
zenit****@users*****
2005年 6月 5日 (日) 22:45:22 JST
Index: carbon_font/carbon-font.el
diff -u carbon_font/carbon-font.el:1.29 carbon_font/carbon-font.el:1.30
--- carbon_font/carbon-font.el:1.29 Sun Jun 5 21:39:32 2005
+++ carbon_font/carbon-font.el Sun Jun 5 22:45:22 2005
@@ -160,8 +160,8 @@
;;
;; 3. Changelog
;; 1_2_2 2005-05-21 Tiger対策
-;; monaco が表示できないサイズのaltanativeとして、ayuthaya 固定ではなく
-;; 新たに、変数 carbon-font-monaco-altanative を設けて、デフォルトに
+;; monaco が表示できないサイズのalternativeとして、ayuthaya 固定ではなく
+;; 新たに、変数 carbon-font-monaco-alternative を設けて、デフォルトに
;; "lucida sans typewriter" を設定。
;; 1_2_1 2005-04-17 以下を追加
;; mac-roman-lower, mac-roman-upper,
@@ -238,11 +238,11 @@
(format "korean-ksc5601:-apple-applegothic-medium-r-normal--%d-%d-75-75-m-%d-ksc5601.1989-0"
size pt pt))
-(defvar carbon-font-monaco-altanative "lucida sans typewriter"
- "Monaco altanative font name")
+(defvar carbon-font-monaco-alternative "lucida sans typewriter"
+ "Monaco alternative font name")
-(defvar carbon-font-monaco-altanative-exist (x-list-fonts (concat "*-" carbon-font-monaco-altanative "-*"))
- "Variable if monaco altanative font is installed or not.")
+(defvar carbon-font-monaco-alternative-exist (x-list-fonts (concat "*-" carbon-font-monaco-alternative "-*"))
+ "Variable if monaco alternative font is installed or not.")
(defvar carbon-font-courier_new-exist (x-list-fonts "*-courier new-*")
"Variable if courier new font is installed or not.")
@@ -253,46 +253,46 @@
(defvar carbon-font-monaco_ce-exist (x-list-fonts "*-monaco ce-*")
"Variable if monaco ce font is installed or not.")
-(defun carbon-font-spec-family-monaco (size ascsize altanative)
+(defun carbon-font-spec-family-monaco (size ascsize alternative)
(carbon-font-concat-with-comma
(format "ascii:-apple-%s-medium-r-normal--%d-*-*-*-m-*-mac-*"
;; (format "ascii:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
; (format "latin-iso8859-1:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size)
(format "latin-iso8859-1:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "greek-iso8859-7:-apple-symbol-medium-r-normal--%d-*-75-75-m-*-mac-symbol" size)
;; (format "latin-iso8859-7:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size)
;; (format "latin-iso8859-7:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
-;; (if altanative carbon-font-monaco-altanative "monaco")
+;; (if alternative carbon-font-monaco-alternative "monaco")
;; ascsize)
; (format "latin-iso8859-9:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size)
(format "latin-iso8859-9:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "latin-iso8859-15:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "mac-roman-lower:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "mac-roman-upper:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "mule-unicode-0100-24ff:-apple-symbol-medium-r-normal--%d-*-75-75-m-*-mac-symbol" size)
;; (format "mule-unicode-0100-24ff:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
-;; (if altanative carbon-font-monaco-altanative "monaco")
+;; (if alternative carbon-font-monaco-alternative "monaco")
;; ascsize)
(format "mule-unicode-2500-33ff:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "mule-unicode-e000-ffff:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "iso10646-1:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*"
- (if altanative carbon-font-monaco-altanative "monaco")
+ (if alternative carbon-font-monaco-alternative "monaco")
ascsize)
(format "latin-iso8859-2:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-centraleurroman"
(if carbon-font-monaco_ce-exist "monaco ce" "*")
@@ -338,18 +338,18 @@
))
;;
-;; hiraginomaru** = ヒラギノ丸ゴ + moanco(altanative)
+;; hiraginomaru** = ヒラギノ丸ゴ + moanco(alternative)
;;
-(defun carbon-font-create-fontset-hiraginomaru (size cjksize cjkpt ascsize altanative)
- (if (or (not altanative) carbon-font-monaco-altanative-exist)
+(defun carbon-font-create-fontset-hiraginomaru (size cjksize cjkpt ascsize alternative)
+ (if (or (not alternative) carbon-font-monaco-alternative-exist)
(create-fontset-from-fontset-spec
(carbon-font-concat-with-comma
(format "-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-fontset-hiraginomaru%02d" size size)
(carbon-font-spec-japanese-generic "ヒラギノ丸ゴ pro w4" cjksize cjkpt)
(carbon-font-spec-chinese-std cjksize cjkpt)
(carbon-font-spec-korean-std cjksize cjkpt)
- (carbon-font-spec-family-monaco size ascsize altanative)
+ (carbon-font-spec-family-monaco size ascsize alternative)
))))
(carbon-font-create-fontset-hiraginomaru 24 28 288 22 nil)
@@ -364,18 +364,18 @@
(carbon-font-create-fontset-hiraginomaru 7 8 80 7 nil)
;;
-;; hiraginokaku** = ヒラギノ角ゴ + moanco(altanative)
+;; hiraginokaku** = ヒラギノ角ゴ + moanco(alternative)
;;
-(defun carbon-font-create-fontset-hiraginokaku (size cjksize cjkpt ascsize altanative)
- (if (or (not altanative) carbon-font-monaco-altanative-exist)
+(defun carbon-font-create-fontset-hiraginokaku (size cjksize cjkpt ascsize alternative)
+ (if (or (not alternative) carbon-font-monaco-alternative-exist)
(create-fontset-from-fontset-spec
(carbon-font-concat-with-comma
(format "-*-fixed-medium-r-normal-*-%d-*-*-*-*-*-fontset-hiraginokaku%02d" size size)
(carbon-font-spec-japanese-generic "ヒラギノ角ゴ pro w3" cjksize cjkpt)
(carbon-font-spec-chinese-std cjksize cjkpt)
(carbon-font-spec-korean-std cjksize cjkpt)
- (carbon-font-spec-family-monaco size ascsize altanative)
+ (carbon-font-spec-family-monaco size ascsize alternative)
))))
(carbon-font-create-fontset-hiraginokaku 24 28 288 22 nil)
@@ -418,18 +418,18 @@
(carbon-font-create-fontset-hiraginomin 7 8 80 7 nil)
;;
-;; osaka** = osaka + moanco(altanative)
+;; osaka** = osaka + moanco(alternative)
;;
-(defun carbon-font-create-fontset-osaka (size cjksize cjkpt altanative japanese)
- (if (or (not altanative) carbon-font-monaco-altanative-exist)
+(defun carbon-font-create-fontset-osaka (size cjksize cjkpt alternative japanese)
+ (if (or (not alternative) carbon-font-monaco-alternative-exist)
(create-fontset-from-fontset-spec
(carbon-font-concat-with-comma
(format "-apple-osaka-medium-r-normal-*-%d-*-*-*-*-*-fontset-osaka%02d" size size)
(and japanese (carbon-font-spec-japanese-generic "osaka" cjksize cjkpt))
(carbon-font-spec-chinese-std cjksize cjkpt)
(carbon-font-spec-korean-std cjksize cjkpt)
- (carbon-font-spec-family-monaco size size altanative)
+ (carbon-font-spec-family-monaco size size alternative)
))))
(carbon-font-create-fontset-osaka 24 28 288 nil t)