diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty | 9 |
2 files changed, 5 insertions, 8 deletions
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 60c4c75a312..19d9952fef6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2020-04-01 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2020-09-14 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -23,7 +23,7 @@ pass .code:n = \PassOptionsToPackage{#1} {fontspec}, % 互換性のために残したオプション scale .code:n = \gdef\Cjascale{#1}, - unknown .code:n = \PassOptionsToPackage { \l_keys_key_tl } {fontspec}, + unknown .code:n = \PassOptionsToPackage { \l_keys_key_str } {fontspec}, } \ProcessKeysOptions{ luatexja-fontspec } 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 279ebb09b70..b0ce39bf5d8 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}[2020-06-14 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2020-09-14 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} @@ -34,12 +34,9 @@ \keys_define:nn { luatexja-preset }{ unknown .code:n = - \keys_set_known:noN { ltjpreset-presets } { \tl_use:N \l_keys_tl } \l_tmpa_tl - \tl_if_empty:NT \l_tmpa_tl { - \PassOptionsToPackage { \l_tmpa_tl } { luatexja-fontspec } - }, + \PassOptionsToPackage { \l_keys_key_str } { luatexja-fontspec }, scale .code:n = \gdef\Cjascale{#1}, - match .code: n = + match .code:n = \renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue \PassOptionsToPackage { match } { luatexja-fontspec }, match .value_forbidden:n = true, |