summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luatexja/src
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-02-20 03:01:19 +0000
committerNorbert Preining <norbert@preining.info>2024-02-20 03:01:19 +0000
commit203d8df9dde93676afcceb5ace315faeda77d016 (patch)
tree648ea4ae015ff2a7b20bd239d3377cca6dcabfe3 /macros/luatex/generic/luatexja/src
parente11a34ebeb96a1e568cc937df3b614062ddb0adf (diff)
CTAN sync 202402200301
Diffstat (limited to 'macros/luatex/generic/luatexja/src')
-rw-r--r--macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty15
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-lineskip.lua13
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty2
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjcore.sty3
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty2
5 files changed, 26 insertions, 9 deletions
diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty
index 2fc3d6bb29..76ebf8716c 100644
--- a/macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/ltj-lineskip.lua b/macros/luatex/generic/luatexja/src/ltj-lineskip.lua
index 107ee804a8..a2de19140e 100644
--- a/macros/luatex/generic/luatexja/src/ltj-lineskip.lua
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index 442e73cf9e..164c02d8d3 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/patches/lltjcore.sty b/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
index fff34327c7..1c8f9cba4e 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
+++ b/macros/luatex/generic/luatexja/src/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/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty
index 617eedaf9d..589a3c5d6e 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty
+++ b/macros/luatex/generic/luatexja/src/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: