fix the pdfpages package does not work with tombow option

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index da98e26..6517262 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -50,7 +50,6 @@
 \else
   \directlua{%
     luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
-    luatexja.direction.shipout = nil
   }
 \fi
 

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index b501ec0..27cc334 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2021-03-17 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2021-03-19 Patch to LaTeX2e Kernel for LuaTeX-ja]
 \RequirePackage{etoolbox}
 
 %%% expl3
@@ -89,7 +89,7 @@
 \newbox\@BR\newbox\@Br
 \newbox\@CL
 \newbox\@CR
-\font\@bannerfont=cmtt9
+\font\@bannerfont=file:lmmono9-regular.otf % cmtt9 in pLaTeX
 \newtoks\@bannertoken
 \@bannertoken{}
 \def\maketombowbox{%
@@ -137,7 +137,7 @@
 }
 \def\@outputtombow#1#2{%
   \iftombow
-  \vbox to\z@{\kern\dimexpr#1-10mm-\@tombowbleed\relax
+  \setbox0\vbox to\z@{\kern\dimexpr#1-10mm-\@tombowbleed\relax
     \boxmaxdepth\maxdimen
       \moveleft\dimexpr#2+\@tombowbleed\vbox to\@@paperheight{%
          \color@begingroup
@@ -153,9 +153,10 @@
       \kern-10mm
       \hbox to\@@paperwidth{\hskip\@tombowbleed\relax
          \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip\@tombowbleed}%
-       \color@endgroup
+         \color@endgroup
     }\vss
   }%
+  \dp\z@=\z@ \wd\z@=\z@\box\z@
   \fi
 }
 \def\@tombowcolor{\normalcolor}
@@ -169,7 +170,7 @@
 }
 \newdimen\@@paperheight
 \newdimen\@@paperwidth
-
+\newdimen\@@topmargin % not used by LuaTeX-ja; only to avoid existing codes
 \patchcmd\@outputpage{\begingroup\let\protect\noexpand}{% tate direction
 \begingroup
   \ifnum\ltjgetparameter{direction}=4\else
@@ -205,7 +206,6 @@
   \patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow{0pt}{0pt}}{}{}
 \fi
 
-
 %%% Remove extra xkanjiskip
 \renewcommand\@makefnmark{%
   \unless\ifnum\ltjgetparameter{direction}=3