From 50834d5bc5540f43c363b17c18a9809b5a827a47 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Jul 2013 23:26:02 +0000 Subject: luatexja 20130711.0 (12jul13) git-svn-id: svn://tug.org/texlive/trunk@31183 c570f23f-e606-0410-a88d-b1316a301751 --- .../luatex/luatexja/addons/luatexja-fontspec.sty | 4 ++ .../tex/luatex/luatexja/addons/luatexja-preset.sty | 28 ++++---- .../luatex/luatexja/addons/luatexja-zhfonts.sty | 77 ++++++++++++++++++++++ 3 files changed, 97 insertions(+), 12 deletions(-) create mode 100644 Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons') diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty index 13a2520b15e..c368215ffec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -152,6 +152,9 @@ \cs_set_eq:NN \addjfontfeature \addjfontfeatures +%%% CJKShape=JIS2004 +\fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04} + \ExplSyntaxOff %%%%%%%% Now we completely ignore kanjifont definition file. @@ -224,4 +227,5 @@ \fi \fi} + \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty index ad0a21b886f..d3b32e0419a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -1,5 +1,5 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2013/05/14 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2013/05/25 Japanese font presets] %% Sync with PXchfon 0.6a \RequirePackage{expl3} @@ -38,8 +38,8 @@ % 漢字字形 \tl_new:N \l_ltjpreset_kanji_shape_tl -\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp90 }} % 90jis -\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp04 }} % jis2004 +\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis +\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004 % font preset \bool_new:N \l_ltjpreset_office_bool % MS Office の HG 系フォントを使っているか @@ -232,9 +232,9 @@ %% KozMinPr6N の場合はjp04 feature がないので,nlck にする \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } { - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { - \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +nlck } + \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC } } } @@ -271,7 +271,7 @@ %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換 \bool_if:NT \l_ltjpreset_office_bool { - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc } \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc } @@ -280,7 +280,7 @@ \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni: % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う } - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp90} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc } \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc } @@ -306,11 +306,13 @@ \int_compare:nTF { \l_ltjpreset_deluxe_int == 2 } { \newjfontfamily \mgfamily [ \tl_use:N \l_ltjpreset_add_features_tl - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_mg: } \newjfontfamily \gtebfamily [ \tl_use:N \l_ltjpreset_add_features_tl - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_eb: } \bool_if:NT \l_ltjpreset_bold_bool { \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx: @@ -328,15 +330,17 @@ %%%% 実際の fontspec の呼びだし -\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl } +\defaultjfontfeatures{ Kerning=Off } \setmainjfont [ BoldFont = \ltjpreset_font_mc_bx: - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_mc_m: } \setsansjfont [ BoldFont = \ltjpreset_font_gt_bx: - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_m: } \ExplSyntaxOff diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty new file mode 100644 index 00000000000..fd5f7741cda --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty @@ -0,0 +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 -- cgit v1.2.3