From 743fd3c6952b8673561b17273ef55b16fbd3bb59 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Fri, 19 Mar 2021 18:56:29 +0900 Subject: [PATCH] lltjcore: postponed to use shipout hook for tombow --- src/patches/lltjcore.sty | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty index 685ed1a..19fe320 100644 --- a/src/patches/lltjcore.sty +++ b/src/patches/lltjcore.sty @@ -135,12 +135,11 @@ \vrule height10mm depth10mm width\@tombowwidth \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}% } -\def\@outputtombow{\@ifnextchar[{\@@outputtombow}{\@@outputtombow[0pt][0pt]}}%] -\def\@@outputtombow[#1][#2]{% +\def\@outputtombow{% \iftombow - \setbox0\vbox to\z@{\kern\dimexpr#1-10mm-\@tombowbleed\relax + \vbox to\z@{\kern\dimexpr-10mm-\@tombowbleed\relax \boxmaxdepth\maxdimen - \moveleft\dimexpr#2+\@tombowbleed\vbox to\@@paperheight{% + \moveleft\@tombowbleed\vbox to\@@paperheight{% \color@begingroup \@tombowcolor \hbox to\@@paperwidth{\hskip\@tombowbleed\relax @@ -154,10 +153,9 @@ \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} @@ -197,16 +195,11 @@ \ifnum\ltjgetparameter{direction}=3 \let\@themargin\oddsidemargin \else\let\@themargin\evensidemargin\fi }{}{} -\ifltj@ltfilehook@avail - \AddToHook{shipout/before}{% - \iftombow\setbox\ShipoutBox\vbox{\vskip1in\moveright1in\box\ShipoutBox}\fi - } - \AddToHook{shipout/background}{\@tombowreset@@paper\@outputtombow[1in][-1in]} -\else - \patchcmd\@outputpage{\vskip\topmargin}{\vskip\topmargin\iftombow\vskip1in\fi}{}{} - \patchcmd\@outputpage{\reset@font}{\@tombowreset@@paper\reset@font}{}{} - \patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{} -\fi + +% 将来は shipout hook で書き直したい +\patchcmd\@outputpage{\vskip\topmargin}{\vskip\topmargin\iftombow\vskip1in\fi}{}{} +\patchcmd\@outputpage{\reset@font}{\@tombowreset@@paper\reset@font}{}{} +\patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{} %%% Remove extra xkanjiskip \renewcommand\@makefnmark{% -- 2.11.0