svnno****@sourc*****
svnno****@sourc*****
2007年 5月 20日 (日) 11:26:05 JST
Revision: 462
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=462
Author: matsuan
Date: 2007-05-20 11:26:04 +0900 (Sun, 20 May 2007)
Log Message:
-----------
add new veriable
Modified Paths:
--------------
fixed-width-fontset/trunk/ntemacs-font.el
-------------- next part --------------
Modified: fixed-width-fontset/trunk/ntemacs-font.el
===================================================================
--- fixed-width-fontset/trunk/ntemacs-font.el 2007-04-15 05:18:59 UTC (rev 461)
+++ fixed-width-fontset/trunk/ntemacs-font.el 2007-05-20 02:26:04 UTC (rev 462)
@@ -1,8 +1,8 @@
;;; ntemacs-font.el -- fontsets for Emacs on Windows -*- coding: iso-2022-7bit -*-
;; Copyright (C) 2004-2007 by T. Hiromatsu <matsu****@users*****>
-;; Version 1_0_4
-;; 2007-01-17
+;; Version 1_0_5
+;; 2007-05-20
;;; Commentary:
@@ -208,16 +208,16 @@
(defvar fixed-width-encode-reg-alist
`((latin-iso8859-1 . "iso8859*")
(latin-iso8859-2 . "iso8859-2")
- (latin-iso8859-3 . "iso8859-3")
+ (latin-iso8859-3 . "iso10646-1")
(latin-iso8859-4 . "iso8859-4")
(thai-tis620 . "tis620")
- (greek-iso8859-7 . "iso8859-7")
+ (greek-iso8859-7 . "iso10646-1")
(arabic-iso8859-6 . "iso8859-6")
(hebrew-iso8859-8 . "iso8859-8")
(katakana-jisx0201 . "jisx0201-katakana")
(latin-jisx0201 . "jisx0201-latin")
- (cyrillic-iso8859-5 . "iso8859*")
- (latin-iso8859-9 . "iso8859*")
+ (cyrillic-iso8859-5 . "iso10646-1")
+ (latin-iso8859-9 . "iso8859-9")
(japanese-jisx0208-1978 . "jisx0208.1978")
(chinese-gb2312 . "gb2312")
(japanese-jisx0208 . "jisx0208-sjis")
@@ -233,19 +233,19 @@
(chinese-big5-1 . "big5")
(chinese-big5-2 . "big5")
(chinese-sisheng . "sisheng_cwnn")
- (vietnamese-viscii-lower . "viscii1.1")
- (vietnamese-viscii-upper . "viscii1.1")
+ (vietnamese-viscii-lower . "iso10646-1")
+ (vietnamese-viscii-upper . "iso10646-1")
(arabic-digit . "mulearabic*")
- (arabic-1-column . "mulearabic*")
- (arabic-2-column . "mulearabic*")
- (ipa . "muleipa")
- (ethiopic . "ethiopic-unicode")
+ (arabic-1-column . "*-#178")
+ (arabic-2-column . "*-#178")
+ (ipa . "iso10646-1")
+ (ethiopic . "iso10646-1")
(ascii-right-to-left . "iso8859*")
(indian-is13194 . "is13194-devanagari")
(indian-2-column . "muleindian*")
- (lao . "mulelao*")
- (tibetan . "muletibetan*")
- (tibetan-1-column . "muletibetan*")
+ (lao . "iso10646-1")
+ (tibetan . "iso10646-1")
+ (tibetan-1-column . "iso10646-1")
(latin-iso8859-14 . "iso8859*")
(latin-iso8859-15 . "iso8859*")
(mule-unicode-0100-24ff . "iso10646-1")
@@ -253,6 +253,7 @@
(mule-unicode-e000-ffff . "iso10646-1")
(japanese-jisx0213-1 . "jisx0213.2000*")
(japanese-jisx0213-2 . "jisx0213.2000*")
+ ((,(decode-char 'ucs #x2800) . ,(decode-char 'ucs #x28ff)) . "iso10646-1") ;; Braille
((,(decode-char 'ucs #x0900) . ,(decode-char 'ucs #x097F)) . "ISO10646.indian-1")
(,(indian-font-char-range 'cdac:dv-ttsurekh) . "iso10646-1")
(,(indian-font-char-range 'cdac:sd-ttsurekh) . "iso10646-1")
@@ -281,67 +282,200 @@
(defalias 'fixed-width-create-fontset-func 'create-fontset-from-ascii-font)
;;
+;; Setting for International language
+;;
+
+(set-fontset-font "fontset-default"
+ 'japanese-jisx0208
+ '("Arial Unicode MS*" . "jisx0208-sjis"))
+
+(set-fontset-font "fontset-default"
+ 'katakana-jisx0201
+ '("Arial Unicode MS*" . "jisx0201-katakana"))
+
+(set-fontset-font "fontset-default"
+ 'chinese-gb2312
+ '("Arial Unicode MS*" . "gb2312"))
+
+(set-fontset-font "fontset-default"
+ 'chinese-big5-1
+ '("Arial Unicode MS*" . "big5"))
+
+(set-fontset-font "fontset-default"
+ 'korean-ksc5601
+ '("Arial Unicode MS*" . "ksc5601.1987"))
+
+(set-fontset-font "fontset-default"
+ 'thai-tis620
+ '("Arial Unicode MS*" . "tis620"))
+
+(set-fontset-font "fontset-default"
+ 'mule-unicode-0100-24ff
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'latin-iso8859-3
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'cyrillic-iso8859-5
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'greek-iso8859-7
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'vietnamese-viscii-lower
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'vietnamese-viscii-upper
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'tibetan
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'lao
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'ipa
+ '("Arial Unicode MS*" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ 'arabic-1-column
+ '("Arial Unicode MS*" . "*-#178"))
+
+(set-fontset-font "fontset-default"
+ 'arabic-2-column
+ '("Arial Unicode MS*" . "*-#178"))
+
+;; additional font
+
+(set-fontset-font "fontset-default"
+ 'ethiopic
+ '("Ethiopia Jiret" . "iso10646-1"))
+
+(set-fontset-font "fontset-default"
+ `(,(decode-char 'ucs #x2800) . ,(decode-char 'ucs #x28ff))
+ '("Braille*" . "iso10646-1")) ; Braille Patterns
+
+;;
;; fontset definition section
;;
-(defvar ntemacs-font-defined-sizes '(12 7 8 9 10 14 16 18 20 24))
+(defvar ntemacs-font-defined-sizes '(12 7 8 9 10 11 14 16 18 20 24))
;;
+;; Lucida console
+;;
+
+(when (x-list-fonts "*Lucida Console*")
+ (defvar ntemacs-font-encode-family-list-lucida
+ `((ascii . "Lucida Console")
+ (japanese-jisx0208 . "Arial Unicode MS*")
+ (katakana-jisx0201 . "Arial Unicode MS*")
+ (chinese-gb2312 . "Arial Unicode MS*")
+ (chinese-big5-1 . "Arial Unicode MS*")
+ (korean-ksc5601 . "Arial Unicode MS*")
+ (thai-tis620 . "Arial Unicode MS*")
+ (latin-iso8859-3 . "Arial Unicode MS*")
+ (cyrillic-iso8859-5 . "Arial Unicode MS*")
+ (greek-iso8859-7 . "Arial Unicode MS*")
+ (hebrew-iso8859-8 . "Arial Unicode MS*")
+ (latin-iso8859-9 . "Arial Unicode MS*")
+ (latin-iso8859-15 . "Arial Unicode MS*")
+ (ipa . "Arial Unicode MS*")
+ (ethiopic . "Ethiopia Jiret")
+ (vietnamese-viscii-lower . "Arial Unicode MS*")
+ (vietnamese-viscii-upper . "Arial Unicode MS*")
+ (lao . "Arial Unicode MS*")
+ (tibetan . "Arial Unicode MS*")
+ (tibetan-1-column . "Arial Unicode MS*")
+ (arabic-1-column . "Arial Unicode MS*")
+ (arabic-2-column . "Arial Unicode MS*")
+ ((,(decode-char 'ucs #x2800) . ,(decode-char 'ucs #x28ff)) . "Braille*") ;; Braille
+ (mule-unicode-0100-24ff . "Arial Unicode MS*")
+ (mule-unicode-e000-ffff . "Arial Unicode MS*")))
+
+ (fixed-width-create-fontset "lucida"
+ ntemacs-font-defined-sizes
+ ntemacs-font-encode-family-list-lucida))
+
+;;
;; msgothic = $B#M#S(B $B%4%7%C%/(B + $B#M#S(B $B%4%7%C%/(B
;;
-(defvar ntemacs-font-encode-family-list-msgothic
- `((ascii . "$B#M#S(B $B%4%7%C%/(B")
- (japanese-jisx0208 . "$B#M#S(B $B%4%7%C%/(B*")
- (katakana-jisx0201 . "$B#M#S(B $B%4%7%C%/(B*")
- (chinese-gb2312 . "Arial Unicode MS*")
- (chinese-big5-1 . "Arial Unicode MS*")
- (korean-ksc5601 . "Arial Unicode MS*")
- (mule-unicode-0100-24ff . "Arial Unicode MS*")
- (mule-unicode-e000-ffff . "Arial Unicode MS*")
- ((,(decode-char 'ucs #x0900) . ,(decode-char 'ucs #x097F)) . "Fixed")
- (,(indian-font-char-range 'cdac:dv-ttsurekh) . "DV_TTSurekh")
- (,(indian-font-char-range 'cdac:sd-ttsurekh) . "SD_TTSurekh")
- (,(indian-font-char-range 'cdac:bn-ttdurga) . "BN_TTDurga")
- (,(indian-font-char-range 'cdac:as-ttdurga) . "AS_TTDurga")
- (,(indian-font-char-range 'cdac:pn-ttamar) . "PN_TTAmar")
- (,(indian-font-char-range 'cdac:gj-ttavantika) . "GJ_TTAvantika")
- (,(indian-font-char-range 'cdac:or-ttsarala) . "OR_TTSarala")
- (,(indian-font-char-range 'cdac:tm-ttvalluvar) . "TM_TTValluvar")
- (,(indian-font-char-range 'cdac:tl-tthemalatha) . "TL_TTHemalatha")
- (,(indian-font-char-range 'cdac:kn-ttuma) . "KN_TTUma")
- (,(indian-font-char-range 'cdac:ml-ttkarthika) . "ML_TTKarthika")
- (,(indian-font-char-range 'akruti:dev) . "AkrutiDev2")
- (,(indian-font-char-range 'akruti:bng) . "AkrutiBng2")
- (,(indian-font-char-range 'akruti:pnj) . "AkrutiPnj2")
- (,(indian-font-char-range 'akruti:guj) . "AkrutiGuj1")
- (,(indian-font-char-range 'akruti:ori) . "AkrutiOri1")
- (,(indian-font-char-range 'akruti:tml) . "AkrutiTml1")
- (,(indian-font-char-range 'akruti:tlg) . "AkrutiTlg2")
- (,(indian-font-char-range 'akruti:knd) . "AkrutiKnd1")
- (,(indian-font-char-range 'akruti:mal) . "AkrutiMal2")))
+(when (x-list-fonts "*$B#M#S(B $B%4%7%C%/(B*")
+ (defvar ntemacs-font-encode-family-list-msgothic
+ `((ascii . "$B#M#S(B $B%4%7%C%/(B")
+ (japanese-jisx0208 . "$B#M#S(B $B%4%7%C%/(B*")
+ (katakana-jisx0201 . "$B#M#S(B $B%4%7%C%/(B*")
+ (chinese-gb2312 . "Arial Unicode MS*")
+ (chinese-big5-1 . "Arial Unicode MS*")
+ (korean-ksc5601 . "Arial Unicode MS*")
+ (thai-tis620 . "Arial Unicode MS*")
+ (latin-iso8859-3 . "Arial Unicode MS*")
+ (cyrillic-iso8859-5 . "Arial Unicode MS*")
+ (greek-iso8859-7 . "Arial Unicode MS*")
+ (hebrew-iso8859-8 . "Arial Unicode MS*")
+ (latin-iso8859-9 . "Arial Unicode MS*")
+ (latin-iso8859-15 . "Arial Unicode MS*")
+ (ipa . "Arial Unicode MS*")
+ (ethiopic . "Ethiopia Jiret")
+ (vietnamese-viscii-lower . "Arial Unicode MS*")
+ (vietnamese-viscii-upper . "Arial Unicode MS*")
+ (lao . "Arial Unicode MS*")
+ (tibetan . "Arial Unicode MS*")
+ (tibetan-1-column . "Arial Unicode MS*")
+ (arabic-1-column . "Arial Unicode MS*")
+ (arabic-2-column . "Arial Unicode MS*")
+ ((,(decode-char 'ucs #x2800) . ,(decode-char 'ucs #x28ff)) . "Braille*") ;; Braille
+ (mule-unicode-0100-24ff . "Arial Unicode MS*")
+ (mule-unicode-e000-ffff . "Arial Unicode MS*")))
-(fixed-width-create-fontset "msgothic"
- ntemacs-font-defined-sizes
- ntemacs-font-encode-family-list-msgothic)
+ (fixed-width-create-fontset "msgothic"
+ ntemacs-font-defined-sizes
+ ntemacs-font-encode-family-list-msgothic))
;;
;; msmincho = $B#M#S(B $BL ＠ D+(B + $B#M#S(B $BL ＠ D+(B
;;
-(defvar ntemacs-font-encode-family-list-msmincho
- '((ascii . "$B#M#S(B $BL ＠ D+(B")
- (japanese-jisx0208 . "$B#M#S(B $BL ＠ D+(B*")
- (katakana-jisx0201 . "$B#M#S(B $BL ＠ D+(B*")
- (chinese-gb2312 . "Arial Unicode MS*")
- (chinese-big5-1 . "Arial Unicode MS*")
- (korean-ksc5601 . "Arial Unicode MS*")
- (mule-unicode-0100-24ff . "Arial Unicode MS*")
- (mule-unicode-e000-ffff . "Arial Unicode MS*")))
+(when (x-list-fonts "*$B#M#S(B $BL ＠ D+(B*")
+ (defvar ntemacs-font-encode-family-list-msmincho
+ `((ascii . "$B#M#S(B $BL ＠ D+(B")
+ (japanese-jisx0208 . "$B#M#S(B $BL ＠ D+(B*")
+ (katakana-jisx0201 . "$B#M#S(B $BL ＠ D+(B*")
+ (chinese-gb2312 . "Arial Unicode MS*")
+ (chinese-big5-1 . "Arial Unicode MS*")
+ (korean-ksc5601 . "Arial Unicode MS*")
+ (thai-tis620 . "Arial Unicode MS*")
+ (latin-iso8859-3 . "Arial Unicode MS*")
+ (cyrillic-iso8859-5 . "Arial Unicode MS*")
+ (greek-iso8859-7 . "Arial Unicode MS*")
+ (hebrew-iso8859-8 . "Arial Unicode MS*")
+ (latin-iso8859-9 . "Arial Unicode MS*")
+ (latin-iso8859-15 . "Arial Unicode MS*")
+ (ipa . "Arial Unicode MS*")
+ (ethiopic . "Ethiopia Jiret")
+ (vietnamese-viscii-lower . "Arial Unicode MS*")
+ (vietnamese-viscii-upper . "Arial Unicode MS*")
+ (lao . "Arial Unicode MS*")
+ (tibetan . "Arial Unicode MS*")
+ (tibetan-1-column . "Arial Unicode MS*")
+ (arabic-1-column . "Arial Unicode MS*")
+ (arabic-2-column . "Arial Unicode MS*")
+ ((,(decode-char 'ucs #x2800) . ,(decode-char 'ucs #x28ff)) . "Braille*") ;; Braille
+ (mule-unicode-0100-24ff . "Arial Unicode MS*")
+ (mule-unicode-e000-ffff . "Arial Unicode MS*")))
-(fixed-width-create-fontset "msmincho"
- ntemacs-font-defined-sizes
- ntemacs-font-encode-family-list-msmincho)
+ (fixed-width-create-fontset "msmincho"
+ ntemacs-font-defined-sizes
+ ntemacs-font-encode-family-list-msmincho))
;;
;; $BJQ?t(B section
@@ -351,21 +485,54 @@
;; $B%\!<%k%I$r%j%9%1!<%k$9$k0Y$N%U%!%/%?!<$NDj5A(B
(defvar fixed-width-scale-alist-ascii-bold
- '(( "7" . 0.8) ( "8" . 0.8) ( "9" . 0.9) ("10" . 0.8) ("12" . 0.9)
+ '(("7" . 0.8) ("8" . 0.8) ("9" . 0.9) ("10" . 0.8) ("11" . 0.9) ("12" . 0.9)
("14" . 0.9) ("16" . 0.9) ("18" . 0.9) ("20" . 0.9) ("24" . 0.95)))
(defvar fixed-width-scale-alist-jis-bold
- '(( "7" . 0.9) ( "8" . 0.9) ( "9" . 0.9) ("10" . 0.9) ("12" . 0.95)
+ '(("7" . 0.9) ("8" . 0.9) ("9" . 0.9) ("10" . 0.9) ("11" . 0.95) ("12" . 0.95)
("14" . 0.95) ("16" . 0.95) ("18" . 0.95) ("20" . 0.98) ("24" . 0.98)))
-(defvar fixed-width-scale-alist-arial
- '(( "7" . 1.05) ( "8" . 1.05) ( "9" . 1.05) ("10" . 1.05) ("12" . 1.05)
- ("14" . 1.05) ("16" . 1.05) ("18" . 1.05) ("20" . 1.05) ("24" . 1.05)))
+(defvar fixed-width-scale-alist-braille
+ '(("7" . 1.2) ("8" . 1.2) ("9" . 1.2) ("10" . 1.2) ("11" . 1.2) ("12" . 1.2)
+ ("14" . 1.2) ("16" . 1.2) ("18" . 1.2) ("20" . 1.2) ("24" . 1.2)))
+(defvar fixed-width-scale-alist-arial-normal
+ '(("7" . 1.15) ("8" . 1.35) ("9" . 1.35) ("10" . 1.2) ("11" . 1.1) ("12" . 1.2)
+ ("14" . 1.2) ("16" . 1.25) ("18" . 1.25) ("20" . 1.2) ("24" . 1.2)))
+
+(defvar fixed-width-scale-alist-arial-bold
+ '(("8" . 1.2) ("9" . 1.25) ("10" . 1.1) ("11" . 1.0) ("12" . 1.15)
+ ("14" . 1.1) ("16" . 1.2) ("18" . 1.2) ("20" . 1.15) ("24" . 1.15)))
+
+(defvar fixed-width-scale-alist-lucida-bold
+ '(("7" . 0.8) ("8" . 0.8) ("9" . 0.9) ("10" . 0.9) ("11" . 0.9) ("12" . 0.9)
+ ("14" . 0.9) ("16" . 0.9) ("18" . 0.9) ("20" . 0.9) ("24" . 0.95)))
+
(defvar fixed-width-get-scale-alist
- `((".*bold-.*-iso8859.*" . ,fixed-width-scale-alist-ascii-bold)
- (".*bold-.*-jisx02.*" . ,fixed-width-scale-alist-jis-bold)
- (".*Arial.*" . ,fixed-width-scale-alist-arial))
+ `((,(encode-coding-string ".*$B#M#S(B.*bold.*iso8859.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-ascii-bold)
+ (,(encode-coding-string ".*$B#M#S(B.*bold.*jisx02.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-jis-bold)
+ (".*Lucida Console.*bold.*" .
+ ,fixed-width-scale-alist-lucida-bold)
+ (".*Arial Unicode MS.*normal.*jisx02.*" .
+ ,fixed-width-scale-alist-arial-normal)
+ (".*Arial Unicode MS.*bold.*jisx02.*" .
+ ,fixed-width-scale-alist-arial-bold)
+ (".*Arial Unicode MS.*normal.*gb2312.*" .
+ ,fixed-width-scale-alist-arial-normal)
+ (".*Arial Unicode MS.*bold.*gb2312.*" .
+ ,fixed-width-scale-alist-arial-bold)
+ (".*Arial Unicode MS.*normal.*big5.*" .
+ ,fixed-width-scale-alist-arial-normal)
+ (".*Arial Unicode MS.*bold.*big5.*" .
+ ,fixed-width-scale-alist-arial-bold)
+ (".*Arial Unicode MS.*normal.*ksc5601.*" .
+ ,fixed-width-scale-alist-arial-normal)
+ (".*Arial Unicode MS.*bold.*ksc5601.*" .
+ ,fixed-width-scale-alist-arial-bold)
+ (".*braille.*" . ,fixed-width-scale-alist-braille)
+ (".*Ethiopia Jiret.*" . ,fixed-width-scale-alist-braille))
"ReScale factor alist for each fonts and size.")
;; variable pitch $B$O(B default $B$G!"(Bhelv $B$@$1$I!"L5$$$N$G(B arial $B$KJQ99(B
@@ -376,6 +543,22 @@
:slant 'normal
:weight 'normal)
+(set-face-attribute 'fixed-pitch nil
+ :family "lucida"
+ :slant 'normal
+ :weight 'normal)
+
+;; *Use the standard font dialog.
+;; If nil, pop up a menu of a fixed set of fonts including fontsets, like
+;; X does. See `w32-fixed-font-alist' for the font menu definition.
+;; Window $B$N(B font $B ＠ _Dj%a%K%e!<$G$O$J$/!"(BEmacs$BI8=`(B(X-style)$B$N%a%K%e!<$r;H$&!#(B
+;; $B2<$G ＠ _Dj$9$k!"(Bfontset-ipa** $B$r(B shift + click $B$G=P$F$/$k%a%K%e!<$+$iA*$Y$k(B
+;; $BMM$K$J$k!#(B
+(setq w32-use-w32-font-dialog nil)
+
+;; Non-nil enables selection of artificially italicized and bold fonts.
+(setq w32-enable-synthesized-fonts t)
+
(provide 'ntemacs-font)
;;; ntemacs-font.el ends here