diff options
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/exppl2e.pdf | bin | 170364 -> 153101 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 801437 -> 809397 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.dtx | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 281 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plnewsc10.tex | 77 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/exppl2e.sty | 177 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 218 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 56 |
10 files changed, 593 insertions, 225 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 1a032d3ba84..d2de26b289d 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2018-05-11 +2018-05-20 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex 0ce852a975a..0517460f60e 100644 --- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf +++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 29bcdc25c4b..27be4bf1669 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 6b34e3516f1..dcf030e27eb 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -316,6 +316,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> diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index cf71b1582c5..4dadbc27e65 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -86,13 +86,22 @@ % \changes{v1.2x}{2018/03/01}{$B%;%k:G=i$N(B\cs{par}$B$G6u9T$,F~$i$J$$$h$&$K$7$?(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} +% \changes{v1.2z}{2018/05/13}{\cs{@tombowbleed}$B%^%/%mDI2C(B} +% \changes{v1.2z}{2018/05/13}{\cs{@tombowcolor}$B%^%/%mDI2C(B} +% \changes{v1.2z}{2018/05/13}{bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} +% \changes{v1.2z}{2018/05/13}{$B?'$NIU$$$?%F%-%9%H$NESCf$G2~%Z!<%8$9$k$H(B +% $B%H%s%\$K$b?'$,IU$/8=>]$KBP=h!"$5$i$K%H%s%\$N?'$r(B\cs{@tombowcolor}$B$X!&(B +% bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} +% \changes{v1.2z}{2018/05/13}{$B%3%^%s%I$KJ,N%!"$5$i$K(B +% bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} +% \changes{v1.2z}{2018/05/13}{\cs{@tombowreset@@paper}$B%3%^%s%I$KJ,N%(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2018/03/12 v1.2y pLaTeX core file] +\ProvidesFile{plcore.dtx}[2018/05/13 v1.2z pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -762,6 +771,42 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@tombowbleed} +% |\@tombowbleed|$B$O!"(Bbleed$BI}$r;XDj$7$^$9!#(B +% $B%G%U%)%k%H$O(B3mm$B$G$9!#(B +% \changes{v1.2z}{2018/05/13}{\cs{@tombowbleed}$B%^%/%mDI2C(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2018/05/20}{\@tombowbleed}{Macro added}% +%<*plcore|platexrelease> +\def\@tombowbleed{3mm} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tombowbleed}{Macro added}% +%<platexrelease>\let\@tombowbleed\@undefined +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@tombowcolor} +% |\@tombowcolor|$B$O!"%H%s%\$N?'$G$9!#(B +% $B%G%U%)%k%H$O(B|\normalcolor|$B$G$9!#(B +% \changes{v1.2z}{2018/05/13}{\cs{@tombowcolor}$B%^%/%mDI2C(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2018/05/20}{\@tombowcolor}{Macro added}% +%<*plcore|platexrelease> +\def\@tombowcolor{\normalcolor} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tombowcolor}{Macro added}% +%<platexrelease>\let\@tombowcolor\@undefined +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % $B%H%s%\MQ$N7S@~$rDj5A$7$^$9!#(B % % \begin{macro}{\@TL} @@ -832,10 +877,15 @@ % |\maketombow|$B%3%^%s%I$O!"%H%s%\$H$J$k%\%C%/%9$r:n$k$?$a$KMQ$$$^$9!#(B % $B$3$N%3%^%s%I$O!"%H%s%\$H$J$k%\%C%/%9$r:n$k$@$1$G!"$=$l$i$N%\%C%/%9$r(B % $B=PNO$9$k$N$G$O$J$$$3$H$KCm0U$r$7$F$/$@$5$$!#(B +% \changes{v1.2z}{2018/05/13}{bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} % \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2018/05/20}{\maketombowbox} +%<platexrelease> {Use \@tombowbleed}% +%<*plcore|platexrelease> \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@ % \end{macrocode} % \changes{v1.0f}{1996/07/10}{$B%H%s%\$N2#$K(BDVI$B%U%!%$%k$N:n@.F|$r=PNO$9$k(B @@ -848,33 +898,33 @@ \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 @@ -884,23 +934,81 @@ \vrule height10mm depth10mm width\@tombowwidth \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}% } +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\maketombowbox} +%<platexrelease> {Use \@tombowbleed}% +%<platexrelease>\def\maketombowbox{% +%<platexrelease> \setbox\@TL\hbox to\z@{\yoko\hss +%<platexrelease> \vrule width13mm height\@tombowwidth depth\z@ +%<platexrelease> \vrule height10mm width\@tombowwidth depth\z@ +%<platexrelease> \iftombowdate +%<platexrelease> \raise4pt\hbox to\z@{\hskip5mm\@bannerfont\the\@bannertoken\hss}% +%<platexrelease> \fi}% +%<platexrelease> \setbox\@Tl\hbox to\z@{\yoko\hss +%<platexrelease> \vrule width10mm height\@tombowwidth depth\z@ +%<platexrelease> \vrule height13mm width\@tombowwidth depth\z@}% +%<platexrelease> \setbox\@TC\hbox{\yoko +%<platexrelease> \vrule width10mm height\@tombowwidth depth\z@ +%<platexrelease> \vrule height10mm width\@tombowwidth depth\z@ +%<platexrelease> \vrule width10mm height\@tombowwidth depth\z@}% +%<platexrelease> \setbox\@TR\hbox to\z@{\yoko +%<platexrelease> \vrule height10mm width\@tombowwidth depth\z@ +%<platexrelease> \vrule width13mm height\@tombowwidth depth\z@\hss}% +%<platexrelease> \setbox\@Tr\hbox to\z@{\yoko +%<platexrelease> \vrule height13mm width\@tombowwidth depth\z@ +%<platexrelease> \vrule width10mm height\@tombowwidth depth\z@\hss}% +%<platexrelease> \setbox\@BL\hbox to\z@{\yoko\hss +%<platexrelease> \vrule width13mm depth\@tombowwidth height\z@ +%<platexrelease> \vrule depth10mm width\@tombowwidth height\z@}% +%<platexrelease> \setbox\@Bl\hbox to\z@{\yoko\hss +%<platexrelease> \vrule width10mm depth\@tombowwidth height\z@ +%<platexrelease> \vrule depth13mm width\@tombowwidth height\z@}% +%<platexrelease> \setbox\@BC\hbox{\yoko +%<platexrelease> \vrule width10mm depth\@tombowwidth height\z@ +%<platexrelease> \vrule depth10mm width\@tombowwidth height\z@ +%<platexrelease> \vrule width10mm depth\@tombowwidth height\z@}% +%<platexrelease> \setbox\@BR\hbox to\z@{\yoko +%<platexrelease> \vrule depth10mm width\@tombowwidth height\z@ +%<platexrelease> \vrule width13mm depth\@tombowwidth height\z@\hss}% +%<platexrelease> \setbox\@Br\hbox to\z@{\yoko +%<platexrelease> \vrule depth13mm width\@tombowwidth height\z@ +%<platexrelease> \vrule width10mm depth\@tombowwidth height\z@\hss}% +%<platexrelease> \setbox\@CL\hbox to\z@{\yoko\hss +%<platexrelease> \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth +%<platexrelease> \vrule height10mm depth10mm width\@tombowwidth}% +%<platexrelease> \setbox\@CR\hbox to\z@{\yoko +%<platexrelease> \vrule height10mm depth10mm width\@tombowwidth +%<platexrelease> \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss}% +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> % \end{macrocode} % \end{macro} % % \begin{macro}{\@outputtombow} % |\@outputtombow|$B%3%^%s%I$O!"%H%s%\$r=PNO$9$k$N$KMQ$$$^$9!#(B +% $B%3%_%e%K%F%#HG$G$O!"!V?'IU$-%F%-%9%H$NESCf$G2~%Z!<%8$,5/$-$?>l9g$K!"(B +% $B%H%s%\$K$b?'$,IU$$$F$7$^$&!W$H$$$&8=>]$rKI$.!"$5$i$K%H%s%\$N?'$r(B +% $B4JC1$KJQ$($i$l$k$h$&!"(B|\@tombowcolor|$B$H$$$&%^%/%m$K@Z$j=P$7$F$$$^$9!#(B % \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B} +% \changes{v1.2z}{2018/05/13}{$B?'$NIU$$$?%F%-%9%H$NESCf$G2~%Z!<%8$9$k$H(B +% $B%H%s%\$K$b?'$,IU$/8=>]$KBP=h!"$5$i$K%H%s%\$N?'$r(B\cs{@tombowcolor}$B$X!&(B +% bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}% +%<platexrelease>\plIncludeInRelease{2018/05/20}{\@outputtombow} +% {Use \@tombowcolor and \@tombowbleed}% %<*plcore|platexrelease> \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 @@ -908,14 +1016,37 @@ \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 } %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}% +%<platexrelease>\def\@outputtombow{% +%<platexrelease> \iftombow +%<platexrelease> \vbox to\z@{\kern-13mm\relax +%<platexrelease> \boxmaxdepth\maxdimen +%<platexrelease> \moveleft3mm\vbox to\@@paperheight{% +%<platexrelease> \hbox to\@@paperwidth{\hskip3mm\relax +%<platexrelease> \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}% +%<platexrelease> \kern-10mm +%<platexrelease> \hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}% +%<platexrelease> \vfill +%<platexrelease> \hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}% +%<platexrelease> \vfill +%<platexrelease> \hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}% +%<platexrelease> \kern-10mm +%<platexrelease> \hbox to\@@paperwidth{\hskip3mm\relax +%<platexrelease> \copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip3mm}% +%<platexrelease> }\vss +%<platexrelease> }% +%<platexrelease> \fi +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\@outputtombow}{\@outputtombow}% %<platexrelease>\def\@outputtombow{% %<platexrelease> \iftombow @@ -958,6 +1089,38 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\@tombowreset@@paper} +% $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$K(B +% $BMQ;f%5%$%:$r:F@_Dj$9$kL?Na$G$9!#(B +% |\@outputpage|$B$X2C$($kJQ99$r4J7i$K$9$k$?$a!"J,N%$7$?>e$G(B +% |\@tombowbleed|$B$r;H$&$h$&$K$7$^$7$?!#(B +% \changes{v1.2z}{2018/05/13}{$B%3%^%s%I$KJ,N%!"$5$i$K(B +% bleed$BI}$r(B\cs{@tombowbleed}$B$K@Z$j=P$7(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2018/05/20}{\@tombowreset@@paper} +%<platexrelease> {Macro separated}% +%<*plcore|platexrelease> +\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 +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tombowreset@@paper} +%<platexrelease> {Macro separated}% +%<platexrelease>\let\@tombowreset@@paper\@undefined +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@shipoutsetup} % \changes{v1.1i}{1998/02/03}{Command removed} % |\@outputpage|$BFb$KA^F~$7$?$N$G:o=|$7$^$7$?!#(B @@ -974,8 +1137,8 @@ % \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2017/04/08}{\@outputpage} -%<platexrelease> {Reset language for hyphenation}% +%<platexrelease>\plIncludeInRelease{2018/05/20}{\@outputpage} +%<platexrelease> {Use \@tombowreset@@paper}% %<*plcore|platexrelease> \def\@outputpage{% \begingroup % the \endgroup is put in by \aftergroup @@ -1029,13 +1192,11 @@ % $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g!"$3$3$GMQ;f%5%$%:$r:F@_Dj$7$^$9!#(B % \TeX $B$N2C$($k:8$H>eIt$N(B1$B%$%s%A$O!"%H%s%\$NFbB&$KF~$j$^$9!#(B % \changes{v1.1a}{1995/11/10}{\cs{topmargin}$B$,H?1G$5$l$J$$%P%0$r=$@5(B} +% \changes{v1.2z}{2018/05/13}{\cs{@tombowreset@@paper}$B%3%^%s%I$KJ,N%(B} +% \begin{macrocode} + \@tombowreset@@paper +% \end{macrocode} % \begin{macrocode} - \@@topmargin\topmargin - \iftombow - \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax - \@@paperheight\paperheight \advance\@@paperheight 16mm\relax - \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax - \fi \reset@font \normalsize \normalsfcodes @@ -1079,6 +1240,76 @@ } %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@outputpage} +%<platexrelease> {Reset language for hyphenation}% +%<platexrelease>\def\@outputpage{% +%<platexrelease>\begingroup % the \endgroup is put in by \aftergroup +%<platexrelease> \iftdir +%<platexrelease> \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ +%<platexrelease> \fi +%<platexrelease> \let \protect \noexpand +%<platexrelease> \language\document@default@language +%<platexrelease> \@resetactivechars +%<platexrelease> \global\let\@@if@newlist\if@newlist +%<platexrelease> \global\@newlistfalse +%<platexrelease> \@parboxrestore +%<platexrelease> \shipout\vbox{\yoko +%<platexrelease> \set@typeset@protect +%<platexrelease> \aftergroup\endgroup +%<platexrelease> \aftergroup\set@typeset@protect +%<platexrelease> \if@specialpage +%<platexrelease> \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% +%<platexrelease> \fi +%<platexrelease> \if@twoside +%<platexrelease> \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot +%<platexrelease> \iftdir\let\@themargin\evensidemargin +%<platexrelease> \else\let\@themargin\oddsidemargin\fi +%<platexrelease> \else \let\@thehead\@evenhead +%<platexrelease> \let\@thefoot\@evenfoot +%<platexrelease> \iftdir\let\@themargin\oddsidemargin +%<platexrelease> \else\let\@themargin\evensidemargin\fi +%<platexrelease> \fi\fi +%<platexrelease> \@@topmargin\topmargin +%<platexrelease> \iftombow +%<platexrelease> \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax +%<platexrelease> \@@paperheight\paperheight \advance\@@paperheight 16mm\relax +%<platexrelease> \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax +%<platexrelease> \fi +%<platexrelease> \reset@font +%<platexrelease> \normalsize +%<platexrelease> \normalsfcodes +%<platexrelease> \let\label\@gobble +%<platexrelease> \let\index\@gobble +%<platexrelease> \let\glossary\@gobble +%<platexrelease> \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ +%<platexrelease> \@begindvi +%<platexrelease> \@outputtombow +%<platexrelease> \vskip \@@topmargin +%<platexrelease> \moveright\@themargin\vbox{% +%<platexrelease> \setbox\@tempboxa \vbox to\headheight{% +%<platexrelease> \vfil +%<platexrelease> \color@hbox +%<platexrelease> \normalcolor +%<platexrelease> \hb@xt@\textwidth{\@thehead}% +%<platexrelease> \color@endbox +%<platexrelease> }% %% 22 Feb 87 +%<platexrelease> \dp\@tempboxa \z@ +%<platexrelease> \box\@tempboxa +%<platexrelease> \vskip \headsep +%<platexrelease> \box\@outputbox +%<platexrelease> \baselineskip \footskip +%<platexrelease> \color@hbox +%<platexrelease> \normalcolor +%<platexrelease> \hb@xt@\textwidth{\@thefoot}% +%<platexrelease> \color@endbox +%<platexrelease> }% +%<platexrelease> }% +%<platexrelease> \global\let\if@newlist\@@if@newlist +%<platexrelease> \global \@colht \textheight +%<platexrelease> \stepcounter{page}% +%<platexrelease> \let\firstmark\botmark +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease %<platexrelease>\plIncludeInRelease{0000/00/00}{\@outputpage} %<platexrelease> {Reset language for hyphenation}% %<platexrelease>\def\@outputpage{% diff --git a/Master/texmf-dist/source/platex/base/plnewsc10.tex b/Master/texmf-dist/source/platex/base/plnewsc10.tex new file mode 100644 index 00000000000..7abf9d8c7a8 --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc10.tex @@ -0,0 +1,77 @@ +%% <2018-04-01> and <2018-05-20> +\documentclass{plnews} + +\publicationyear{2018}% $BH/9TG/(B +\publicationmonth{05}% $BH/9T7n(B +\publicationissue{c10}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92 #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +\begin{document} + +\maketitle + +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2018-04-01>}$B$*$h$S(B +\texttt{<2018-05-20>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2018/03/09>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B +$B:#2s$+$i!"%U%)!<%^%C%H$NF|IU$NI=5-$r(Byyyy/mm/dd$B$+$i(BISO 8601$B=`5r$N(B +yyyy-mm-dd$B$KJQ99$7$^$7$?!#(B + + +\section{\LaTeXe\ \texttt{<2018-04-01>}$BBP1~(B} +\LaTeXe\ \texttt{<2018-04-01>}$B$G!"2$J8$N(Binputenc$B$N4{Dj$,(B|utf8|$B$K(B +$B$J$j$^$7$?!#$3$l$K9g$o$;!"(B\pLaTeXe $B$GOBJ8MQ$K3HD%$7$F$$$?(B +|\DeclareFontEncoding|$BL?Na$G$b(B|.dfu|$B%U%!%$%k$NFI9~=hM}$rDI2C$7$^$7$?!#(B + + +\section{$B%H%s%\4XO"$N=$@5$H5!G=DI2C(B} +$B=>Mh!"(Bcolor$B%Q%C%1!<%8$J$I$G%F%-%9%H$K?'$r$D$1$?>l9g!"(B +$B$=$N?'$D$-%F%-%9%H$NESCf$K2~%Z!<%8$9$k$H$=$3$@$1%H%s%\$K$b(B +$B?'$,$D$/$H$$$&LdBj$,$"$j$^$7$?!#(B\pLaTeXe\ \texttt{<2018-05-20>}$B$G$O(B +$B$3$NLdBj$KBP=h$7$^$7$?!#(B + +$B$5$i$K!"%H%s%\$r%+%9%?%^%$%:$7$d$9$/$9$k$?$a!"0J2<$N;EMM$rDj$a$^$9!#(B +$B%Q%C%1!<%8$r:n$k>l9g$J$I$K!"0J2<$N%^%/%m$d%Q%i%a!<%?$r(B +$BJQ99$9$k$3$H$,$G$-$^$9!#(B + +$B$^$:$O%^%/%m$G$9!#(B +\begin{itemize} +\item |\maketombowbox|$B$O%H%s%\$K$J$k7A>u$rMQ0U$9$kL?Na$G$9!#(B +\item |\@outputtombow|$B$OMQ0U$5$l$?%H%s%\$rDj0LCV$K=PNO$9$kL?Na$G$9!#(B +\end{itemize} +$B<!$K%Q%i%a!<%?$G$9!#(B +\begin{itemize} +\item $B%H%s%\$K=PNO$9$k%P%J!<$O(B|\@bannertoken|$B$GI=$9!#(B + $B$3$l$O%H!<%/%s%l%8%9%?$G$"$k!#!Z%"%9%-!<HG$HF1MM![(B +\item $B%H%s%\$N@~$NI}$O(B|\@tombowwidth|$B$GI=$9!#(B + $B$3$l$O(B|\dimen|$B%l%8%9%?$G$"$j!"%G%U%)%k%H$O(B + |.1pt|$B$G$"$k!#!Z%"%9%-!<HG$HF1MM![(B +\item $B%H%s%\$NEI$jB-$7!J%I%V!K$NI}$O(B|\@tombowbleed|$B$GI=$9!#(B + $B$3$l$O@#K!%^%/%m$G$"$j!"%G%U%)%k%H$O(B + |\def\@tombowbleed{3mm}|$B$G$"$k!#!Z?7@_![(B +\item $B%H%s%\$N?'$O(B|\@tombowcolor|$B%^%/%m$GI=$9!#(B + $B%G%U%)%k%H$O(B|\def\@tombowcolor{\normalcolor}|$B$G$"$k!#!Z?7@_![(B +\end{itemize} + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B:#8e(B\pLaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B +$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +$B$H=q$/$3$H$G!"3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B +$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B +\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 291bb1487a9..16436150344 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -169,10 +169,10 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2018-04-01} + {2018-05-20} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{2} +\def\ppatch@level{0} %</plcore> % \end{macrocode} % \end{macro} 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 |