From 203d8df9dde93676afcceb5ace315faeda77d016 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 20 Feb 2024 03:01:19 +0000 Subject: CTAN sync 202402200301 --- macros/luatex/generic/luatexja/README | 6 +++--- macros/luatex/generic/luatexja/doc/luatexja-en.pdf | Bin 701108 -> 701120 bytes macros/luatex/generic/luatexja/doc/luatexja-ja.pdf | Bin 1143386 -> 1143952 bytes macros/luatex/generic/luatexja/doc/luatexja.dtx | 7 +++++-- .../luatexja/src/addons/luatexja-fontspec-27c.sty | 15 ++++++++------- .../luatex/generic/luatexja/src/ltj-lineskip.lua | 13 +++++++++++++ macros/luatex/generic/luatexja/src/luatexja.sty | 2 +- .../generic/luatexja/src/patches/lltjcore.sty | 3 +++ .../luatexja/src/patches/lltjp-fontspec.sty | 2 +- 9 files changed, 34 insertions(+), 14 deletions(-) (limited to 'macros/luatex') diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README index e4cc9e1dcb..4e48f6c82f 100644 --- a/macros/luatex/generic/luatexja/README +++ b/macros/luatex/generic/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20231230.0 +The LuaTeX-ja Package 20240219.0 -------------------------------- Copyright (c) 2011--2023 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -41,7 +41,7 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20231230.0 in the Git repository by + or tagged as 20240219.0 in the Git repository by b. Extract the archive and process following three files by LuaLaTeX @@ -91,4 +91,4 @@ Notes This file and ltj-kinsoku.lua are not used anymore. (Do not remove ltj-kinsoku.tex.) -Last commit date: Sat Dec 30 09:05:58 2023 +0900 +Last commit date: Mon Feb 19 19:11:46 2024 +0900 diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf index 3e54f31db8..547c5f9b46 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf differ diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf index 67386dc118..3dc1d9a8d7 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf differ diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx index 2be57d0a6c..dace65c689 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja.dtx +++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx @@ -7675,7 +7675,7 @@ for making the difference obvious.} \begin{itemize} \item 現在のリストにおける最後のノード \footnote{最後のノードが\cs{parskip}によるグルーであった場合のみ - さらに一つ前のノードを参照する}が水平ボックス$h'$であり,かつ + さらに一つ前のノードを参照する.}が水平ボックス$h'$であり,かつ \item \cs{prevdepth}の値とその$h'$の深さの値が一致している \end{itemize} 場合にのみ発動するようにしている. @@ -7683,7 +7683,10 @@ for making the difference obvious.} 参照せず,あくまでも$h''$自身の高さ・深さのみを参照する. 参照するようにしてしまうと,\cs{smash}など手動で行った高さ・深さ調整の意味がなくなってしまうからである. \end{itemize} - + なお,現在の実装では,「中身までみる行間調整」は,外部垂直モードにおける + 前の段落の最終行と次の段落の先頭行との間では + 満足に動作しないことがある.これについては今後の課題である. + \begin{figure}[t] \noindent\centering \begin{minipage}[b]{16\zw} 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 @@ -48,6 +48,19 @@ function ltjl.setting(profiler, skip_method) ltj_skip = ltjl['l_'..tostring(skip_method)] or ltjl.l_dummy 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) 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: -- cgit v1.2.3