X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-zhfonts.sty;h=8e215d3f6eb9ae0413ac91b3821f7b6a1b2e24d5;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=8499ffbfdd3bcd565c0bf9c9db9ef84d09aa4cb2;hpb=128deac4939863c653e06c0d51800adf90854bc8;p=luatex-ja%2Fluatexja.git

diff --git a/src/addons/luatexja-zhfonts.sty b/src/addons/luatexja-zhfonts.sty
index 8499ffb..8e215d3 100644
--- a/src/addons/luatexja-zhfonts.sty
+++ b/src/addons/luatexja-zhfonts.sty
@@ -1,77 +1,77 @@
-% luatexja-zhfonts.sty
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-zhfonts}[2013/05/20 Setting for Chinese fonts]
-\RequirePackage{luatexja-fontspec}
-
-% SinoType 华文字体
-\DeclareOption{SinoType}{
-\setmainjfont[BoldFont=STZhongsong]{STSong}
-\setsansjfont[BoldFont=STXihei]{STXihei}
-\newjfontface\kai{STKaiti}
-\newjfontface\fang{STFangsong}
-}
-
-% ZhongYi 中易字体
-\DeclareOption{ZhongYi}{
-\setmainjfont[BoldFont=SimHei]{SimSun}
-\setsansjfont[BoldFont=SimHei]{SimHei}
-\newjfontface\kai{KaiTi}
-\newjfontface\fang{FangSong}
-}
-
-% Adobe Adobe字体
-\DeclareOption{Adobe}{
-\setmainjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeSongStd-Light}
-\setsansjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeHeitiStd-Regular}
-\newjfontface\kai{AdobeKaitiStd-Regular}
-\newjfontface\fang{AdobeFangsongStd-Regular}
-}
-
-% Founder 方正字体
-\DeclareOption{Founder}{
-\setmainjfont[BoldFont=FZXiaoBiaoSong-B05]{FZShuSong-Z01}
-\setsansjfont[BoldFont=FZHei-B01]{FZHei-B01}
-\newjfontface\kai{FZKai-Z03}
-\newjfontface\fang{FZFangSong-Z02}
-}
-
-% HanYi-J 汉仪字体-文房字宝-简体
-% HanYi-F 汉仪字体-文房字宝-繁体
-% 书宋一简 HYA9GJM.ttf
-% 中宋简　 HYA3GJM.ttf
-% 中黑简　 HYB1GJM.ttf
-% 粗黑简　 HYB9GJM.ttf
-% 楷体简　 HYC1GJM.ttf
-% 仿宋简　 HYD1GJM.ttf
-\DeclareOption{HanYi-J}{
-\setmainjfont[BoldFont=HYA9GJM.ttf]{HYA3GJM.ttf}
-\setsansjfont[BoldFont=HYB9GJM.ttf]{HYB1GJM.ttf}
-\newjfontface\kai{HYC1GJM.ttf}
-\newjfontface\fang{HYD1GJM.ttf}
-}
-
-\DeclareOption{HanYi-F}{
-\setmainjfont[BoldFont=HYA9GFM.ttf]{HYA3GFM.ttf}
-\setsansjfont[BoldFont=HYB9GFM.ttf]{HYB1GFM.ttf}
-\newjfontface\kai{HYC1GFM.ttf}
-\newjfontface\fang{HYD1GFM.ttf}
-}
-
-% cwTeX TrueType (in Debian/Ubuntu)
-\DeclareOption{cwttf}{
-\setmainjfont[BoldFont=cwTeXHeiBold]{cwTeXMing}
-\setsansjfont[BoldFont=cwTeXHeiBold]{cwTeXHeiBold}
-\newjfontface\kai{cwTeXKai}
-\newjfontface\fang{cwTeXFangSong}
-}
-
-% Fandol fonts http://fandol-doc.googlecode.com/files/fandol-fonts.7z
-\DeclareOption{Fandol}{
-\setmainjfont[BoldFont=FandolSong-Bold]{FandolSong-Regular}
-\setsansjfont[BoldFont=FandolHei-Bold]{FandolHei-Regular}
-\newjfontface\kai{FandolKai-Regular}
-\newjfontface\fang{FandolFang-Regular}
-}
-
-\ProcessOptions\relax
-\endinput
+% luatexja-zhfonts.sty
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{luatexja-zhfonts}[2013/09/10 Setting for Chinese fonts]
+\RequirePackage{luatexja-fontspec}
+
+% SinoType 华文字体
+\DeclareOption{SinoType}{
+\setmainjfont[BoldFont=STZhongsong]{STSong}
+\setsansjfont[BoldFont=STXihei]{STXihei}
+\newjfontface\kai{STKaiti}
+\newjfontface\fang{STFangsong}
+}
+
+% ZhongYi 中易字体
+\DeclareOption{ZhongYi}{
+\setmainjfont[BoldFont=SimHei]{SimSun}
+\setsansjfont[BoldFont=SimHei]{SimHei}
+\newjfontface\kai{KaiTi}
+\newjfontface\fang{FangSong}
+}
+
+% Adobe Adobe字体
+\DeclareOption{Adobe}{
+\setmainjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeSongStd-Light}
+\setsansjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeHeitiStd-Regular}
+\newjfontface\kai{AdobeKaitiStd-Regular}
+\newjfontface\fang{AdobeFangsongStd-Regular}
+}
+
+% Founder 方正字体
+\DeclareOption{Founder}{
+\setmainjfont[BoldFont=FZXiaoBiaoSong-B05]{FZShuSong-Z01}
+\setsansjfont[BoldFont=FZHei-B01]{FZHei-B01}
+\newjfontface\kai{FZKai-Z03}
+\newjfontface\fang{FZFangSong-Z02}
+}
+
+% HanYi-J 汉仪字体-文房字宝-简体
+% HanYi-F 汉仪字体-文房字宝-繁体
+% 书宋一简 HYA9GJM.ttf
+% 中宋简　 HYA3GJM.ttf
+% 中黑简　 HYB1GJM.ttf
+% 粗黑简　 HYB9GJM.ttf
+% 楷体简　 HYC1GJM.ttf
+% 仿宋简　 HYD1GJM.ttf
+\DeclareOption{HanYi-J}{
+\setmainjfont[BoldFont=HYA9GJM.ttf]{HYA3GJM.ttf}
+\setsansjfont[BoldFont=HYB9GJM.ttf]{HYB1GJM.ttf}
+\newjfontface\kai{HYC1GJM.ttf}
+\newjfontface\fang{HYD1GJM.ttf}
+}
+
+\DeclareOption{HanYi-F}{
+\setmainjfont[BoldFont=HYA9GFM.ttf]{HYA3GFM.ttf}
+\setsansjfont[BoldFont=HYB9GFM.ttf]{HYB1GFM.ttf}
+\newjfontface\kai{HYC1GFM.ttf}
+\newjfontface\fang{HYD1GFM.ttf}
+}
+
+% cwTeX TrueType (in Debian/Ubuntu)
+\DeclareOption{cwttf}{
+\setmainjfont[BoldFont=cwTeXHeiBold]{cwTeXMing}
+\setsansjfont[BoldFont=cwTeXHeiBold]{cwTeXHeiBold}
+\newjfontface\kai{cwTeXKai}
+\newjfontface\fang{cwTeXFangSong}
+}
+
+% Fandol fonts http://fandol-doc.googlecode.com/files/fandol-fonts.7z
+\DeclareOption{Fandol}{
+\setmainjfont[BoldFont=FandolSong-Bold]{FandolSong-Regular}
+\setsansjfont[BoldFont=FandolHei-Bold]{FandolHei-Regular}
+\newjfontface\kai{FandolKai-Regular}
+\newjfontface\fang{FandolFang-Regular}
+}
+
+\ProcessOptions\relax
+\endinput