diff options
Diffstat (limited to 'Master/texmf-dist/tex')
5 files changed, 26 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty index 2fc3d6bb295..76ebf8716c8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec-27c}[2020-04-04 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-27c}[2024-02-19 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e} \ExplSyntaxOn @@ -90,16 +90,16 @@ %% save and restore global variable \tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl \tl_new:N \g__ltj_fontspec_orig_nfss_family_tl -\seq_new:N \g__ltj_fontspec_kanji_bf_series_seq -\seq_new:N \g__ltj_fontspec_orig_bf_series_seq +\seq_new:N \l__ltj_fontspec_kanji_bf_series_seq +\seq_new:N \l__ltj_fontspec_orig_bf_series_seq \clist_new:N \g__ltj_fontspec_kanji_default_fontopts_clist \clist_new:N \g__ltj_fontspec_orig_default_fontopts_clist \cs_new:Nn \__ltj_set_global_variable_for_kanji: { \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl - \seq_gset_eq:NN \g__ltj_fontspec_orig_bf_series_seq \g__fontspec_bf_series_seq - \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_kanji_bf_series_seq + \seq_set_eq:NN \l__ltj_fontspec_orig_bf_series_seq \l__fontspec_bf_series_seq + \seq_set_eq:NN \l__fontspec_bf_series_seq \l__ltj_fontspec_kanji_bf_series_seq %\seq_gclear:N \g__fontspec_bf_series_seq \clist_set_eq:NN \g__ltj_fontspec_orig_default_fontopts_clist \g__fontspec_default_fontopts_clist \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_kanji_default_fontopts_clist @@ -108,8 +108,8 @@ \cs_new:Nn \__ltj_restore_global_variable: { \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl - \seq_gset_eq:NN \g__ltj_fontspec_kanji_bf_series_seq \g__fontspec_bf_series_seq - \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_orig_bf_series_seq + \seq_set_eq:NN \l__ltj_fontspec_kanji_bf_series_seq \l__fontspec_bf_series_seq + \seq_set_eq:NN \l__fontspec_bf_series_seq \l__ltj_fontspec_orig_bf_series_seq \clist_set_eq:NN \g__ltj_fontspec_kanji_default_fontopts_clist \g__fontspec_default_fontopts_clist \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_orig_default_fontopts_clist } @@ -364,6 +364,7 @@ \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3} } +\prop_new:N \l__ltj_fontspec_tmp_prop \prop_new:N \g__ltj_fontspec_fontopts_prop \DeclareDocumentCommand \defaultjfontfeatures { t+ o m } { diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua index 107ee804a88..a2de19140e1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua @@ -49,6 +49,19 @@ function ltjl.setting(profiler, skip_method) end do + local backup + function ltjl.setting_backup() + backup = { ltj_profiler, ltj_skip } + ltj_profiler, ltj_skip = ltjl.p_dummy, ltjl.l_dummy + end + function ltjl.setting_restore() + if backup then + ltj_profiler, ltj_skip, backup = backup[1], backup[2], nil + end + end +end + +do local traverse_id = node.direct.traverse_id local function adjust_glue(nh) local h = to_direct(nh) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 442e73cf9e5..164c02d8d3c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -27,7 +27,7 @@ \newif\ifltj@disablejfam %%%% VERSION -\def\LuaTeXjaversion{20231230.0} +\def\LuaTeXjaversion{20240219.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index fff34327c77..1c8f9cba4ef 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -176,6 +176,7 @@ \ifnum\ltjgetparameter{direction}=4\else \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ \fi + \directlua{luatexja.lineskip.setting_backup()} \let \protect \noexpand }{}{} \patchcmd\@outputpage{% supply \yoko @@ -200,6 +201,8 @@ \patchcmd\@outputpage{\vskip\topmargin}{\vskip\topmargin\iftombow\vskip1in\fi}{}{} \patchcmd\@outputpage{\reset@font}{\@tombowreset@@paper\reset@font}{}{} \patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{} +\patchcmd\@outputpage{\stepcounter{page}}% + {\stepcounter{page}\directlua{luatexja.lineskip.setting_restore()}}{}{} % \pretocmd\@floatboxreset{\pltx@save@float@dir}{}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty index 617eedaf9d9..589a3c5d6ef 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -147,7 +147,7 @@ \__fontspec_setmonofont_hook:nn {#1} {#2} \normalfont } -%% end of 2.7d +%% end of 2.7c }} \cs_set:Nn \fontspec_visible_space: |