lltjcore etc.: use \pltx@adjust@wd@outputbox

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 19fe320..19b365a 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2021-03-19 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2021-03-25 Patch to LaTeX2e Kernel for LuaTeX-ja]
 \RequirePackage{etoolbox}
 
 %%% expl3
@@ -266,44 +266,17 @@
 \newif\iffnfixbottom
 \newif\ifltj@ftn@unvboxed
 %%% @makecol
-\gdef \@makecol {%
-   \ifvoid\footins
-     \ltj@ftn@unvboxedfalse
-     \setbox\@outputbox \box\@cclv
-   \else
-     \ltj@ftn@unvboxedtrue
-     \setbox\@outputbox \vbox {%
-       \boxmaxdepth \@maxdepth
-       \unvbox \@cclv
-       \iffnfixbottom\vskip\z@ \@plus.0001fil\fi
-       \vskip \skip\footins
-       \color@begingroup
-         \normalcolor
-         \footnoterule
-         \unvbox \footins
-       \color@endgroup
-       }%
-   \fi
-   \let\@elt\relax
-   \xdef\@freelist{\@freelist\@midlist}%
-   \global \let \@midlist \@empty
-   \@combinefloats
-   \ifvbox\@kludgeins
-     \@makespecialcolbox
-   \else
-     \setbox\@outputbox \vbox to\@colht {%
-       \@texttop
-       \dimen@ \dp\@outputbox
-       \unvbox \@outputbox
-       \unless\ifnum\ltjgetparameter{direction}=4
-         \vbox{\primitive\everypar{}\hskip\z@}%
-       \fi %%% LuaTeX-ja
-       \vskip -\dimen@
-       \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi
-       }%
-   \fi
-   \global \maxdepth \@maxdepth
-}
+\def\pltx@adjust@wd@outputbox{%
+  \unless\ifnum\ltjgetparameter{direction}=4
+    \vbox{\primitive\everypar{}\hskip\z@}%
+   \fi}
+\patchcmd\@makecol{\vskip -\dimen@\@textbottom}%
+  {\pltx@adjust@wd@outputbox
+   \vskip -\dimen@
+   \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+\patchcmd\@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{}
+\patchcmd\@makecol{\ifvoid\footins}{\ifvoid\footins\ltj@ftn@unvboxedfalse}{}{}
+\patchcmd\@makecol{\setbox\@outputbox \vbox}{\ltj@ftn@unvboxedtrue\setbox\@outputbox \vbox}{}{}
 \let\ltj@orig@makecol=\@makecol
 
 \patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}

diff --git a/src/patches/lltjp-footmisc.sty b/src/patches/lltjp-footmisc.sty
index 99ed190..b838fd9 100644 (file)
--- a/src/patches/lltjp-footmisc.sty
+++ b/src/patches/lltjp-footmisc.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-footmisc}[2021-03-17 Patch to footmisc for LuaTeX-ja]
+\ProvidesPackage{lltjp-footmisc}[2021-03-25 Patch to footmisc for LuaTeX-ja]
 \RequirePackage{footmisc}
 
 \let  \if@tempswa  \ifFN@bottom
@@ -47,9 +47,7 @@
       \setbox\@outputbox \vbox to\@colht{%
         \@texttop \dimen@\dp\@outputbox
         \unvbox\@outputbox
-        \unless\ifnum\ltjgetparameter{direction}=4
-          \vbox{\primitive\everypar{}\hskip\z@}%
-        \fi %%% LuaTeX-ja
+        \pltx@adjust@wd@outputbox
         \vskip -\dimen@\@textbottom
       }%
     \fi

diff --git a/src/patches/lltjp-stfloats.sty b/src/patches/lltjp-stfloats.sty
index 6ce9528..c4cd3ca 100644 (file)
--- a/src/patches/lltjp-stfloats.sty
+++ b/src/patches/lltjp-stfloats.sty
@@ -1,5 +1,5 @@
 %
-% lltjp-stfloats.sty 2021-03-17
+% lltjp-stfloats.sty 2021-03-25
 %
 
 \NeedsTeXFormat{LaTeX2e}
@@ -14,9 +14,7 @@
 \global\let\org@makecol\ltj@orig@makecol
 
 \patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}%
-  {\unless\ifnum\ltjgetparameter{direction}=4
-     \vbox{\primitive\everypar{}\hskip\z@}%
-   \fi %%% LuaTeX-ja
+  {\pltx@adjust@wd@outputbox
    \vskip -\dimen@
    \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
 \patchcmd\fn@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{}