summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-20 21:31:08 +0000
committerKarl Berry <karl@freefriends.org>2018-05-20 21:31:08 +0000
commitcdc0d80edd38bfcfa7f90b7136f2b0ded4102496 (patch)
treedaabca3dd13557309f2514133f60b43378a6c978 /Master/texmf-dist/tex/platex
parent1166be27a287015a471154b2bee3f8197578e24e (diff)
platex (20may18)
git-svn-id: svn://tug.org/texlive/trunk@47782 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty177
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty218
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx56
3 files changed, 254 insertions, 197 deletions
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{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B}
-% $B8=>u$N(Bp\TeX{}$B!J(B\TeX\ Live 2017$B;~E@!K$G$O!"(B
-% |\inhibitglue|$B%W%j%_%F%#%V$O!V(BJFM$BM3Mh$N%9%Z!<%9!J%0%k!<!&%+!<%s!KA^F~(B
-% $B%k!<%A%s$rM^@)$9$k!WF/$-$r$7$^$9!#$7$+$7!"4{$KA^F~$5$l$F$7$^$C$?(B
-% JFM$B%0%k!<$d%+!<%s$r:o=|$9$k$3$H$O$G$-$^$;$s!#(B
-%
-% \begin{macro}{\removejfmglue}
-% $B$=$3$G!"!V:G8e$N%N!<%I$,(BJFM$B%0%k!<$G$"$C$?>l9g$K$=$l$r:o=|$9$k!W$H$$$&(B
-% $B%f!<%68~$1L?Na$rDj5A$7$^$9!#$3$N5!G=$K$O(Be-p\TeX{} 180226$B0J9_$N(B
-% |\lastnodesubtype|$B%W%j%_%F%#%V$,I,MW$G$9!#(B
-% \changes{v1.2x}{2018/03/01}{JFM$B%0%k!<%N!<%I$r:o=|$9$k%^%/%mDI2C(B}
-% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2018/03/09}%
-%<platexrelease> {\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
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}%
-%<platexrelease> {\removejfmglue}{Macro added}%
-%<platexrelease>\let\removejfmglue\@undefined
-%<platexrelease>\plEndIncludeInRelease
-% \end{macrocode}
-% \end{macro}
+%
+% p\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B}
%
-% \begin{macro}{\@tabclassz}
-% \LaTeX{}$B%+!<%M%k$O!"%"%i%$%s%a%s%HJ8;z(B|&|$B$N<~0O$KH>3Q6uGr$r=q$$$?$+$I$&$+$K(B
-% $B$+$+$o$i$:M>J,$J%9%Z!<%9$r=PNO$7$J$$$h$&$K!"(B|\ignorespaces|$B$H(B|\unskip|$B$r(B
-% $BH/9T$7$F$$$^$9(B(lttab.dtx)$B!#$7$+$7!"$3$l$@$1$G$O(BJFM$B%0%k!<$,>C$($:$K;D$C$F(B
-% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
-%
-% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
-% 2017/09/26$B$N=$@5$G$O!V%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"(B
-% $B$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$9$k!W$H$$$&J}?K$G$7$?$,!"(B
-% 2018/03/09$B$N=$@5$G$O!V(B|\removejfmglue|$B%^%/%m$,Dj5A$5$l$F$$$k>l9g$O(B
-% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$K(B|\removejfmglue|$B$rH/9T$9$k!W$H$$$&(B
-% $BJ}?K$K$7$^$9!#$3$&$9$l$P>/!9(B\LaTeX{}$B$H$N8_49@-$,8~>e$7$^$9!#(B
-% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
-% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
-% $B$J$C$F$$$?%P%0$r=$@5(B}
-% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B}
-% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2018/03/09}{\@tabclassz}
-%<platexrelease> {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
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@classv}
-% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B
-% 2017/07/29$B$N=$@5$G$O(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$7$?$,!"(B
-% $B0J2<$N$h$&$K(B|p|$B;XDj$N%;%k$N:G=i$G(B|\par|$B$H$7$F(B
-% $B2~CJMn$rH/9T$9$k$H!"0l9T6u$$$F$7$^$&$H$$$&>I>u$,5/$-$F$7$^$$$^$9(B(platex/\#63)$B!#(B
-%\begin{verbatim}
-% \begin{tabular}{p{5cm}}
-% A\\
-% \relax\par
-% A
-% \end{tabular}
-%\end{verbatim}
-% $B$3$3$G$O!"(B2017/07/29$B$N=$@5$+$iJ}?K$r2~$a!"(B|\everypar|$BFb$K(B|\inhibitglue|$B$r(B
-% $B;E9~$`$H$$$&J}?K$GBP1~$7$^$9!#(B
-% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
-% \changes{v1.2x}{2018/03/01}{$B%;%k:G=i$N(B\cs{par}$B$G6u9T$,F~$i$J$$$h$&$K$7$?(B}
-% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2018/03/09}{\@classv}
-%<platexrelease> {Inhibit JFM glue in tabular cells}%
-%<*plcore|platexrelease>
-\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
-\@sharp\unskip\@endpbox}}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv}
-%<platexrelease> {Inhibit JFM glue in tabular cells}%
-%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
-%<platexrelease>\@sharp\unskip\@endpbox}}
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@classv}
-%<platexrelease> {Inhibit JFM glue in tabular cells}%
-%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
-%<platexrelease>\@sharp\@endpbox}}
-%<platexrelease>\plEndIncludeInRelease
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pltx@next@inhibitglue}
-% $B?eJ?%b!<%I$G$"$l$P$=$N$^$^(B|\inhibitglue|$B$rH/9T$7!"$=$l0J30$G$"$l$P(B
-% |\everypar|$BFb$K(B|\inhibitglue|$B$r;E9~$_$^$9!#(B
-% \changes{v1.2x}{2018/03/01}{\cs{everypar}$B$K(B\cs{inhibitglue}$B$r;E9~$`%^%/%mDI2C(B}
-% \changes{v1.2y}{2018/03/12}{\cs{inhibitglue}$B$r(B\cs{everypar}$B$NKvHx$K0\F0(B}
-% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue}
-%<platexrelease> {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}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue}
-%<platexrelease> {Add \pltx@next@inhibitglue}%
-%<platexrelease>\let\pltx@next@inhibitglue\@undefined
-%<platexrelease>\plEndIncludeInRelease
-% \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
%
-% % p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
+% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
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