Takashi Hiromatsu
matsu****@users*****
2005年 5月 21日 (土) 10:38:18 JST
Index: carbon_font/carbon-font.el diff -u carbon_font/carbon-font.el:1.27 carbon_font/carbon-font.el:1.28 --- carbon_font/carbon-font.el:1.27 Sun Apr 17 13:02:06 2005 +++ carbon_font/carbon-font.el Sat May 21 10:38:18 2005 @@ -1,7 +1,7 @@ ;;; carbon-font.el -- fontsets for Carbon Emacs -*- coding: iso-2022-7bit -*- -;; carbon-font.el ;; Copyright (C) 2004-2005 by T. Hiromatsu <matsu****@users*****> +;; Version 1_2_2 ;;; Commentary: @@ -159,7 +159,11 @@ ;; と表示されます。(筈です) ;; ;; 3. Changelog -;; 1_2_1 2005-04-17 以下を追加 +;; 1_2_2 2005-05-21 Tiger対策 +;; monaco が表示できないサイズのaltanativeとして、ayuthaya 固定ではなく +;; 新たに、変数 carbon-font-monaco-altanative を設けて、デフォルトに +;; "lucida sans typewriter" を設定。 +;; 1_2_1 2005-04-17 以下を追加 ;; mac-roman-lower, mac-roman-upper, ;; mule-unicode-0100-24ff, mule-unicode-2500-33ff, ;; mule-unicode-e000-ffff, iso10646-1 @@ -234,8 +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-ayuthaya-exist (x-list-fonts "*-ayuthaya-*") - "Variable if ayuthaya font is installed or not.") +(defvar carbon-font-monaco-altanative "lucida sans typewriter" + "Monaco altanative 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-courier_new-exist (x-list-fonts "*-courier new-*") "Variable if courier new font is installed or not.") @@ -246,19 +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 ayuthaya) +(defun carbon-font-spec-family-monaco (size ascsize altanative) (carbon-font-concat-with-comma (format "ascii:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" - (if ayuthaya "ayuthaya" "monaco") + (if altanative carbon-font-monaco-altanative "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") + 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") +;; 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") + ascsize) + (format "latin-iso8859-15:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "monaco") + ascsize) + (format "mac-roman-lower:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "monaco") + ascsize) + (format "mac-roman-upper:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "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") +;; ascsize) + (format "mule-unicode-2500-33ff:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "monaco") + ascsize) + (format "mule-unicode-e000-ffff:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "monaco") + ascsize) + (format "iso10646-1:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-*" + (if altanative carbon-font-monaco-altanative "monaco") ascsize) - (format "latin-iso8859-1:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "latin-iso8859-15:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "mac-roman-lower:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "mac-roman-upper:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "mule-unicode-0100-24ff:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "mule-unicode-2500-33ff:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "mule-unicode-e000-ffff:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) - (format "iso10646-1:-apple-monaco-medium-r-normal--%d-*-75-75-m-*-mac-roman" size) (format "latin-iso8859-2:-apple-%s-medium-r-normal--%d-*-75-75-m-*-mac-centraleurroman" (if carbon-font-monaco_ce-exist "monaco ce" "*") size) @@ -303,18 +337,18 @@ )) ;; -;; hiraginomaru** = ヒラギノ丸ゴ + moanco(ayuthaya) +;; hiraginomaru** = ヒラギノ丸ゴ + moanco(altanative) ;; -(defun carbon-font-create-fontset-hiraginomaru (size cjksize cjkpt ascsize ayuthaya) - (if (or (not ayuthaya) carbon-font-ayuthaya-exist) +(defun carbon-font-create-fontset-hiraginomaru (size cjksize cjkpt ascsize altanative) + (if (or (not altanative) carbon-font-monaco-altanative-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 ayuthaya) + (carbon-font-spec-family-monaco size ascsize altanative) )))) (carbon-font-create-fontset-hiraginomaru 24 28 288 22 t) @@ -329,18 +363,18 @@ (carbon-font-create-fontset-hiraginomaru 7 8 80 7 t) ;; -;; hiraginokaku** = ヒラギノ角ゴ + moanco(ayuthaya) +;; hiraginokaku** = ヒラギノ角ゴ + moanco(altanative) ;; -(defun carbon-font-create-fontset-hiraginokaku (size cjksize cjkpt ascsize ayuthaya) - (if (or (not ayuthaya) carbon-font-ayuthaya-exist) +(defun carbon-font-create-fontset-hiraginokaku (size cjksize cjkpt ascsize altanative) + (if (or (not altanative) carbon-font-monaco-altanative-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 ayuthaya) + (carbon-font-spec-family-monaco size ascsize altanative) )))) (carbon-font-create-fontset-hiraginokaku 24 28 288 22 t) @@ -381,18 +415,18 @@ (carbon-font-create-fontset-hiraginomin 7 8 80 7 t) ;; -;; osaka** = osaka + moanco(ayuthaya) +;; osaka** = osaka + moanco(altanative) ;; -(defun carbon-font-create-fontset-osaka (size cjksize cjkpt ayuthaya japanese) - (if (or (not ayuthaya) carbon-font-ayuthaya-exist) +(defun carbon-font-create-fontset-osaka (size cjksize cjkpt altanative japanese) + (if (or (not altanative) carbon-font-monaco-altanative-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 ayuthaya) + (carbon-font-spec-family-monaco size size altanative) )))) (carbon-font-create-fontset-osaka 24 28 288 t t) @@ -468,8 +502,8 @@ )) ("osaka-bold" . ( ("08". 1.2) - ("09". 1.3) - ("10". 1.15) + ("09". 1.0) + ("10". 1.10) ("12". 1.15) ("15". 1.15) ("20". 1.25)
