texlive[69988] branches/branch2023.final/Master/texmf-dist: luatexja

commits+karl at tug.org commits+karl at tug.org
Mon Feb 19 21:59:42 CET 2024 

Revision: 69988
          https://tug.org/svn/texlive?view=revision&revision=69988
Author:   karl
Date:     2024-02-19 21:59:42 +0100 (Mon, 19 Feb 2024)
Log Message:
-----------
luatexja (branch) (19feb24)

Modified Paths:
--------------
    branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/README
    branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
    branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
    branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
    branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
    branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua
    branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
    branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
    branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty

Modified: branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/README	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/README	2024-02-19 20:59:42 UTC (rev 69988)
@@ -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 @@
 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
       <https://github.com/luatexja/luatexja/archive/refs/tags/$VER.zip>
 
    b. Extract the archive and process following three files by LuaLaTeX
@@ -91,4 +91,4 @@
   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

Modified: branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)

Modified: branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)

Modified: branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx	2024-02-19 20:59:42 UTC (rev 69988)
@@ -7675,7 +7675,7 @@
 	\begin{itemize}
 	 \item 現在のリストにおける最後のノード
 	  \footnote{最後のノードが\cs{parskip}によるグルーであった場合のみ
-		さらに一つ前のノードを参照する}が水平ボックス$h'$であり，かつ
+		さらに一つ前のノードを参照する．}が水平ボックス$h'$であり，かつ
 	  \item \cs{prevdepth}の値とその$h'$の深さの値が一致している
 	\end{itemize}
 	場合にのみ発動するようにしている．
@@ -7683,7 +7683,10 @@
 	参照せず，あくまでも$h''$自身の高さ・深さのみを参照する．
 	参照するようにしてしまうと，\cs{smash}など手動で行った高さ・深さ調整の意味がなくなってしまうからである．
   \end{itemize}
-  
+  なお，現在の実装では，「中身までみる行間調整」は，外部垂直モードにおける
+  前の段落の最終行と次の段落の先頭行との間では
+  満足に動作しないことがある．これについては今後の課題である．
+
   \begin{figure}[t]
 	\noindent\centering
 	\begin{minipage}[b]{16\zw}

Modified: branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty	2024-02-19 20:59:42 UTC (rev 69988)
@@ -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,8 +90,8 @@
 %% 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
 
@@ -98,8 +98,8 @@
 \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 }
  {

Modified: branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/ltj-lineskip.lua	2024-02-19 20:59:42 UTC (rev 69988)
@@ -49,6 +49,19 @@
 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)

Modified: branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2024-02-19 20:59:42 UTC (rev 69988)
@@ -27,7 +27,7 @@
 \newif\ifltj at disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20231230.0}
+\def\LuaTeXjaversion{20240219.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup

Modified: branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty	2024-02-19 20:59:42 UTC (rev 69988)
@@ -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 at font}{\@tombowreset@@paper\reset at font}{}{}
 \patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{}
+\patchcmd\@outputpage{\stepcounter{page}}%
+  {\stepcounter{page}\directlua{luatexja.lineskip.setting_restore()}}{}{}
 
 %
 \pretocmd\@floatboxreset{\pltx at save@float at dir}{}{}

Modified: branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty	2024-02-19 20:59:23 UTC (rev 69987)
+++ branches/branch2023.final/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty	2024-02-19 20:59:42 UTC (rev 69988)
@@ -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:

More information about the tex-live-commits mailing list.