diff options
author | Karl Berry <karl@freefriends.org> | 2017-10-28 22:30:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-10-28 22:30:39 +0000 |
commit | 273e485888671e409de40cffd23ad2153549915d (patch) | |
tree | 591468e322367ac5a8873e361fdfcfc31d1d0a5a /Master/texmf-dist/tex | |
parent | ba4f9ff67cd34e2e59a1968e66e6caa6d32f5bd1 (diff) |
platex (28oct17)
git-svn-id: svn://tug.org/texlive/trunk@45628 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/exppl2e.sty | 203 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/jltxdoc.cls | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 109 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/pldefs.ltx | 24 |
5 files changed, 145 insertions, 219 deletions
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index 05887655212..19cbf76d981 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} - [2017/08/26 v1.0p Experimental pLaTeX2e features] + [2017/10/26 v1.0q Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -357,52 +357,7 @@ % % p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B % -% $B$5$i$K!"Nc$($P(B``see Appendix A.''$B$N$h$&$J5-=R$,J8Kv$K$"$j!"$+$D(B -% ``A''$B$rAj8_;2>H$G<hF@$7$?>l9g$N%9%Z!<%9%U%!%/%?!<$rJd@5$9$k$?$a!"(B -% |\spacefactor\@m{}|$B$K=$@5$7$^$7$?!#$3$l$G!"(B``A.''$B$N8e$N%9%Z!<%9$,(B -% $BJ8Kv$H$7$F07$o$l$^$9!#(B -% $B!J;29M!'(B\LaTeXe{}$B%^%/%m(B\&$B%/%i%9(B $B%W%m%0%i%_%s%0<BA)2r@b!K(B -% \changes{v????}{????/??/??}{$B%9%Z!<%9%U%!%/%?!<$rJd@5(B} -% \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\@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\spacefactor\@m{}% change \null to \spacefactor\@m{} - \fi} -%</plcore|platexrelease> -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{2017/04/08}{\@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 -%<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} +% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -426,69 +381,7 @@ % % \section{verb$B$NKAF,$N%9%Z!<%9(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$7$+$7!"C1$K(B|\null|$B$r=|$$$F$7$^$&$H!":#EY$O(B|\verb+ abc+|$B$N$h$&$K(B -% |\verb|$B$NKAF,$KH>3Q6uGr$,$"$k>l9g$K$3$l$,>C$($F$7$^$$$^$9(B(TeX.SX 170245)$B!#(B -% $B$=$3$G!"(Bp\LaTeX{}$B$G$O(B|\null|$B$NBe$o$j$K(B -% \begin{enumerate} -% \item $BOB2$J84V%9%Z!<%9$NA^F~=hM}$OF)2a$9$k(B -% \item $B9TJ,3d;~$K>C$($k(B(discardable)$B%N!<%I$G$O$J$$(B -% \end{enumerate} -% $B$NN>>r7o$rK~$?$9%N!<%I$rA^F~$7$^$9!#$3$3$G$O(B|\vadjust{}|$B$H$7$^$7$?!#(B -% -% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B -% \changes{v????}{????/??/??}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B} -% \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\verb} -%<platexrelease> {Preserve beginning space characters}% -%<*plcore|platexrelease> -\if@compatibility\else -\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\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{2017/04/08}{\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> \language\l@nohyphenation -%<platexrelease> \@ifstar\@sverb\@verb} -%<platexrelease>\fi -%<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} +% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -503,9 +396,9 @@ % \begin{macro}{\@startline} % tabbing$B4D6-$N9T$G!"Cf?H$,;O$a3g8LN`$J$I$G;O$^$k>l9g!"(B % $B:G=i$N9`L\$@$1(BJFM$B%0%k!<$,>C$($J$$8=>]$KBP=h$7$^$9!#(B -% \changes{v????}{????/??/??}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B} +% \changes{v1.2s}{2017/09/27}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\@startline} +%<platexrelease>\plIncludeInRelease{2017/10/28}{\@startline} %<platexrelease> {Inhibit JFM glue at the beginning}% %<*plcore|platexrelease> \gdef\@startline{% @@ -541,6 +434,10 @@ % \section{\cs{inhibitglue}$B$N4JN,7A(B} % % \begin{macro}{\<} +% $B:G8e$K!"(B|\inhibitglue|$B$N4JN,7A$rDj5A$7$^$9!#(B +% $B$3$N%3%^%s%I$O!"OBJ8%U%)%s%H$N%a%H%j%C%/>pJs$+$i!"<+F0E*$KA^F~$5$l$k(B +% $B%0%k!<$NA^F~$r6X;_$7$^$9!#(B +% % 2014$BG/$N(Bp\TeX{}$B$N(B|\inhibitglue|$B$N%P%0=$@5$KH<$$!"(B % |\inhibitglue|$B$,?bD>%b!<%I$G$O8z$+$J$/$J$j$^$7$?!#(B % \LaTeX{}$B$G$O?bD>%b!<%I$H?eJ?%b!<%I$N6hJL$,1#$5$l$F$$$^$9$N$G!"(B @@ -548,9 +445,9 @@ % % |\DeclareRobustCommand|$B$r;H$&$H(B|\protect|$B$N1F6A$GA0J}$NJ8;z$KBP$9$k(B % |\inhibitglue|$B$,8z$+$J$/$J$k$N$G!"(Be-\TeX{}$B$N(B|\protected|$B$,I,MW$G$9!#(B -% \changes{v????}{????/??/??}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} +% \changes{v1.6i}{2017/09/24}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} % \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\<} +%<platexrelease>\plIncludeInRelease{2017/10/28}{\<} %<platexrelease> {\inhibitglue in vertical mode}% %<*pldefs|platexrelease> \ifx\protected\@undefined @@ -571,83 +468,7 @@ % % \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}} % -% \begin{macro}{\check@nocorr@} -% $B!V(B\verb|$B$"(B\texttt{abc}$B$$(B|$B!W$H$7$?$H$-!"=qBN$NJQ99$r;XDj$5$l$?2$J8$N:8B&$K(B -% $BOB2$J84V%9%Z!<%9$,F~$i$J$$$N$r=$@5$7$^$9!#(B -% \changes{v1.3i}{2000/07/13}{\cs{text..}$B%3%^%s%I$N:8B&$K(B\cs{xkanjiskip}$B$,(B -% $BF~$i$J$$$N$r=$@5!J$"$j$,$H$&!"25It!wElBg$5$s!K(B} -% -% $B%3%_%e%K%F%#HG$N=$@5!'(Bp\TeX{}$B$N%P!<%8%g%s(Bp3.1.11$B0JA0$O!"%$%?%j%C%/Jd@5(B -% $B!J0J2<(B|\/|$B$H5-$9!K$H(B|\xkanjiskip|$B$NA^F~$,>WFM(B\footnote{$BOBJ8$N%$%?%j%C%/(B -% $BJd@5MQ(Bkern$B$,!"DL>o$N(Bexplicit$B$J!J(B\cs{kern}$B$K$h$k!K(Bkern$B$HF1$807$$$r<u$1$F(B -% $B$$$?$?$a!#(B}$B$7(B -% \begin{enumerate} -% \item $B!V2$J8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O(B|\/|$B$rL5;k$9$k(B -% $B!J$D$^$j8e$K(B|\xkanjiskip|$BA^F~2DG=!K(B -% \item $B!VOBJ8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O$3$N8e$K(B|\xkanjiskip|$B$OA^F~$G$-$J$$(B -% \end{enumerate} -% $B$H$$$&5sF0$K$J$C$F$$$^$7$?!#(Bp3.2$B!J(B2010$BG/!K$N=$@5$G(B -% \begin{itemize} -% \item |\xkanjiskip|$BA^F~;~$K$O$$$+$J$k>l9g$b(B|\/|$B$rL5;k$9$k(B -% \end{itemize} -% $B$H$$$&5sF0$KJQ99$5$l$^$7$?!#(Bp\LaTeX{}$B%+!<%M%k$N(B|\check@nocorr@|$B$N=$@5$O!"(B -% p3.1.11$B0JA0$N(B2.$B$X$NBP=h$G$7$?$,!"$3$l$O!V(B|\text...{}|$B$N:8$X$N(B|\/|$BA^F~!W$r(B -% $BL58z2=$7$F$$$k$N$G!"(B|\textit{f\textup{a}}|$B$GK\MhF~$k$Y$-%$%?%j%C%/Jd@5$,(B -% $BF~$j$^$;$s$G$7$?!#(Bp3.2$B0J9_$G$O(Bp\TeX{}$B$N(B|\xkanjiskip|$BBP:v$,ITMW$K$J$C$F(B -% $B$$$^$9$N$G!"%3%_%e%K%F%#HG$G$O:o=|$7$^$7$?!#(B -% \changes{v????}{????/??/??}{2010$BG/$N(Bp\TeX{}$BK\BN$N=$@5$K$h$j!"(Bv1.3i$B$GF~$l$?(B -% $BBP=h$,ITMW$K$J$C$F$$$?$N$G:o=|(B} -% \begin{macrocode} -%<platexrelease>\plIncludeInRelease{????/??/??}{\check@nocorr@} -%<platexrelease> {Italic correction before \textt...}% -%<*pldefs|platexrelease> -\def \check@nocorr@ #1#2\nocorr#3\@nil {% - \let \check@icl \maybe@ic - \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% - \def \reserved@a {\nocorr}% - \def \reserved@b {#1}% - \def \reserved@c {#3}% - \ifx \reserved@a \reserved@b - \ifx \reserved@c \@empty - \let \check@icl \@empty - \else - \let \check@icl \@empty - \let \check@icr \@empty - \fi - \else - \ifx \reserved@c \@empty - \else - \let \check@icr \@empty - \fi - \fi -} -%</pldefs|platexrelease> -%<platexrelease>\plEndIncludeInRelease -%<platexrelease>\plIncludeInRelease{0000/00/00}{\check@nocorr@} -%<platexrelease> {Italic correction before \textt...}% -%<platexrelease>\def \check@nocorr@ #1#2\nocorr#3\@nil {% -%<platexrelease> \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B -%<platexrelease> \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% -%<platexrelease> \def \reserved@a {\nocorr}% -%<platexrelease> \def \reserved@b {#1}% -%<platexrelease> \def \reserved@c {#3}% -%<platexrelease> \ifx \reserved@a \reserved@b -%<platexrelease> \ifx \reserved@c \@empty -%<platexrelease> \let \check@icl \@empty -%<platexrelease> \else -%<platexrelease> \let \check@icl \@empty -%<platexrelease> \let \check@icr \@empty -%<platexrelease> \fi -%<platexrelease> \else -%<platexrelease> \ifx \reserved@c \@empty -%<platexrelease> \else -%<platexrelease> \let \check@icr \@empty -%<platexrelease> \fi -%<platexrelease> \fi -%<platexrelease>} -%<platexrelease>\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} +% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/platex/base/jltxdoc.cls b/Master/texmf-dist/tex/platex/base/jltxdoc.cls index f4e8f666a81..065d313892d 100644 --- a/Master/texmf-dist/tex/platex/base/jltxdoc.cls +++ b/Master/texmf-dist/tex/platex/base/jltxdoc.cls @@ -14,7 +14,7 @@ %% %% File: jltxdoc.dtx \NeedsTeXFormat{pLaTeX2e} -\ProvidesClass{jltxdoc}[2016/07/25 v1.0c Standard pLaTeX file] +\ProvidesClass{jltxdoc}[2017/09/24 v1.0d Standard pLaTeX file] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ltxdoc}} \ProcessOptions \LoadClass{ltxdoc} @@ -59,7 +59,7 @@ \def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack} \def\EnableCrossrefs{\@bsphack\scan@allowedtrue \def\DisableCrossrefs{\@bsphack\scan@allowedfalse\@esphack}\@esphack} -\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi \bgroup \let\do\do@noligs \verbatim@nolig@list \ttfamily \verb@eol@error \let\do\@makeother \dospecials \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 178cdda70ac..e217dc55694 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 {2017/04/15} \edef\platexreleaseversion - {2017/09/26} + {2017/10/28} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -425,6 +425,52 @@ of this package available from CTAN} \fi #1} \plEndIncludeInRelease +\plIncludeInRelease{2017/10/28}{\check@nocorr@} + {Italic correction before \textt...}% +\def \check@nocorr@ #1#2\nocorr#3\@nil {% + \let \check@icl \maybe@ic + \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% + \def \reserved@a {\nocorr}% + \def \reserved@b {#1}% + \def \reserved@c {#3}% + \ifx \reserved@a \reserved@b + \ifx \reserved@c \@empty + \let \check@icl \@empty + \else + \let \check@icl \@empty + \let \check@icr \@empty + \fi + \else + \ifx \reserved@c \@empty + \else + \let \check@icr \@empty + \fi + \fi +} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\check@nocorr@} + {Italic correction before \textt...}% +\def \check@nocorr@ #1#2\nocorr#3\@nil {% + \let \check@icl \relax % changed from \maybe@ic + \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% + \def \reserved@a {\nocorr}% + \def \reserved@b {#1}% + \def \reserved@c {#3}% + \ifx \reserved@a \reserved@b + \ifx \reserved@c \@empty + \let \check@icl \@empty + \else + \let \check@icl \@empty + \let \check@icr \@empty + \fi + \else + \ifx \reserved@c \@empty + \else + \let \check@icr \@empty + \fi + \fi +} +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\eminnershape}{\eminnershape}% \DeclareRobustCommand\em {\@nomath\em \ifdim \fontdimen\@ne\font >\z@ @@ -443,6 +489,18 @@ of this package available from CTAN} \mcfamily \upshape \else \gtfamily \itshape \fi} \let\eminnershape\@undefined \plEndIncludeInRelease +\plIncludeInRelease{2017/10/28}{\<} + {\inhibitglue in vertical mode}% +\ifx\protected\@undefined +\def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\<} + {\inhibitglue in vertical mode}% +\def\<{\inhibitglue} +\plEndIncludeInRelease %% File: plcore.dtx \plIncludeInRelease{2017/07/29}{\@no@lnbk} {Break before prebreakpenalty}% @@ -936,6 +994,18 @@ of this package available from CTAN} \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% \color@endgroup}} \plEndIncludeInRelease +\plIncludeInRelease{2017/10/28}{\@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\spacefactor\@m{}% change \null to \spacefactor\@m{} + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\@setref} {Spacing after \ref in moving arguments}% \def\@setref#1#2#3{% @@ -960,6 +1030,17 @@ of this package available from CTAN} \expandafter#2#1\relax% change \null to \relax \fi} \plEndIncludeInRelease +\plIncludeInRelease{2017/10/28}{\verb} + {Preserve beginning space characters}% +\if@compatibility\else +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi + \bgroup + \verb@eol@error \let\do\@makeother \dospecials + \verbatim@font\@noligs + \language\l@nohyphenation + \@ifstar\@sverb\@verb} +\fi +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\verb} {Disable hyphenation in verb}% \if@compatibility\else @@ -981,6 +1062,32 @@ of this package available from CTAN} \@ifstar\@sverb\@verb} \fi \plEndIncludeInRelease +\plIncludeInRelease{2017/10/28}{\@startline} + {Inhibit JFM glue at the beginning}% +\gdef\@startline{% + \ifnum \@nxttabmar >\@hightab + \@badtab + \global\@nxttabmar \@hightab + \fi + \global\@curtabmar \@nxttabmar + \global\@curtab \@curtabmar + \global\setbox\@curline \hbox {}% + \@startfield + \strut\inhibitglue} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@startline} + {Inhibit JFM glue at the beginning}% +\gdef\@startline{% + \ifnum \@nxttabmar >\@hightab + \@badtab + \global\@nxttabmar \@hightab + \fi + \global\@curtabmar \@nxttabmar + \global\@curtab \@curtabmar + \global\setbox\@curline \hbox {}% + \@startfield + \strut} +\plEndIncludeInRelease \plIncludeInRelease{2017/09/26}{\@tabclassz} {Inhibit JFM glue in tabular cells}% \def\@tabclassz{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index d7073939523..1af9abb4060 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 - {2017/09/26} + {2017/10/28} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -1011,16 +1011,26 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax{}% change \null to \relax{} + \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{} \fi} \if@compatibility\else -\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi +\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi +\gdef\@startline{% + \ifnum \@nxttabmar >\@hightab + \@badtab + \global\@nxttabmar \@hightab + \fi + \global\@curtabmar \@nxttabmar + \global\@curtab \@curtabmar + \global\setbox\@curline \hbox {}% + \@startfield + \strut\inhibitglue} \gdef\@stopfield{\null\color@endgroup\egroup} \newcommand\printglossary{\@input@{\jobname.gls}} \newcount\hour @@ -1112,11 +1122,15 @@ \everyjob{\noexpand\typeout{% \pfmtname\space<\pfmtversion>\space (based on \expandafter\parse@@BANNER\platexBANNER)}}% - \else + \else\ifnum\ppatch@level>0 \everyjob{\noexpand\typeout{% \pfmtname\space<\pfmtversion>+\ppatch@level\space (based on \expandafter\parse@@BANNER\platexBANNER)}}% - \fi + \else + \everyjob{\noexpand\typeout{% + \pfmtname\space<\pfmtversion>-pre\ppatch@level\space + (based on \expandafter\parse@@BANNER\platexBANNER)}}% + \fi\fi } \expandafter \endgroup \platexTMP diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 4558c474e0f..dab26d03327 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -15,26 +15,6 @@ %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} [2017/08/05 v1.6h pLaTeX Kernel (Default settings)] -\def \check@nocorr@ #1#2\nocorr#3\@nil {% - \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B - \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}% - \def \reserved@a {\nocorr}% - \def \reserved@b {#1}% - \def \reserved@c {#3}% - \ifx \reserved@a \reserved@b - \ifx \reserved@c \@empty - \let \check@icl \@empty - \else - \let \check@icl \@empty - \let \check@icr \@empty - \fi - \else - \ifx \reserved@c \@empty - \else - \let \check@icr \@empty - \fi - \fi -} \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \DeclareYokoKanjiEncoding{JY1}{}{} @@ -77,7 +57,11 @@ \xkanjiskip=.25zw plus1pt minus1pt \autoxspacing \jcharwidowpenalty=500 +\ifx\protected\@undefined \def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi \endinput %% %% End of file `pldefs.ltx'. |