svnno****@sourc*****
svnno****@sourc*****
2007年 6月 24日 (日) 21:32:09 JST
Revision: 476
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=476
Author: matsuan
Date: 2007-06-24 21:32:08 +0900 (Sun, 24 Jun 2007)
Log Message:
-----------
quick draw test version
Modified Paths:
--------------
fixed-width-fontset/branches/quick_draw/carbon-font.el
-------------- next part --------------
Modified: fixed-width-fontset/branches/quick_draw/carbon-font.el
===================================================================
--- fixed-width-fontset/branches/quick_draw/carbon-font.el 2007-06-24 11:01:50 UTC (rev 475)
+++ fixed-width-fontset/branches/quick_draw/carbon-font.el 2007-06-24 12:32:08 UTC (rev 476)
@@ -329,13 +329,37 @@
(defvar carbon-font-defined-sizes '(12 7 8 9 10 14 16 18 20 24))
;;
-;; hiraginomaru = $B%R%i%.%N4]%4(B + monaco
+;; osaka = osaka + monaco
;;
-(defvar carbon-font-encode-family-list-hiraginomaru
+(defvar carbon-font-encode-family-list-osaka
+ '((ascii . "monaco")
+ (japanese-jisx0208 . "osaka")
+ (katakana-jisx0201 . "osaka")
+ (japanese-jisx0212 . "osaka")
+ (chinese-gb2312 . "stheiti*")
+ (chinese-big5-1 . "lihei pro*")
+ (korean-ksc5601 . "applegothic*")))
+
+(carbon-font-create-fontset "osaka"
+ carbon-font-defined-sizes
+ carbon-font-encode-family-list-osaka)
+
+;;
+;; use Quick Draw
+;;
+
+(setcdr (assoc 'japanese-jisx0208 fixed-width-encode-reg-alist) "jisx0208.*")
+(setcdr (assoc 'katakana-jisx0201 fixed-width-encode-reg-alist) "jisx0201.*")
+
+;;
+;; hiramaru = $B%R%i%.%N4]%4(B + monaco
+;;
+
+(defvar carbon-font-encode-family-list-hiramaru
`((ascii . "monaco")
- (japanese-jisx0208 . "hiragino maru gothic pro")
- (katakana-jisx0201 . "hiragino maru gothic pro")
+ (japanese-jisx0208 . "$B%R%i%.%N4]%4(B pro w4")
+ (katakana-jisx0201 . "$B%R%i%.%N4]%4(B pro w4")
(japanese-jisx0212 . "hiragino maru gothic pro")
(thai-tis620 . "ayuthaya")
(chinese-gb2312 . "stheiti*")
@@ -343,62 +367,99 @@
"apple ligothic*" "lihei pro*"))
(korean-ksc5601 . "applegothic*")))
-(carbon-font-create-fontset "hiraginomaru"
+(carbon-font-create-fontset "hiramaru"
carbon-font-defined-sizes
- carbon-font-encode-family-list-hiraginomaru)
+ carbon-font-encode-family-list-hiramaru)
;;
-;; hiraginokaku = $B%R%i%.%N3Q%4(B + monaco
+;; hirakaku = $B%R%i%.%N3Q%4(B w3 + monaco
;;
-(defvar carbon-font-encode-family-list-hiraginokaku
+(defvar carbon-font-encode-family-list-hirakaku_w3
`((ascii . "monaco")
- (japanese-jisx0208 . "hiragino kaku gothic pro")
- (katakana-jisx0201 . "hiragino kaku gothic pro")
+ (japanese-jisx0208 . "$B%R%i%.%N3Q%4(B pro w3")
+ (katakana-jisx0201 . "$B%R%i%.%N3Q%4(B pro w3")
(japanese-jisx0212 . "hiragino kaku gothic pro")
(thai-tis620 . "ayuthaya")
(chinese-gb2312 . ,(if (x-list-fonts "*-hei-*") "hei*" "stheiti*"))
(chinese-big5-1 . "lihei pro*")
(korean-ksc5601 . "applegothic*")))
-(carbon-font-create-fontset "hiraginokaku"
+(carbon-font-create-fontset "hirakaku_w3"
carbon-font-defined-sizes
- carbon-font-encode-family-list-hiraginokaku)
+ carbon-font-encode-family-list-hirakaku_w3)
;;
-;; hiraginomin = $B%R%i%.%NL ＠ D+(B + courier
+;; hirakaku = $B%R%i%.%N3Q%4(B w6 + monaco
;;
-(defvar carbon-font-encode-family-list-hiraginomin
+(defvar carbon-font-encode-family-list-hirakaku_w6
+ `((ascii . "monaco")
+ (japanese-jisx0208 . "$B%R%i%.%N3Q%4(B pro w6")
+ (katakana-jisx0201 . "$B%R%i%.%N3Q%4(B pro w6")
+ (japanese-jisx0212 . "hiragino kaku gothic pro")
+ (thai-tis620 . "ayuthaya")
+ (chinese-gb2312 . ,(if (x-list-fonts "*-hei-*") "hei*" "stheiti*"))
+ (chinese-big5-1 . "lihei pro*")
+ (korean-ksc5601 . "applegothic*")))
+
+(carbon-font-create-fontset "hirakaku_w6"
+ carbon-font-defined-sizes
+ carbon-font-encode-family-list-hirakaku_w6)
+
+;;
+;; hirakaku = $B%R%i%.%N3Q%4(B w8 + monaco
+;;
+
+(defvar carbon-font-encode-family-list-hirakaku_w8
+ `((ascii . "monaco")
+ (japanese-jisx0208 . "$B%R%i%.%N3Q%4(B std w8")
+ (katakana-jisx0201 . "$B%R%i%.%N3Q%4(B std w8")
+ (japanese-jisx0212 . "hiragino kaku gothic pro")
+ (thai-tis620 . "ayuthaya")
+ (chinese-gb2312 . ,(if (x-list-fonts "*-hei-*") "hei*" "stheiti*"))
+ (chinese-big5-1 . "lihei pro*")
+ (korean-ksc5601 . "applegothic*")))
+
+(carbon-font-create-fontset "hirakaku_w8"
+ carbon-font-defined-sizes
+ carbon-font-encode-family-list-hirakaku_w8)
+
+;;
+;; hiramin = $B%R%i%.%NL ＠ D+(B w3 + courier
+;;
+
+(defvar carbon-font-encode-family-list-hiramin_w3
`((ascii . "courier")
- (japanese-jisx0208 . "hiragino mincho pro")
- (katakana-jisx0201 . "hiragino mincho pro")
+ (japanese-jisx0208 . "$B%R%i%.%NL ＠ D+(B pro w3")
+ (katakana-jisx0201 . "$B%R%i%.%NL ＠ D+(B pro w3")
(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*"))
(korean-ksc5601 . ,(if (x-list-fonts "*applemyungjo*")
"applemyungjo*" "applegothic*"))))
-(carbon-font-create-fontset "hiraginomin"
+(carbon-font-create-fontset "hiramin_w3"
carbon-font-defined-sizes
- carbon-font-encode-family-list-hiraginomin)
+ carbon-font-encode-family-list-hiramin_w3)
;;
-;; osaka = osaka + monaco
+;; hiraginomin = $B%R%i%.%NL ＠ D+(B w3 + courier
;;
-(defvar carbon-font-encode-family-list-osaka
- '((ascii . "monaco")
- (japanese-jisx0208 . "osaka")
- (katakana-jisx0201 . "osaka")
- (japanese-jisx0212 . "osaka")
- (chinese-gb2312 . "stheiti*")
- (chinese-big5-1 . "lihei pro*")
- (korean-ksc5601 . "applegothic*")))
+(defvar carbon-font-encode-family-list-hiramin_w6
+ `((ascii . "courier")
+ (japanese-jisx0208 . "$B%R%i%.%NL ＠ D+(B pro w6")
+ (katakana-jisx0201 . "$B%R%i%.%NL ＠ D+(B pro w6")
+ (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*"))
+ (korean-ksc5601 . ,(if (x-list-fonts "*applemyungjo*")
+ "applemyungjo*" "applegothic*"))))
-(carbon-font-create-fontset "osaka"
+(carbon-font-create-fontset "hiramin_w6"
carbon-font-defined-sizes
- carbon-font-encode-family-list-osaka)
+ carbon-font-encode-family-list-hiramin_w6)
;;
;; $BJQ?t(B section
@@ -434,6 +495,18 @@
(".*osaka-medium.*" . ,fixed-width-scale-alist-osaka-normal)
(".*osaka-bold.*" . ,fixed-width-scale-alist-osaka-bold)
("^-apple-hiragino.*" . ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%N4]%4(B pro w4.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%N3Q%4(B pro w3.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%N3Q%4(B pro w6.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%N3Q%4(B std w8.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%NL ＠ D+(B pro w3.*" 'emacs-mule) .
+ ,fixed-width-scale-alist-hiragino)
+ (,(encode-coding-string ".*$B%R%i%.%NL ＠ D+(B pro w6.*" 'emacs-mule) .
+ ,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)