\AtBeginDvi

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index a6b71f3..e858a8a 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2019/09/26 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2020-09-13 Patch to LaTeX2e Kernel for LuaTeX-ja]
 \RequirePackage{etoolbox}
 
 \def\cleardoublepage{\clearpage\if@twoside
@@ -239,11 +239,13 @@
   \ifmmode\@@underline{#1}%
   \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
 
-%%% AtBeginDvi
+%%% AtBeginDvi: NOT needed to patch in LaTeX 2020-10-01 pre-release 9 or later
+\unless\ifltj@ltshipout@avail
 \DeclareRobustCommand \AtBeginDvi [1]{%
   \global \setbox \@begindvibox
     \vbox{\yoko\unvbox \@begindvibox #1}%
 }
+\fi
 
 \newif\iffnfixbottom
 \newif\ifltj@ftn@unvboxed

diff --git a/src/patches/lltjp-atbegshi.sty b/src/patches/lltjp-atbegshi.sty
index 8512023..a4b3401 100644 (file)
--- a/src/patches/lltjp-atbegshi.sty
+++ b/src/patches/lltjp-atbegshi.sty
@@ -4,7 +4,7 @@
 
 \newif\ifltj@ltshipout@avail
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-atbegshi}[2020-08-08 Patching \string\shipout\space hooks for LuaTeX-ja]
+\ProvidesPackage{lltjp-atbegshi}[2020-09-13 Patching \string\shipout\space hooks for LuaTeX-ja]
 \@ifl@t@r\fmtversion{2020-10-01}{%
   \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltshipout@availtrue\fi
   \else\ltj@ltshipout@availtrue\fi
@@ -19,13 +19,14 @@
 \RequirePackage{expl3}
 \ExplSyntaxOn\makeatletter
 \box_new:N \l__platex_shipout_dummy_box
-\pretocmd {\__shipout_execute_cont:}
-  {\tex_setbox:D \l__platex_shipout_dummy_box \tex_vbox:D \c_group_begin_token \yoko } {} {}
-\apptocmd {\__shipout_execute_cont:} {\c_group_end_token} {} {}
+\tl_put_left:Nn {\__shipout_execute_cont:}
+  {\tex_setbox:D \l__platex_shipout_dummy_box \tex_vbox:D \c_group_begin_token \yoko }
+\tl_put_right:Nn {\__shipout_execute_cont:} {\c_group_end_token}
 \ExplSyntaxOff
 %</ltshipout>-----------------------------------
 
-\else
+\expandafter\endinput
+\fi
 \AtBeginShipoutInit
 %<*atbegshi>-------------------------------------
 % patching atbegshi.sty
@@ -89,5 +90,4 @@
 \endgroup
 %% internal macros are no longer effective
 %</atbegshi>-------------------------------------
-\fi
 \endinput