diff options
author | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
commit | 8e7cee93b8e73580a81e4d353d4843345b2c2998 (patch) | |
tree | 2fc7e286869016f51b0a334d7d085740cbc3576b /Master/texmf-dist/tex/platex/base | |
parent | d1a1a8aa97b00e8dfb3d1b8366c29591e0a65ea7 (diff) |
platex (16apr17)
git-svn-id: svn://tug.org/texlive/trunk@43852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/base')
24 files changed, 1438 insertions, 155 deletions
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 1521d97cddd..a0f6cb8adb3 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -2,7 +2,7 @@ % % This is file `exppl2e.sty', for experimental pLaTeX2e. % -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2016/11/29 v1.0h Experimental pLaTeX2e features] + [2017/04/08 v1.0k Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -237,7 +237,7 @@ % \begin{macrocode} \else \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\lower\@tempdima\box\z@\fi + \else\leavevmode\lower\@tempdima\box\z@\fi \fi \endgroup}% \fi @@ -292,9 +292,9 @@ % % \begin{macro}{\ystrutbox} % |\ystrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl$G$9!#(B -% \changes{v????}{????/??/??}{\cs{ystrutbox}$B$rDI2C(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\ystrutbox} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrutbox} %<platexrelease> {Add \ystrutbox}% %<*plcore|platexrelease> \newbox\ystrutbox @@ -307,6 +307,23 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\strutbox} +% |\strutbox|$B$O=D2#N>BP1~$G$9!#(B +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\strutbox} +%<platexrelease> {Add \strutbox}% +%<*plcore|platexrelease> +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\strutbox} +%<platexrelease> {Add \strutbox}% +%<platexrelease>\newbox\strutbox % emulation purpose only +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\strut} % $B%G%#%l%/%7%g%s$K1~$8$F(B|\ystrutbox|$B$H(B|\tstrutbox|$B$r;H$$J,$1$^$9!#(B % ^^A |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B @@ -317,9 +334,9 @@ % $B$J$C$F$7$^$&$N$r=$@5(B} % \changes{v1.3h}{1999/08/09}{$B=DAH$N$H$-!"I}$N$"$k%\%C%/%9$K$J$C$F$7$^$&(B % $B$N$r=$@5(B} -% \changes{v????}{????/??/??}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B} +% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\strut} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut} %<platexrelease> {Use \ystrutbox}% %<*plcore|platexrelease> \def\strut{\relax @@ -354,9 +371,9 @@ % \end{macro} % % \begin{macro}{\ystrut} -% \changes{v????}{????/??/??}{\cs{ystrut}$B$rDI2C(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\ystrut} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut} %<platexrelease> {Add \ystrut}% %<*plcore|platexrelease> \def\ystrut{\relax\hbox{\yoko @@ -372,15 +389,14 @@ % % % -%^^A================================================================= -%^^A $B%a%b!'(B|\set@fontsize|$B$N(Bplatexrelease$B%,!<%I!"(Btrace$B%,!<%I$OL$40@.(B -%^^A================================================================= -% % \begin{macro}{\set@fontsize} % |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B % $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B % \begin{macrocode} -\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +%</plcore|trace> +%<platexrelease|trace>\plIncludeInRelease{2017/04/08}{\set@fontsize} +%<platexrelease|trace> {Construct \ystrutbox}% +%<*plcore|platexrelease|trace> \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -394,8 +410,7 @@ \normalbaselineskip\baselineskip % \end{macrocode} % $B$3$3$G!"%Y!<%9%i%$%s%7%U%H$ND4@0$H;YCl$rAH$_N)$F$^$9!#(B -% \changes{v????}{????/??/??}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B -% $B$7!"(B\cs{strutbox}$B$r=D2#N>BP1~$K(B} +% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B} % \begin{macrocode} \adjustbaseline \setbox\ystrutbox\hbox{\yoko @@ -411,18 +426,58 @@ % $B%U%)%s%H%5%$%:$H%Y!<%9%i%$%s$K4X$9$k?GCG>pJs$r=PNO$7$^$9!#(B % \begin{macrocode} %<*trace> -% \ifnum \tracingfonts>\tw@ -% \ifx\f@linespread\@empty -% \let\reserved@a\@empty -% \else -% \def\reserved@a{\f@linespread x}% -% \fi -% \@font@info{Changing size to\space -% \f@size/\reserved@a \f@baselineskip}% -% \aftergroup\type@restoreinfo -% \fi +% \ifnum \tracingfonts>\tw@ +% \ifx\f@linespread\@empty +% \let\reserved@a\@empty +% \else +% \def\reserved@a{\f@linespread x}% +% \fi +% \@font@info{Changing size to\space +% \f@size/\reserved@a \f@baselineskip}% +% \aftergroup\type@restoreinfo +% \fi %</trace> \let\size@update\relax}} +%</plcore|platexrelease|trace> +%<platexrelease|trace>\plEndIncludeInRelease +%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\set@fontsize} +%<platexrelease|trace> {Construct \ystrutbox}% +%<platexrelease|trace>\def\set@fontsize#1#2#3{% +%<platexrelease|trace> \@defaultunits\@tempdimb#2pt\relax\@nnil +%<platexrelease|trace> \edef\f@size{\strip@pt\@tempdimb}% +%<platexrelease|trace> \@defaultunits\@tempskipa#3pt\relax\@nnil +%<platexrelease|trace> \edef\f@baselineskip{\the\@tempskipa}% +%<platexrelease|trace> \edef\f@linespread{#1}% +%<platexrelease|trace> \let\baselinestretch\f@linespread +%<platexrelease|trace> \def\size@update{% +%<platexrelease|trace> \baselineskip\f@baselineskip\relax +%<platexrelease|trace> \baselineskip\f@linespread\baselineskip +%<platexrelease|trace> \normalbaselineskip\baselineskip +%<platexrelease|trace> \adjustbaseline +%<platexrelease|trace> \setbox\strutbox\hbox{\yoko +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}% +%<platexrelease|trace> \setbox\tstrutbox\hbox{\tate +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.5\baselineskip \@depth.5\baselineskip}% +%<platexrelease|trace> \setbox\zstrutbox\hbox{\tate +%<platexrelease|trace> \vrule\@width\z@ +%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}% +%<*trace> +%<platexrelease|trace> \ifnum \tracingfonts>\tw@ +%<platexrelease|trace> \ifx\f@linespread\@empty +%<platexrelease|trace> \let\reserved@a\@empty +%<platexrelease|trace> \else +%<platexrelease|trace> \def\reserved@a{\f@linespread x}% +%<platexrelease|trace> \fi +%<platexrelease|trace> \@font@info{Changing size to\space +%<platexrelease|trace> \f@size/\reserved@a \f@baselineskip}% +%<platexrelease|trace> \aftergroup\type@restoreinfo +%<platexrelease|trace> \fi +%</trace> +%<platexrelease|trace> \let\size@update\relax}} +%<platexrelease|trace>\plEndIncludeInRelease +%<*plcore|trace> % \end{macrocode} % \end{macro} % @@ -482,4 +537,567 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{$BAj8_;2>H(B} +% +% \begin{macro}{\@setref} +% \changes{v1.1c}{1995/09/07}{change \cs{null} to \cs{relax} in \cs{@setref}.} +% \changes{v1.2k}{2017/02/20}{$BL\<!$G(B\cs{ref}$B$r;H$C$?>l9g$K8e$m$N6uGr$,>C$($k(B +% $B8=>]$KBP=h$9$k$?$a!"(B\cs{relax}$B$N$"$H$K(B\{\}$B$rDI2C(B} +% |\ref|$B%3%^%s%I$d(B|\pageref|$B%3%^%s%I$G;2>H$7$?$H$-!"$3$l$i$N%3%^%s%I$K(B +% $B$h$C$F=PNO$5$l$?HV9f$HB3$/#2%P%$%HJ8;z$H$N4V$K(B|\xkanjiskip|$B$,F~$j$^$;$s!#(B +% $B$3$l$O!"(B|\null|$B$,(B|\hbox{}|$B$HDj5A$5$l$F$$$k$?$a$G$9!#(B +% $B$=$3$G(B|\null|$B$r<h$j=|$-$^$9!#(B +% $B$3$N%3%^%s%I$O!"(B\file{ltxref.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B +% +% $B$7$+$7!"C1$K(B|\null|$B$r(B|\relax|$B$KCV$-49$($k$@$1$G$O!"(B|\section|$B$N$h$&$J(B +% $B!VF0$/0z?t!W$G(B|\ref|$B$J$I$r;H$C$?>l9g$K!"L\<!$G8e$m$N6uGr$,>C$($F$7$^$$$^$9!#(B +% $B$=$3$G!"(B|\relax|$B$N$"$H$K(B|{}|$B$rDI2C$7$^$7$?!#=>Mh$b(B|\protect\ref|$B$N$h$&$K;H$($P(B +% $BLdBj$"$j$^$;$s$G$7$?$,!"(B\LaTeX{}$B$G$OE83+$5$l$F$bLdBj$,5/$-$J$$(Brobust$B$J<BAu$K(B +% $B$J$C$F$$$^$9$N$G!"$3$l$K=>$$$^$9!#(B +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<*plcore|platexrelease> +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax{}% change \null to \relax{} + \fi} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref} +%<platexrelease> {Spacing after \ref in moving arguments}% +%<platexrelease>\def\@setref#1#2#3{% +%<platexrelease> \ifx#1\relax +%<platexrelease> \protect\G@refundefinedtrue +%<platexrelease> \nfss@text{\reset@font\bfseries ??}% +%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space +%<platexrelease> undefined}% +%<platexrelease> \else +%<platexrelease> \expandafter#2#1\relax% change \null to \relax +%<platexrelease> \fi} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} +% +% \begin{macro}{\@makecol} +% $B$3$N%^%/%m$,AH$_N)$F$kItJ,$NCf?4$H$J$j$^$9!#(B +% \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +%<*plcore|platexrelease> +\gdef\@makecol{% + \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats +% \end{macrocode} +% $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H$N=gHV$G(B +% $B=PNO$7$^$9!#0lJ}(Bp\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"%\%H%`%U%m!<%H!"5SCm$N(B +% $B=gHV$G=PNO$7$^$9!#$H$3$m$,!"%"%9%-!<HG$N%3!<%I$O=gHV$rF~$lBX$($k$@$1$G$J$/!"(B +% $BHGLLA4BN$N?bD>0LCV$,!JFC$K=DAH$G82Cx$K!K$:$l$F$7$^$C$F$$$^$7$?!#(B +% $B$3$l$OJd@5NL(B|\dp\@outputbox|$B$N<hF@$,Aa$9$.$?$?$a$G$9$N$G!"%3%_%e%K%F%#HG(B +% p\LaTeX{}$B$G$O$3$NLdBj$KBP=h$7$F$"$j$^$9!#7k2LE*$K!"(Bfnpos$B%Q%C%1!<%8(B(yafoot)$B$N(B +% |\makeFNbottom|$B$+$D(B|\makeFNbelow|$B$J>uBV$H40A4$KEy2A$K$J$j$^$7$?!#(B +% \changes{v1.2l}{2017/02/25}{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$rF~$lBX$($?$3$H$G(B +% $BHGLLA4BN$N?bD>0LCV$,$:$l$F$$$?$N$r=$@5(B(Issue 32)} +% \begin{macrocode} + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% +% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox +% \end{macrocode} +% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B +% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B +% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B +% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B +% +% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B +% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B +% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B +% \changes{v1.1j}{2001/05/10}{\cs{@makecol}$B$GAH$_N)$F$i$l$k(B +% \cs{@outputbox}$B$NBg$-$5$,!"=DAH$GCf?H$,6u$N%\%C%/%9$@$1$N>l9g$bE,@5$K$J$k(B +% $B$h$&$K=$@5(B} +% \changes{v1.2b}{2016/01/26}{\cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B +% $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B} +% \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B +% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)} +% \begin{macrocode} + \iftdir\vbox{\hskip\z@}\fi + \vskip -\dimen@ + \@textbottom + }% + \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) + \global \maxdepth \@maxdepth +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% +%<platexrelease>\gdef\@makecol{% +%<platexrelease> \setbox\@outputbox\box\@cclv% +%<platexrelease> \xdef\@freelist{\@freelist\@midlist}% +%<platexrelease> \global \let \@midlist \@empty +%<platexrelease> \@combinefloats +%<platexrelease> \ifvbox\@kludgeins +%<platexrelease> \@makespecialcolbox +%<platexrelease> \else +%<platexrelease> \setbox\@outputbox \vbox to\@colht {% +%<platexrelease>% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +%<platexrelease> \@texttop +%<platexrelease> \dimen@ \dp\@outputbox +%<platexrelease> \unvbox \@outputbox +%<platexrelease> \iftdir\vbox{\hskip\z@}\fi +%<platexrelease> \vskip -\dimen@ +%<platexrelease> \@textbottom +%<platexrelease> \ifvoid\footins\else % for pLaTeX +%<platexrelease> \vskip \skip\footins +%<platexrelease> \color@begingroup +%<platexrelease> \normalcolor +%<platexrelease> \footnoterule +%<platexrelease> \unvbox \footins +%<platexrelease> \color@endgroup +%<platexrelease> \fi +%<platexrelease> }% +%<platexrelease> \fi +%<platexrelease> \global \maxdepth \@maxdepth +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}% +%<platexrelease>\gdef\@makecol{% +%<platexrelease> \setbox\@outputbox\box\@cclv% +%<platexrelease> \xdef\@freelist{\@freelist\@midlist}% +%<platexrelease> \global \let \@midlist \@empty +%<platexrelease> \@combinefloats +%<platexrelease> \ifvbox\@kludgeins +%<platexrelease> \@makespecialcolbox +%<platexrelease> \else +%<platexrelease> \setbox\@outputbox \vbox to\@colht {% +%<platexrelease>% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +%<platexrelease> \@texttop +%<platexrelease> \dimen@ \dp\@outputbox +%<platexrelease> \unvbox \@outputbox +%<platexrelease> \iftdir\hskip\z@\fi +%<platexrelease> \vskip -\dimen@ +%<platexrelease> \@textbottom +%<platexrelease> \ifvoid\footins\else % for pLaTeX +%<platexrelease> \vskip \skip\footins +%<platexrelease> \color@begingroup +%<platexrelease> \normalcolor +%<platexrelease> \footnoterule +%<platexrelease> \unvbox \footins +%<platexrelease> \color@endgroup +%<platexrelease> \fi +%<platexrelease> }% +%<platexrelease> \fi +%<platexrelease> \global \maxdepth \@maxdepth +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@makecol}{\@makecol}% +%<platexrelease>\gdef\@makecol{% +%<platexrelease> \setbox\@outputbox\box\@cclv% +%<platexrelease> \xdef\@freelist{\@freelist\@midlist}% +%<platexrelease> \global \let \@midlist \@empty +%<platexrelease> \@combinefloats +%<platexrelease> \ifvbox\@kludgeins +%<platexrelease> \@makespecialcolbox +%<platexrelease> \else +%<platexrelease> \setbox\@outputbox \vbox to\@colht {% +%<platexrelease>% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 +%<platexrelease> \@texttop +%<platexrelease> \dimen@ \dp\@outputbox +%<platexrelease> \unvbox \@outputbox +%<platexrelease> \iftdir\hskip\z@ +%<platexrelease> \else\vskip -\dimen@\fi +%<platexrelease> \@textbottom +%<platexrelease> \ifvoid\footins\else % for pLaTeX +%<platexrelease> \vskip \skip\footins +%<platexrelease> \color@begingroup +%<platexrelease> \normalcolor +%<platexrelease> \footnoterule +%<platexrelease> \unvbox \footins +%<platexrelease> \color@endgroup +%<platexrelease> \fi +%<platexrelease> }% +%<platexrelease> \fi +%<platexrelease> \global \maxdepth \@maxdepth +%<platexrelease>} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@makespecialcolbox} +% $BK\J8!J$"$k$$$O%\%H%`%U%m!<%H!K$H5SCm$N4V$K(B|\@textbottom|$B$rF~$l$?$$$N$G!"(B +% |\@makespecialcolbox|$B%3%^%s%I$b=$@5$r$7$^$9!#(B +% $B$d$O$j!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B +% +% $B$3$N%^%/%m$O!"(B|\enlargethispage|$B$,;H$o$l$?$H$-$K!"(B +% |\@makecol|$B%^%/%m$+$i8F$S=P$5$l$^$9!#(B +% +% \noindent\emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B(2017/02/25)}$B!'(B +% 2016/11/29$B0JA0$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`%U%m!<%H$rA^F~$7$?8e!"(B +% $B$9$0$K(B|\@kludgeins|$B$,6u$+$I$&$+H=Dj$7(B +% \begin{itemize} +% \item $B6u$N>l9g$O!";D$j$9$Y$F$N=hM}$r(B|\@makespecialcolbox|$B$KG$$;$k(B +% \item $B6u$G$J$$>l9g$O!"(B|\@makecol|$B<+?H$G;D$j$9$Y$F$N=hM}$r9T$&(B +% \end{itemize} +% $B$H$7$F$$$^$7$?!#$7$+$7(B2017/04/08$B0J9_$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`(B +% $B%U%m!<%H$H5SCm$rA^F~$7$F$+$i(B|\@kludgeins|$B$NH=Dj$K0\$k$h$&$K$7$F$$$^$9!#(B +% $B$7$?$,$C$F!"?7$7$$(B|\@makecol|$B$+$i0J2<$K5-$9(B|\@makespecialcolbox|$B$,8F$S(B +% $B=P$5$l$k>l9g$O!"(B|\ifvoid\footins|$B!JFs2U=j!K$NH=Dj$O>o$K??$H$J$k$O$:$G$9!#(B +% $BMW$9$k$K!V$D$.$NItJ,$,(Bp\LaTeX{}$BMQ$N=$@5$G$9!#!W$H$$$&Fs2U=j$N%3!<%I$O(B +% $B<B<AE*$KITMW$H$J$j$^$7$?!#(B +% +% $B$7$+$7!"$@$+$i$H$$$C$F>C$7$F$7$^$&$H!"8E$$(Bp\LaTeX{}$B$N(B|\@makecol|$B$r(B +% $B%Y!<%9$K:n$i$l$?30It%Q%C%1!<%8$+$i(B|\@makespecialcolbox|$B$,8F$S=P$5$l$k(B +% $B>l9g$K5SCm$,>CLG$9$k$*$=$l$,$"$j$^$9!#$3$N$?$a!"(B|\@makespecialcolbox|$B$O(B +% $B=>Mh$N%3!<%I$N$^$^0];}$7$F$"$j$^$9!J32$O$"$j$^$;$s!K!#(B +% \changes{v1.2l}{2017/02/25}{\cs{@makecol}$B$rJQ99$7$?$N$K(B +% \cs{@makespecialcolbox}$B$rJQ99$7$J$$!"$H$$$&H=CG$K$D$$$FL@J82=(B} +% $B!JCfN,!K(B +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{$B2<@~%^%/%m(B} +% +% \begin{macro}{\textunderscore} +% \changes{v1.1b}{1995/04/12}{$B2<@~%^%/%m$rDI2C(B} +% $B$3$N%3%^%s%I$O%F%-%9%H%b!<%I$G;XDj$5$l$?(B|\_|$B$NFbIt%3%^%s%I$G$9!#(B +% $B=DAH$G$N0LCV$rD4@0$9$k$h$&$K:FDj5A$r$7$^$9!#(B +% $B$b$H$O(B\file{ltoutenc.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% +% $B$J$*!"(B|\_|$B$r?t<0%b!<%I$G;H$&$H(B|\mathunderscore|$B$,<B9T$5$l$^$9!#(B +% +% $B%3%_%e%K%F%#HG$G$O=D?t<0%G%#%l%/%7%g%s$G%Y!<%9%i%$%sJd@5NL$,(B +% $BJQ$@$C$?$N$rD>$7$^$7$?!#$"$o$;$F2#%G%#%l%/%7%g%s$G$b%Y!<%9%i%$%s(B +% $BJd@5$KDI?o$9$k$h$&$K$7$F$$$^$9!#(B +% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\textunderscore} +%<platexrelease> {Baseline shift for \textunderscore}% +%<*plcore|platexrelease> +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi + \vbox{\hrule\@width.3em}} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\textunderscore} +%<platexrelease> {Baseline shift for \textunderscore}% +%<platexrelease>\DeclareTextCommandDefault{\textunderscore}{% +%<platexrelease> \leavevmode\kern.06em +%<platexrelease> \iftdir\raise-\tbaselineshift\fi +%<platexrelease> \vbox{\hrule\@width.3em}} +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ^^A ===== plcore.dtx (plcore) ===== +% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B} +% +% \LaTeXe\ 2017-04-15$B$GF3F~$5$l$?5?;w%?%$%WF~NO(B(verbatim)$BFb$G$N(B +% $B%O%$%U%M!<%7%g%s$K4XO"$7$?=$@5$KDI?o$7$^$9!#(B +% +% \begin{macro}{\@outputpage} +% |\textwidth|$B$H(B|\textheight|$B$N8r49$O!"(B|\@shipoutsetup|$BFb$G$O9T$J$$$^$;$s!#(B +% $B$J$<$J$i!"(B|\@shipoutsetup|$B%^%/%m$,<B9T$5$l$k$H$-$O!"(B +% |\shipout|$B$5$l$k(Bvbox$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B +% $B$D$M$K(B|\iftdir|$B$O56$HH=CG$5$l!"=D$H2#$N%5%$%:$r8r49$G$-$J$$$+$i$G$9!#(B +% +% $B$J$*!"$3$NJQ99$r%m!<%+%k$J$b$N$K$9$k$?$a$K!"(B +% |\begingroup|$B$H(B|\endgroup|$B$G0O$_$^$9!#(B +% \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B} +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\@outputpage} +%<platexrelease> {Reset language for hyphenation}% +%<*plcore|platexrelease> +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand +% \end{macrocode} +% \LaTeXe\ 2017-04-15$B$G$O(Bverbatim$B4D6-Fb$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B +% $B=$@5$5$l$^$7$?$,!"(Bverbatim$B4D6-$NESCf$G2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G(B +% $B%O%$%U%M!<%7%g%s$,M^@)$5$l$k$N$O@5$7$/$J$$$N$G!"(B|\language|$B$r(B +% |\begin{document}|$B$G$NCM$K%j%;%C%H$7$^$9!J;29M!'(Blatex2e svn r1407$B!K!#(B +% $B%W%j%"%s%V%k$GFCJL$K@_Dj$5$l$l$P$=$NCM!"@_Dj$5$l$J$1$l$P(B0$B$G$9!JK|$,0l(B +% |\document|$B$NDj5A$,8E$$>l9g(B\footnote{\LaTeXe\ 2017/01/01$B0JA0$r;H$C$F(B +% p\LaTeXe{}$B$N%U%)!<%^%C%H$r:n@.$7$?>l9g$d!"(Bdinbrief.cls$B$N$h$&$KFH<+$N(B +% $B:FDj5A$r9T$&%/%i%9$d%Q%C%1!<%8$r;H$C$?>l9g$K5/$3$k$+$b$7$l$^$;$s!#(B}$B$O(B +% $-1$$B$K$J$j$^$9$,!"$3$l$O(B0$B$HF1$8$O$?$i$-$r$9$k$N$GLdBj$O5/$-$^$;$s!K!#(B +% \changes{v1.2m}{2017/03/19}{\cs{language}$B$r%j%;%C%H(B +% (sync with ltoutput.dtx 2017/03/10 v1.3c)} +% \begin{macrocode} + \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 +% \end{macrocode} +% \changes{v1.1g}{1998/02/03}{\cs{@shipoutsetup}$B$r(B\cs{@outputpage}$BFb$KF~$l$?(B} +% $B$3$3$+$i(B|\@shipoutsetup|$B$NFbMF!#(B +% \begin{macrocode} + \if@specialpage + \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% + \fi +% \end{macrocode} +% \changes{v1.1c}{1995/02/05}{\cs{oddsidemargin}$B$H(B\cs{evensidemargin}$B$,(B +% $B5U$@$C$?$N$r=$@5(B} +% \begin{macrocode} + \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 +% \end{macrocode} +% $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} +% \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 + \let\label\@gobble + \let\index\@gobble + \let\glossary\@gobble + \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ +% \end{macrocode} +% $B$3$3$^$G$,(B|\@shipoutsetup|$B$NFbMF!#(B +% \begin{macrocode} + \@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 + }% + }% +% \endgroup now inserted by \aftergroup +% \end{macrocode} +% |\if@newlist|$B$r=i4|2=!#(B +% \begin{macrocode} + \global\let\if@newlist\@@if@newlist + \global \@colht \textheight + \stepcounter{page}% + \let\firstmark\botmark +} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@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> \@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 +% \end{macrocode} +% \end{macro} +% +% \subsection{$B5?;w%?%$%WF~NO(B} +% +% \begin{macro}{\verb} +% \changes{v1.1b}{1995/04/05}{$B8_49%b!<%I$N$H$-$O!"(Bpl209.def$B$NDj5A$r;H$&(B} +% \changes{v1.1g}{1997/01/16} +% {\cs{verb}$B%3%^%s%I$r(B\LaTeX\ \texttt{!<1996/06/01!>}$B$K9g$o$;$F=$@5(B} +% \LaTeX{}$B$N(B|\verb|$B%3%^%s%I$G$O!"?t<0%b!<%I$G$J$$$H$-$O!"(B +% |\leavevmode|$B$G?eJ?%b!<%I$KF~$C$?$"$H!"(B|\null|$B$r=PNO$7$F$$$^$9!#(B +% $B%^%/%m(B|\null|$B$O(B|\hbox{}|$B$H$7$FDj5A$5$l$F$$$^$9$N$G!"(B +% $B$3$3$K$OOB2$J84V%9%Z!<%9!J(B|\xkanjiskip|$B!K$,F~$j$^$;$s!#(B +% $B$=$3$G!"(B|\null|$B$r=PNO$7$J$$$h$&%^%/%m$r=$@5$7$^$9!#(B +% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \begin{macrocode} +%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<*plcore|platexrelease> +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs +% \end{macrocode} +% \LaTeXe\ 2017-04-15$B$KDI?o$7$F!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B|\language|$B$r@_Dj$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B +% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B +% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)} +% \begin{macrocode} + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\verb} +%<platexrelease> {Disable hyphenation in verb}% +%<platexrelease>\if@compatibility\else +%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +%<platexrelease> \bgroup +%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials +%<platexrelease> \verbatim@font\@noligs +%<platexrelease> \@ifstar\@sverb\@verb} +%<platexrelease>\fi +%<platexrelease>\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% ^^A ===== plvers.dtx (plfinal) ===== +% \subsection{$B%O%$%U%M!<%7%g%s4XO"(B} +% +% \begin{macro}{\l@nohyphenation} +% \LaTeXe\ 2017-04-15$B$G!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B +% $B$9$k=$@5$,F~$j$^$7$?!#$3$N=$@5$K$O(B|\l@nohyphenation|$B$,Dj5A:Q$_$G$J$1$l$P(B +% $B$J$j$^$;$s$,!"DL>o$O(BBabel$B$NDj5A%U%!%$%k$K$h$C$FDs6!$5$l$F$$$^$9!#(B +% \LaTeXe{}$B$OFC<l$J>u67$bA[Dj$7$F(Bltfinal$B$GBP:v$7$F$$$k$h$&$G$9$N$G!"(B +% p\LaTeXe{}$B$bG0$N$?$a(Bplfinal$B$GBP:v$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B +% \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +%<*plfinal> +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\document@default@language} +% \LaTeXe\ 2017-04-15$B$GF3F~$5$l$?%Q%i%a!<%?$G$9!#99?7%?%$%_%s%0$N$:$l$N(B +% $B2DG=@-$r9MN8$7!"(Bp\LaTeXe{}$B$G$b=`Hw$7$F$*$-$^$9!#(Bverbatim$B4D6-$NESCf$G(B +% $B2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G%O%$%U%M!<%7%g%s$,M^@)$5$l$J$$$h$&$K!"(B +% |\@outputpage|$B$G(B|\language|$B$r%j%;%C%H$9$k$H$-$K;H$o$l$^$9(B +% $B!J;29M!'(Blatex2e svn r1407$B!K!#(B +% \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B +% (sync with ltfinal 2017/03/09 v2.0t)} +% \begin{macrocode} +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi +%</plfinal> +% \end{macrocode} +% \end{macro} +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% \endinput diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index 3b38283f963..ffa0d7747f6 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -80,8 +80,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -147,6 +147,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -238,7 +272,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -248,7 +282,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index 85ae77ffae0..c4236176f89 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index ca260663a31..6491c404096 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 1b029ac5ac8..e3f3ceaeffb 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index 79a8b9085fe..dafb5748633 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -106,8 +107,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -155,6 +157,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -180,9 +221,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -196,9 +237,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -212,9 +253,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -228,9 +269,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -246,7 +287,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -257,14 +298,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -274,7 +315,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -380,16 +421,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -417,10 +460,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index 673d69658c3..7859e891e24 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -81,8 +82,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -104,8 +105,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -153,6 +155,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -252,7 +293,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -262,7 +303,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -390,7 +431,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -418,10 +460,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 78980e3fc9b..0de1a880c64 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index b1d9ec0b007..0c9010443e0 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index e045bc7a65a..a7388304d86 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty index 8375b45e319..06459d11a23 100644 --- a/Master/texmf-dist/tex/platex/base/pfltrace.sty +++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty @@ -19,8 +19,8 @@ \RequirePackageWithOptions{fltrace} \gdef\@makespecialcolbox{% \fl@trace{Krudgeins ht \the\ht\@kludgeins\space - dp \the\dp\@kludgeins\space - wd \the\wd\@kludgeins}% + dp \the\dp\@kludgeins\space + wd \the\wd\@kludgeins}% \setbox\@outputbox \vbox {% \@texttop \dimen@ \dp\@outputbox diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 659d26153aa..6efb18a30aa 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -16,9 +16,9 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2016/03/31} + {2017/01/01} \edef\platexreleaseversion - {2016/11/29} + {2017/04/08} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -121,6 +121,115 @@ of this package available from CTAN} \plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}% \plEndIncludeInRelease %% File: plfonts.dtx +\plIncludeInRelease{2017/04/08}{\ystrutbox} + {Add \ystrutbox}% +\newbox\ystrutbox +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\ystrutbox} + {Add \ystrutbox}% +\let\ystrutbox\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\strutbox} + {Add \strutbox}% +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\strutbox} + {Add \strutbox}% +\newbox\strutbox % emulation purpose only +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\strut} + {Use \ystrutbox}% +\def\strut{\relax + \ifydir + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi + \else + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\strut} + {Use \ystrutbox}% +\def\strut{\relax + \ifydir + \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \else + \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\ystrut} + {Add \ystrut}% +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\ystrut} + {Add \ystrut}% +\let\ystrut\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\set@fontsize} + {Construct \ystrutbox}% +\def\set@fontsize#1#2#3{% + \@defaultunits\@tempdimb#2pt\relax\@nnil + \edef\f@size{\strip@pt\@tempdimb}% + \@defaultunits\@tempskipa#3pt\relax\@nnil + \edef\f@baselineskip{\the\@tempskipa}% + \edef\f@linespread{#1}% + \let\baselinestretch\f@linespread + \def\size@update{% + \baselineskip\f@baselineskip\relax + \baselineskip\f@linespread\baselineskip + \normalbaselineskip\baselineskip + \adjustbaseline + \setbox\ystrutbox\hbox{\yoko + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.5\baselineskip \@depth.5\baselineskip}% + \setbox\zstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\set@fontsize} + {Construct \ystrutbox}% +\def\set@fontsize#1#2#3{% + \@defaultunits\@tempdimb#2pt\relax\@nnil + \edef\f@size{\strip@pt\@tempdimb}% + \@defaultunits\@tempskipa#3pt\relax\@nnil + \edef\f@baselineskip{\the\@tempskipa}% + \edef\f@linespread{#1}% + \let\baselinestretch\f@linespread + \def\size@update{% + \baselineskip\f@baselineskip\relax + \baselineskip\f@linespread\baselineskip + \normalbaselineskip\baselineskip + \adjustbaseline + \setbox\strutbox\hbox{\yoko + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.5\baselineskip \@depth.5\baselineskip}% + \setbox\zstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\textunderscore} + {Baseline shift for \textunderscore}% +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi + \vbox{\hrule\@width.3em}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\textunderscore} + {Baseline shift for \textunderscore}% +\DeclareTextCommandDefault{\textunderscore}{% + \leavevmode\kern.06em + \iftdir\raise-\tbaselineshift\fi + \vbox{\hrule\@width.3em}} +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\g@tlastchart@} {Added \g@tlastchart@}% \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} @@ -284,6 +393,44 @@ of this package available from CTAN} \let\eminnershape\@undefined \plEndIncludeInRelease %% File: plcore.dtx +\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}% +\gdef\@makecol{% + \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) + \xdef\@freelist{\@freelist\@midlist}% + \global \let \@midlist \@empty + \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \setbox\@outputbox \vbox to\@colht {% + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi + \vskip -\dimen@ + \@textbottom + }% + \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) + \global \maxdepth \@maxdepth +} +\plEndIncludeInRelease \plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}% \gdef\@makecol{% \setbox\@outputbox\box\@cclv% @@ -294,6 +441,7 @@ of this package available from CTAN} \@makespecialcolbox \else \setbox\@outputbox \vbox to\@colht {% +% \boxmaxdepth \@maxdepth % comment out on LaTeX 1997/12/01 \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox @@ -416,6 +564,145 @@ of this package available from CTAN} \fi } \plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\@outputpage} + {Reset language for hyphenation}% +\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 + \@@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 + \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{0000/00/00}{\@outputpage} + {Reset language for hyphenation}% +\def\@outputpage{% +\begingroup % the \endgroup is put in by \aftergroup + \iftdir + \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ + \fi + \let \protect \noexpand + \@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 + \@@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 + \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{2016/07/01}{\AtBeginDvi} {Fix for incompatible direction}% \def \AtBeginDvi #1{% @@ -551,6 +838,51 @@ of this package available from CTAN} \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} \plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\@setref} + {Spacing after \ref in moving arguments}% +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax{}% change \null to \relax{} + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@setref} + {Spacing after \ref in moving arguments}% +\def\@setref#1#2#3{% + \ifx#1\relax + \protect\G@refundefinedtrue + \nfss@text{\reset@font\bfseries ??}% + \@latex@warning{Reference `#3' on page \thepage \space + undefined}% + \else + \expandafter#2#1\relax% change \null to \relax + \fi} +\plEndIncludeInRelease +\plIncludeInRelease{2017/04/08}{\verb} + {Disable hyphenation in verb}% +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\verb} + {Disable hyphenation in verb}% +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs + \@ifstar\@sverb\@verb} +\fi +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@tabular} {Remove extra \xkanjiskip}% \def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 57453dce9d3..775b33fd921 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -18,7 +18,7 @@ %% File: plvers.dtx \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2016/11/29} + {2017/04/08} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -82,9 +82,11 @@ \let\notffam@list\kfam@list \newbox\tstrutbox \newbox\zstrutbox +\newbox\ystrutbox +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} \def\strut{\relax \ifydir - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} @@ -92,6 +94,8 @@ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup \nfss@catcodes @@ -427,7 +431,7 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\tstrutbox\hbox{\tate @@ -632,7 +636,9 @@ \@onlypreamble\kanjiprocess@table \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - \iftdir\raise-\tbaselineshift\fi + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} \InputIfFileExists{pldefs.cfg} {\typeout{*************************************^^J% @@ -689,9 +695,25 @@ \fi} \gdef\@makecol{% \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi \ifvbox\@kludgeins \@makespecialcolbox \else @@ -702,16 +724,9 @@ \iftdir\vbox{\hskip\z@}\fi \vskip -\dimen@ \@textbottom - \ifvoid\footins\else % for pLaTeX - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - \fi }% \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) \global \maxdepth \@maxdepth } \gdef\@makespecialcolbox{% @@ -849,6 +864,7 @@ \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 @@ -963,13 +979,14 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax% change \null to \relax + \expandafter#2#1\relax{}% change \null to \relax{} \fi} \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs + \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi \gdef\@stopfield{\null\color@endgroup\egroup} @@ -1058,6 +1075,12 @@ } \expandafter \endgroup \platexTMP +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index dd503892abc..3d6e4be9ec3 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -15,7 +15,7 @@ %% File: plext.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plext} - [2016/11/19 v1.2c pLaTeX package file (community edition)] + [2017/03/28 v1.2f pLaTeX package file (community edition)] \newif\if@rotsw \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv @@ -73,10 +73,16 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vtop\bgroup\kern\z@\vtop}% \let\@end@alignbox\egroup \else\if #2b\relax - \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}% + \def\@begin@alignbox{% + \@tempdima=\tbaselineshift + \advance\@tempdima-\ybaselineshift + \raise\@tempdima\vbox\bgroup\vbox}% \def\@end@alignbox{\kern\z@\egroup}% \else \let\@begin@alignbox\vcenter @@ -95,7 +101,7 @@ \fi\fi \else\let\box@dir\tate \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -119,7 +125,7 @@ \fi\fi \else\let\box@dir\yoko \if #2t\relax - \def\@begin@alignbox{\raise\cdp\vtop}% + \let\@begin@alignbox\vtop \let\@end@alignbox\relax \else\if #2b\relax \let\@begin@alignbox\vbox @@ -301,7 +307,7 @@ \if@rotsw \egroup\m@th$\egroup\fi \egroup \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup} -\def\parbox{\@ifnextchar<%> +\DeclareRobustCommand\parbox{\@ifnextchar<%> {\X@parbox}{\X@parbox<Z>}} \def\X@parbox<#1>{\@ifnextchar[%] {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}} @@ -333,7 +339,7 @@ \iftdir \if #1y\relax\let\box@dir\yoko \if #2t\relax - \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% @@ -342,7 +348,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\if #1z\relax\@rotswtrue \let\box@dir\relax @@ -356,7 +362,7 @@ \let\@begin@parbox\vcenter \let\@end@parbox\relax \else - \def\@begin@parbox{\hskip\tbaselineshift$\vcenter}% + \def\@begin@parbox{$\vcenter}% \def\@end@parbox{\m@th$}% \fi\fi\fi \else\let\box@dir\tate @@ -364,7 +370,7 @@ \let\@begin@parbox\vtop \let\@end@parbox\relax \else\if #2b\relax - \def\@begin@parbox{\lower\cdp\vbox}% + \let\@begin@parbox\vbox \let\@end@parbox\relax \else\ifmmode \let\@begin@parbox\vcenter @@ -377,10 +383,10 @@ \else \if #1t\relax\let\box@dir\tate \if #2t\relax - \def\@begin@parbox{\vtop\bgroup\kern\z@\vbox}% + \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}% \let\@end@parbox\egroup \else\if #2b\relax - \def\@begin@parbox{\vbox\bgroup\vbox}% + \def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}% \def\@end@parbox{\kern\z@\egroup}% \else\ifmmode \let\@begin@parbox\vcenter @@ -504,7 +510,7 @@ \let\Rensuji\rensuji \let\prensuji\rensuji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} -\def\@Kanji#1{\expandafter\kansuji\number #1} +\def\@Kanji#1{\kansuji #1} \def\kanji{\iftdir\expandafter\kansuji\fi} \def\boutenchar{\char\euc"A1A2} \def\bou#1{\ifvmode\leavevmode\fi\@bou#1\end} diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 58ef9e145f6..18fca273f86 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -15,7 +15,7 @@ %% File: plfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2016/04/30 v1.6b Standard pLaTeX package (font tracing)] + [2017/02/20 v1.6f Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape @@ -74,6 +74,43 @@ \size@update} \def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}} \KanjiEncodingPair{JY1}{JT1} +\plIncludeInRelease{2017/04/08}{\set@fontsize} + {Construct \ystrutbox}% +\def\set@fontsize#1#2#3{% + \@defaultunits\@tempdimb#2pt\relax\@nnil + \edef\f@size{\strip@pt\@tempdimb}% + \@defaultunits\@tempskipa#3pt\relax\@nnil + \edef\f@baselineskip{\the\@tempskipa}% + \edef\f@linespread{#1}% + \let\baselinestretch\f@linespread + \def\size@update{% + \baselineskip\f@baselineskip\relax + \baselineskip\f@linespread\baselineskip + \normalbaselineskip\baselineskip + \adjustbaseline + \setbox\ystrutbox\hbox{\yoko + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \setbox\tstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.5\baselineskip \@depth.5\baselineskip}% + \setbox\zstrutbox\hbox{\tate + \vrule\@width\z@ + \@height.7\baselineskip \@depth.3\baselineskip}% + \ifnum \tracingfonts>\tw@ + \ifx\f@linespread\@empty + \let\reserved@a\@empty + \else + \def\reserved@a{\f@linespread x}% + \fi + \@font@info{Changing size to\space + \f@size/\reserved@a \f@baselineskip}% + \aftergroup\type@restoreinfo + \fi + \let\size@update\relax}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\set@fontsize} + {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -95,17 +132,18 @@ \setbox\zstrutbox\hbox{\tate \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% - \ifnum \tracingfonts>\tw@ - \ifx\f@linespread\@empty - \let\reserved@a\@empty - \else - \def\reserved@a{\f@linespread x}% - \fi - \@font@info{Changing size to\space - \f@size/\reserved@a \f@baselineskip}% - \aftergroup\type@restoreinfo - \fi + \ifnum \tracingfonts>\tw@ + \ifx\f@linespread\@empty + \let\reserved@a\@empty + \else + \def\reserved@a{\f@linespread x}% + \fi + \@font@info{Changing size to\space + \f@size/\reserved@a \f@baselineskip}% + \aftergroup\type@restoreinfo + \fi \let\size@update\relax}} +\plEndIncludeInRelease \newbox\adjust@box \newdimen\adjust@dimen \def\adjustbaseline{% diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 258f8d010da..a4041b53cbc 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -80,8 +80,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -148,6 +148,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -239,7 +273,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -249,7 +283,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index ac9037fc6e6..9d3f59afedd 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index 90fd84a193b..c049ce48905 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index fba4457a085..5467b0cce56 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index 446af36373e..a80402bd3e0 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -82,8 +83,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -106,8 +107,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -156,6 +158,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -181,9 +222,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -197,9 +238,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -213,9 +254,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% @@ -229,9 +270,9 @@ \let\@mkboth\markboth \def\chaptermark##1{\markright{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter + \if@mainmatter \@chapapp\thechapter\@chappos\hskip1zw - \fi + \fi \fi ##1}}% } @@ -247,7 +288,7 @@ \if@compatibility \newenvironment{titlepage} {% - \cleardoublepage + \cleardoublepage \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\newpage\fi \thispagestyle{empty}% @@ -258,14 +299,14 @@ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -275,7 +316,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -384,16 +425,18 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \pltx@cleartooddpage \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -421,10 +464,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index f5b0da97350..287e9ce3322 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -24,6 +24,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -81,8 +82,8 @@ \tombowtrue \tombowdatetrue \setlength{\@tombowwidth}{.1\p@}% \@bannertoken{% - \jobname\space:\space\number\year/\number\month/\number\day - (\number\hour:\number\minute)} + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% \maketombowbox} \DeclareOption{tombo}{% \tombowtrue \tombowdatefalse @@ -104,8 +105,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -154,6 +156,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -253,7 +294,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -263,7 +304,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -394,7 +435,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -422,10 +464,17 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 91da6e42af9..bbef5376c8d 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index 08c9a18bde3..0095b29980d 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index c7b6b638fac..4fa8f37fce9 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2016/11/22 v1.7b + [2017/03/05 v1.7e Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% |