From cdc0d80edd38bfcfa7f90b7136f2b0ded4102496 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 May 2018 21:31:08 +0000 Subject: platex (20may18) git-svn-id: svn://tug.org/texlive/trunk@47782 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/exppl2e.sty | 177 +---------------- .../texmf-dist/tex/platex/base/platexrelease.sty | 218 ++++++++++++++++++++- Master/texmf-dist/tex/platex/base/plcore.ltx | 56 +++--- 3 files changed, 254 insertions(+), 197 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index afdc6718398..b3b29d9ae21 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2018/04/06 v1.0u Experimental pLaTeX2e features] + [2018/05/20 v1.0v Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -406,183 +406,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \subsection{直前のJFM由来スペースの削除【コミュニティ版独自】} -% 現状のp\TeX{}(\TeX\ Live 2017時点)では、 -% |\inhibitglue|プリミティブは「JFM由来のスペース(グルー・カーン)挿入 -% ルーチンを抑制する」働きをします。しかし、既に挿入されてしまった -% JFMグルーやカーンを削除することはできません。 -% -% \begin{macro}{\removejfmglue} -% そこで、「最後のノードがJFMグルーであった場合にそれを削除する」という -% ユーザ向け命令を定義します。この機能にはe-p\TeX{} 180226以降の -% |\lastnodesubtype|プリミティブが必要です。 -% \changes{v1.2x}{2018/03/01}{JFMグルーノードを削除するマクロ追加} -% \begin{macrocode} -%\plIncludeInRelease{2018/03/09}% -% {\removejfmglue}{Macro added}% -%<*plcore|platexrelease> -% \end{macrocode} -% \begin{macrocode} -\ifx\lastnodesubtype\@undefined - \let\removejfmglue\@undefined -\else - \def\pltx@gluetype{11} - \def\pltx@jfmgluesubtype{21} - \protected\def\removejfmglue{% - \ifnum\lastnodetype=\pltx@gluetype\relax - \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax - \unskip - \fi - \fi} -\fi -% -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}% -% {\removejfmglue}{Macro added}% -%\let\removejfmglue\@undefined -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} +% +% p\LaTeXe{}カーネル(2018/03/09)に導入したため削除。 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{tabular環境のセル内のJFMグル―} % -% \begin{macro}{\@tabclassz} -% \LaTeX{}カーネルは、アラインメント文字|&|の周囲に半角空白を書いたかどうかに -% かかわらず余分なスペースを出力しないように、|\ignorespaces|と|\unskip|を -% 発行しています(lttab.dtx)。しかし、これだけではJFMグルーが消えずに残って -% しまうので、p\LaTeX{}では追加の対処を入れます。 -% -% まず、|l|, |c|, |r|の場合です。 -% 2017/09/26の修正では「セルの要素を|\mbox|に入れ、 -% その最初で|\inhibitglue|を発行する」という方針でしたが、 -% 2018/03/09の修正では「|\removejfmglue|マクロが定義されている場合は -% 最初に|\inhibitglue|を発行し、最後に|\removejfmglue|を発行する」という -% 方針にします。こうすれば少々\LaTeX{}との互換性が向上します。 -% \changes{v1.2p}{2017/07/21}{tabular環境のセル内のJFMグル―を削除} -% \changes{v1.2r}{2017/09/26}{tabular環境の右揃え(r)で罫線がずれるように -% なっていたバグを修正} -% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}があれば利用するようにした} -% \begin{macrocode} -%\plIncludeInRelease{2018/03/09}{\@tabclassz} -% {Inhibit JFM glue in tabular cells}% -%<*plcore|platexrelease> -\ifx\removejfmglue\@undefined -\def\@tabclassz{% - \ifcase\@lastchclass - \@acolampacol - \or - \@ampacol - \or - \or - \or - \@addamp - \or - \@acolampacol - \or - \@firstampfalse\@acol - \fi - \edef\@preamble{% - \@preamble{% - \ifcase\@chnum - \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c - \or - \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l - \or - \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r - \fi}}} -\else -\def\@tabclassz{% - \ifcase\@lastchclass - \@acolampacol - \or - \@ampacol - \or - \or - \or - \@addamp - \or - \@acolampacol - \or - \@firstampfalse\@acol - \fi - \edef\@preamble{% - \@preamble{% - \ifcase\@chnum - \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c - \or - \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l - \or - \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r - \fi}}} -\fi -% -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@classv} -% 次に、|p|の場合です。 -% 2017/07/29の修正では|\mbox{}\inhibitglue|と|\unskip|を追加していましたが、 -% 以下のように|p|指定のセルの最初で|\par|として -% 改段落を発行すると、一行空いてしまうという症状が起きてしまいます(platex/\#63)。 -%\begin{verbatim} -% \begin{tabular}{p{5cm}} -% A\\ -% \relax\par -% A -% \end{tabular} -%\end{verbatim} -% ここでは、2017/07/29の修正から方針を改め、|\everypar|内に|\inhibitglue|を -% 仕込むという方針で対応します。 -% \changes{v1.2p}{2017/07/21}{tabular環境のセル内のJFMグル―を削除} -% \changes{v1.2x}{2018/03/01}{セル最初の\cs{par}で空行が入らないようにした} -% \begin{macrocode} -%\plIncludeInRelease{2018/03/09}{\@classv} -% {Inhibit JFM glue in tabular cells}% -%<*plcore|platexrelease> -\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces -\@sharp\unskip\@endpbox}} -% -%\plEndIncludeInRelease -%\plIncludeInRelease{2017/07/29}{\@classv} -% {Inhibit JFM glue in tabular cells}% -%\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces -%\@sharp\unskip\@endpbox}} -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\@classv} -% {Inhibit JFM glue in tabular cells}% -%\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces -%\@sharp\@endpbox}} -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\pltx@next@inhibitglue} -% 水平モードであればそのまま|\inhibitglue|を発行し、それ以外であれば -% |\everypar|内に|\inhibitglue|を仕込みます。 -% \changes{v1.2x}{2018/03/01}{\cs{everypar}に\cs{inhibitglue}を仕込むマクロ追加} -% \changes{v1.2y}{2018/03/12}{\cs{inhibitglue}を\cs{everypar}の末尾に移動} -% \begin{macrocode} -%\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue} -% {Add \pltx@next@inhibitglue}% -%<*plcore|platexrelease> -\protected\def\pltx@next@inhibitglue{% - \ifhmode\inhibitglue\else - \edef\@tempa{\everypar{% - \everypar{\unexpanded\expandafter{\the\everypar}}% - \unexpanded\expandafter{\the\everypar}\inhibitglue}}% - \@tempa\fi} -% -%\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue} -% {Add \pltx@next@inhibitglue}% -%\let\pltx@next@inhibitglue\@undefined -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} +% p\LaTeXe{}カーネル(2017/07/29)に導入したため削除。 % -% % p\LaTeXe{}カーネル(2017/07/29)に導入したため削除。 +% さらなる修正もp\LaTeXe{}カーネル(2018/03/09)に導入したため削除。 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index f11e6f6a556..0dcc1e3ac2c 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,7 +18,7 @@ \edef\p@known@latexreleaseversion {2018-04-01} \edef\platexreleaseversion - {2018-04-01} + {2018-05-20} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -131,6 +131,9 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-05-20> + % * <2018-04-01>+2 + % * <2018-04-01>+1 % * <2018-04-01> % * <2018/03/09>+1 % * <2018/03/09> @@ -837,11 +840,140 @@ of this package available from CTAN} \global \maxdepth \@maxdepth } \plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\@tombowbleed}{Macro added}% +\def\@tombowbleed{3mm} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@tombowbleed}{Macro added}% +\let\@tombowbleed\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\@tombowcolor}{Macro added}% +\def\@tombowcolor{\normalcolor} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@tombowcolor}{Macro added}% +\let\@tombowcolor\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\maketombowbox} + {Use \@tombowbleed}% +\def\maketombowbox{% + \setbox\@TL\hbox to\z@{\yoko\hss + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@ + \vrule height10mm width\@tombowwidth depth\z@ + \iftombowdate + \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}% + \fi}% + \setbox\@Tl\hbox to\z@{\yoko\hss + \vrule width10mm height\@tombowwidth depth\z@ + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@}% + \setbox\@TC\hbox{\yoko + \vrule width10mm height\@tombowwidth depth\z@ + \vrule height10mm width\@tombowwidth depth\z@ + \vrule width10mm height\@tombowwidth depth\z@}% + \setbox\@TR\hbox to\z@{\yoko + \vrule height10mm width\@tombowwidth depth\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@\hss}% + \setbox\@Tr\hbox to\z@{\yoko + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@ + \vrule width10mm height\@tombowwidth depth\z@\hss}% + \setbox\@BL\hbox to\z@{\yoko\hss + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@ + \vrule depth10mm width\@tombowwidth height\z@}% + \setbox\@Bl\hbox to\z@{\yoko\hss + \vrule width10mm depth\@tombowwidth height\z@ + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@}% + \setbox\@BC\hbox{\yoko + \vrule width10mm depth\@tombowwidth height\z@ + \vrule depth10mm width\@tombowwidth height\z@ + \vrule width10mm depth\@tombowwidth height\z@}% + \setbox\@BR\hbox to\z@{\yoko + \vrule depth10mm width\@tombowwidth height\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@\hss}% + \setbox\@Br\hbox to\z@{\yoko + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@ + \vrule width10mm depth\@tombowwidth height\z@\hss}% + \setbox\@CL\hbox to\z@{\yoko\hss + \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth + \vrule height10mm depth10mm width\@tombowwidth}% + \setbox\@CR\hbox to\z@{\yoko + \vrule height10mm depth10mm width\@tombowwidth + \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}% +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\maketombowbox} + {Use \@tombowbleed}% +\def\maketombowbox{% + \setbox\@TL\hbox to\z@{\yoko\hss + \vrule width13mm height\@tombowwidth depth\z@ + \vrule height10mm width\@tombowwidth depth\z@ + \iftombowdate + \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}% + \fi}% + \setbox\@Tl\hbox to\z@{\yoko\hss + \vrule width10mm height\@tombowwidth depth\z@ + \vrule height13mm width\@tombowwidth depth\z@}% + \setbox\@TC\hbox{\yoko + \vrule width10mm height\@tombowwidth depth\z@ + \vrule height10mm width\@tombowwidth depth\z@ + \vrule width10mm height\@tombowwidth depth\z@}% + \setbox\@TR\hbox to\z@{\yoko + \vrule height10mm width\@tombowwidth depth\z@ + \vrule width13mm height\@tombowwidth depth\z@\hss}% + \setbox\@Tr\hbox to\z@{\yoko + \vrule height13mm width\@tombowwidth depth\z@ + \vrule width10mm height\@tombowwidth depth\z@\hss}% + \setbox\@BL\hbox to\z@{\yoko\hss + \vrule width13mm depth\@tombowwidth height\z@ + \vrule depth10mm width\@tombowwidth height\z@}% + \setbox\@Bl\hbox to\z@{\yoko\hss + \vrule width10mm depth\@tombowwidth height\z@ + \vrule depth13mm width\@tombowwidth height\z@}% + \setbox\@BC\hbox{\yoko + \vrule width10mm depth\@tombowwidth height\z@ + \vrule depth10mm width\@tombowwidth height\z@ + \vrule width10mm depth\@tombowwidth height\z@}% + \setbox\@BR\hbox to\z@{\yoko + \vrule depth10mm width\@tombowwidth height\z@ + \vrule width13mm depth\@tombowwidth height\z@\hss}% + \setbox\@Br\hbox to\z@{\yoko + \vrule depth13mm width\@tombowwidth height\z@ + \vrule width10mm depth\@tombowwidth height\z@\hss}% + \setbox\@CL\hbox to\z@{\yoko\hss + \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth + \vrule height10mm depth10mm width\@tombowwidth}% + \setbox\@CR\hbox to\z@{\yoko + \vrule height10mm depth10mm width\@tombowwidth + \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}% +} +\plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\@outputtombow} +\def\@outputtombow{% + \iftombow + \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax\relax + \boxmaxdepth\maxdimen + \moveleft\@tombowbleed \vbox to\@@paperheight{% + \color@begingroup + \@tombowcolor + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip\@tombowbleed}% + \kern-10mm + \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}% + \vfill + \hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}% + \vfill + \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}% + \kern-10mm + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip\@tombowbleed}% + \color@endgroup + }\vss + }% + \fi +} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}% \def\@outputtombow{% \iftombow \vbox to\z@{\kern-13mm\relax - \boxmaxdepth\maxdimen%% Added (Apr 1, 2016) + \boxmaxdepth\maxdimen \moveleft3mm\vbox to\@@paperheight{% \hbox to\@@paperwidth{\hskip3mm\relax \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}% @@ -880,6 +1012,88 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\@tombowreset@@paper} + {Macro separated}% +\def\@tombowreset@@paper{% + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth + \advance\@@paperwidth 2\dimexpr\@tombowbleed\relax + \@@paperheight\paperheight \advance\@@paperheight 10mm\relax + \advance\@@paperheight 2\dimexpr\@tombowbleed\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@tombowreset@@paper} + {Macro separated}% +\let\@tombowreset@@paper\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2018/05/20}{\@outputpage} + {Use \@tombowreset@@paper}% +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand + \language\document@default@language + \@resetactivechars + \global\let\@@if@newlist\if@newlist + \global\@newlistfalse + \@parboxrestore + \shipout\vbox{\yoko + \set@typeset@protect + \aftergroup\endgroup + \aftergroup\set@typeset@protect + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi + \if@twoside + \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot + \iftdir\let\@themargin\evensidemargin + \else\let\@themargin\oddsidemargin\fi + \else \let\@thehead\@evenhead + \let\@thefoot\@evenfoot + \iftdir\let\@themargin\oddsidemargin + \else\let\@themargin\evensidemargin\fi + \fi\fi + \@tombowreset@@paper + \reset@font + \normalsize + \normalsfcodes + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ + \@begindvi + \@outputtombow + \vskip \@@topmargin + \moveright\@themargin\vbox{% + \setbox\@tempboxa \vbox to\headheight{% + \vfil + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thehead}% + \color@endbox + }% %% 22 Feb 87 + \dp\@tempboxa \z@ + \box\@tempboxa + \vskip \headsep + \box\@outputbox + \baselineskip \footskip + \color@hbox + \normalcolor + \hb@xt@\textwidth{\@thefoot}% + \color@endbox + }% + }% + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\@outputpage} {Reset language for hyphenation}% \def\@outputpage{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 5d4fc36f743..5da961f7a26 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -33,8 +33,8 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2018-04-01} -\def\ppatch@level{2} + {2018-05-20} +\def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -914,6 +914,8 @@ \newif\iftombowdate \tombowdatetrue \newdimen\@tombowwidth \setlength{\@tombowwidth}{.1\p@} +\def\@tombowbleed{3mm} +\def\@tombowcolor{\normalcolor} \newbox\@TL\newbox\@Tl \newbox\@TC \newbox\@TR\newbox\@Tr @@ -927,39 +929,39 @@ \@bannertoken{} \def\maketombowbox{% \setbox\@TL\hbox to\z@{\yoko\hss - \vrule width13mm height\@tombowwidth depth\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@ \vrule height10mm width\@tombowwidth depth\z@ \iftombowdate \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}% \fi}% \setbox\@Tl\hbox to\z@{\yoko\hss \vrule width10mm height\@tombowwidth depth\z@ - \vrule height13mm width\@tombowwidth depth\z@}% + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@}% \setbox\@TC\hbox{\yoko \vrule width10mm height\@tombowwidth depth\z@ \vrule height10mm width\@tombowwidth depth\z@ \vrule width10mm height\@tombowwidth depth\z@}% \setbox\@TR\hbox to\z@{\yoko \vrule height10mm width\@tombowwidth depth\z@ - \vrule width13mm height\@tombowwidth depth\z@\hss}% + \vrule width\dimexpr 10mm+\@tombowbleed\relax height\@tombowwidth depth\z@\hss}% \setbox\@Tr\hbox to\z@{\yoko - \vrule height13mm width\@tombowwidth depth\z@ + \vrule height\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth depth\z@ \vrule width10mm height\@tombowwidth depth\z@\hss}% \setbox\@BL\hbox to\z@{\yoko\hss - \vrule width13mm depth\@tombowwidth height\z@ + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@ \vrule depth10mm width\@tombowwidth height\z@}% \setbox\@Bl\hbox to\z@{\yoko\hss \vrule width10mm depth\@tombowwidth height\z@ - \vrule depth13mm width\@tombowwidth height\z@}% + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@}% \setbox\@BC\hbox{\yoko \vrule width10mm depth\@tombowwidth height\z@ \vrule depth10mm width\@tombowwidth height\z@ \vrule width10mm depth\@tombowwidth height\z@}% \setbox\@BR\hbox to\z@{\yoko \vrule depth10mm width\@tombowwidth height\z@ - \vrule width13mm depth\@tombowwidth height\z@\hss}% + \vrule width\dimexpr 10mm+\@tombowbleed\relax depth\@tombowwidth height\z@\hss}% \setbox\@Br\hbox to\z@{\yoko - \vrule depth13mm width\@tombowwidth height\z@ + \vrule depth\dimexpr 10mm+\@tombowbleed\relax width\@tombowwidth height\z@ \vrule width10mm depth\@tombowwidth height\z@\hss}% \setbox\@CL\hbox to\z@{\yoko\hss \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth @@ -970,11 +972,13 @@ } \def\@outputtombow{% \iftombow - \vbox to\z@{\kern-13mm\relax - \boxmaxdepth\maxdimen%% Added (Apr 1, 2016) - \moveleft3mm\vbox to\@@paperheight{% - \hbox to\@@paperwidth{\hskip3mm\relax - \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}% + \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax\relax + \boxmaxdepth\maxdimen + \moveleft\@tombowbleed \vbox to\@@paperheight{% + \color@begingroup + \@tombowcolor + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip\@tombowbleed}% \kern-10mm \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}% \vfill @@ -982,8 +986,9 @@ \vfill \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}% \kern-10mm - \hbox to\@@paperwidth{\hskip3mm\relax - \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}% + \hbox to\@@paperwidth{\hskip\@tombowbleed\relax + \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip\@tombowbleed}% + \color@endgroup }\vss }% \fi @@ -991,6 +996,16 @@ \newdimen\@@paperheight \newdimen\@@paperwidth \newdimen\@@topmargin +\def\@tombowreset@@paper{% + \@@topmargin\topmargin + \iftombow + \@@paperwidth\paperwidth + \advance\@@paperwidth 2\dimexpr\@tombowbleed\relax + \@@paperheight\paperheight \advance\@@paperheight 10mm\relax + \advance\@@paperheight 2\dimexpr\@tombowbleed\relax + \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax + \fi +} \def\@outputpage{% \begingroup % the \endgroup is put in by \aftergroup \iftdir @@ -1018,12 +1033,7 @@ \iftdir\let\@themargin\oddsidemargin \else\let\@themargin\evensidemargin\fi \fi\fi - \@@topmargin\topmargin - \iftombow - \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax - \@@paperheight\paperheight \advance\@@paperheight 16mm\relax - \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax - \fi + \@tombowreset@@paper \reset@font \normalsize \normalsfcodes -- cgit v1.2.3