diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
3 files changed, 19 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty index edb8da8f3ed..cc2ff1106a1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec-25c}[2017/05/05 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-25c}[2017/12/15 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -140,7 +140,7 @@ } \clist_set:Nx \g__fontspec_default_fontopts_clist { YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, - Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, Script=CJK, + Scale=\Cjascale, Kerning=Off, Script=CJK, \g__ltj_fontspec_default_fontopts_clist } \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop 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 848eedbd68a..34ef824f38e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -3,17 +3,19 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2017/06/25 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2017/12/31 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn -%%%%%%%% \g_ltj_fontspec_scale_fp -%% Default scale value for jfont. -\fp_new:N \g_ltj_fontspec_scale_fp -\group_begin: -\fontsize{16}{16}\selectfont -\fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 16} -\group_end: +\cs_if_exist:NF \Cjascale { + %%%%%%%% \g_ltj_fontspec_scale_fp + %% Default scale value for jfont. + \fp_new:N \g_ltj_fontspec_scale_fp + \group_begin: + \fontsize{16}{16}\selectfont + \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} } + \group_end: +} \bool_new:N \ltj_fontspec_match_bool \keys_define:nn { luatexja-fontspec } @@ -22,10 +24,11 @@ match .default:n = true, pass .code:n = \PassOptionsToPackage{#1} {fontspec}, % 互換性のために残したオプション - scale .fp_gset:N = \g_ltj_fontspec_scale_fp, + scale .code:n = \gdef\Cjascale{#1}, unknown .code:n = \PassOptionsToPackage { \l_keys_key_tl } {fontspec}, } \ProcessKeysOptions{ luatexja-fontspec } + \RequirePackage{fontspec}[2017/01/01]% v2.5c \RequirePackage{luatexja-fontspec-25c} %\@ifpackagelater{fontspec}{2017/01/01}% 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 a0d0dc3c37c..a5cf7b77fa5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -1,16 +1,10 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2017/09/04 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2017/12/15 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} \ExplSyntaxOn -\fp_new:N \g_ltjpreset_scale_fp -\group_begin: -\fontsize{10}{10}\selectfont -\fp_gset:Nn \g_ltjpreset_scale_fp {\zw / 10} -\group_end: - %% messages \msg_new:nnn { luatexja-preset }{ ltj-fontspec }{ The~ luatexja-fontspec~ package~ is~ loaded~ already.~ @@ -44,7 +38,7 @@ \tl_if_empty:NT \l_tmpa_tl { \PassOptionsToPackage { \l_tmpa_tl } { luatexja-fontspec } }, - scale .fp_gset:N = \g_ltjpreset_scale_fp, + scale .code:n = \gdef\Cjascale{#1}, match .code: n = \renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue \PassOptionsToPackage { match } { luatexja-fontspec }, @@ -450,11 +444,11 @@ \bool_if:NTF \g_ltjpreset_nfssonly_bool { %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% nfss only - \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltjpreset_scale_fp } + \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale } \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn { \cs_if_exist:cT { #1/#2/#3/#4/10 } { \cs_undefine:c { #1/#2/#3/#4/10 } } - \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\fp_use:N \g_ltjpreset_scale_fp] + \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale] { \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5 ;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {} } @@ -515,10 +509,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%% fontspec } { - \PassOptionsToPackage { scale = \fp_use:N \g_ltjpreset_scale_fp } { luatexja-fontspec } \RequirePackage{luatexja-fontspec} % scale - \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltj_fontspec_scale_fp } + \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale } \tl_new:N \l_ltjpreset_add_features_tl \bool_if:NT \g_ltjpreset_expert_bool { |