diff options
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/exppl2e.pdf | bin | 182666 -> 158053 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/platex.pdf | bin | 262612 -> 263567 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 767883 -> 780561 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/jltxdoc.dtx | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platex.dtx | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 95 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 130 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plnewsc08.tex | 96 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 14 | ||||
| -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 |
15 files changed, 463 insertions, 267 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index f053d5e3a54..15efd3f437f 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2017-09-26 +2017-10-28 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf Binary files differindex 4cd8e644842..6a2559aa365 100644 --- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf +++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf Binary files differindex 3d42585716a..9abebafe1fe 100644 --- a/Master/texmf-dist/doc/platex/base/platex.pdf +++ b/Master/texmf-dist/doc/platex/base/platex.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 119e88f7a03..e9c48fa92eb 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/jltxdoc.dtx b/Master/texmf-dist/source/platex/base/jltxdoc.dtx index dd3aa3d29c1..3bd8d7e00da 100644 --- a/Master/texmf-dist/source/platex/base/jltxdoc.dtx +++ b/Master/texmf-dist/source/platex/base/jltxdoc.dtx @@ -3,7 +3,7 @@ % % Copyright 1995,1996,1997 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% 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). % ------------------------------------------------------------- @@ -19,11 +19,12 @@ % $B9g$o$;$F=$@5(B} % \changes{v1.0b}{1997/07/29}{\cs{}$B$H(B\texttt{"}$B$N(B\cs{xspcode}$B$rJQ99(B} % \changes{v1.0c}{2016/07/25}{doc$B%Q%C%1!<%8$,>e=q$-$9$k(B\cs{verb}$B$r:F!9Dj5A(B} +% \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}$B$rDI2C(B} % \fi % % \iffalse %<class>\NeedsTeXFormat{pLaTeX2e} -%<class>\ProvidesClass{jltxdoc}[2016/07/25 v1.0c Standard pLaTeX file] +%<class>\ProvidesClass{jltxdoc}[2017/09/24 v1.0d Standard pLaTeX file] %<*driver> \documentclass{jltxdoc} \GetFileInfo{jltxdoc.cls} @@ -176,10 +177,12 @@ % \ttfamily \verb@eol@error \let\do\@makeother \dospecials % \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} %\end{verbatim} -% $B$H$J$C$F$$$^$9$N$G!"(B|\null|$B$r30$7$^$9!#(B +% $B$H$J$C$F$$$^$9$N$G!"(B\file{plcore.dtx}$B$HF1MM$K(B|\null|$B$r30$7$F(B|\vadjust{}|$B$r(B +% $BF~$l$^$9!#(B % \changes{v1.0c}{2016/07/25}{doc$B%Q%C%1!<%8$,>e=q$-$9$k(B\cs{verb}$B$r:F!9Dj5A(B} +% \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}$B$rDI2C(B} % \begin{macrocode} -\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/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index f54a366a44d..7cd28af9a04 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -3,7 +3,7 @@ % % Copyright 1995,1996 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% 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). % ------------------------------------------------------------- @@ -43,13 +43,14 @@ % \changes{v1.0m}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B % \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B} % \changes{v1.0n}{2016/09/14}{\LaTeX{}$B$N%P%J!<$NJ]B8$7$+$?$r2~NI(B} +% \changes{v1.0o}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2016/09/14 v1.0n pLaTeX document file] +\ProvidesFile{platex.dtx}[2017/09/24 v1.0o pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -212,11 +213,11 @@ % $B$3$l$i$O(B\TeX{}$B$NFbIt7A<0$KJQ49$5$l$?7A<0$H$J$C$F$$$^$9!#(B % $B%U%)!<%^%C%H%U%!%$%k$r:n@.$9$k$K$O!"(B % $B%=!<%9%U%!%$%k(B``platex.ltx''$B$r(B|iniptex|$B%W%m%0%i%`$G=hM}$7$^$9!#(B -% $B$?$@$7!"(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O$3$N=hM}$r4JC1$K$9$k(B|fmtutil|$B$"$k$$$O(B -% |fmtutil-sys|$B$H$$$&%W%m%0%i%`$,MQ0U$5$l$F$$$^$9!#(B +% $B$?$@$7!"(B\TeX\ Live$B$d(BW32\TeX{}$B$G$O$3$N=hM}$r4JC1$K$9$k(B|fmtutil-sys|$B$"$k$$$O(B +% |fmtutil|$B$H$$$&%W%m%0%i%`$,MQ0U$5$l$F$$$^$9!#(B % $B0J2<$r<B9T$9$l$P!"%U%)!<%^%C%H%U%!%$%k(B\file{platex.fmt}$B$,:n@.$5$l$^$9!#(B %\begin{verbatim} -% fmtutil --byfmt platex +% fmtutil-sys --byfmt platex %\end{verbatim} % % $B<!$N%j%9%H$,!"(B``platex.ltx''$B$NFbMF$G$9!#(B @@ -617,6 +618,7 @@ % \changes{v1.0c}{1997/01/29}{Rename pltpatch to plpatch.} % \changes{v1.0h}{2016/05/08}{$B%I%-%e%a%s%H$+$i(B\file{plpatch.ltx}$B$r=|30(B} % \changes{v1.0l}{2016/06/19}{$B%Q%C%A%l%Y%k$r(B\file{plvers.dtx}$B$+$i<hF@(B} +% \changes{v1.0o}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B} % \begin{macrocode} \begin{document} \title{The p\LaTeXe\ Sources} @@ -653,8 +655,12 @@ \ifx\@date\X@date \def\Xpatch{0} \ifx\patchdate\Xpatch\else + % number is assumed + \ifx\patchdate>0 \edef\@date{\@date\space Patch level\space\patchdate} - \fi + \else + \edef\@date{\@date\space Pre-Release\patchdate} + \fi\fi \else \@warning{plpatch.ltx does not match plvers.dtx!} \let\includeltpatch\relax diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index d305f1403d3..77ea7eb9f74 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -72,13 +72,16 @@ % $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B} % \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B % $B$J$C$F$$$?%P%0$r=$@5(B} +% \changes{v1.2s}{2017/09/27}{$BAj8_;2>H$N%9%Z!<%9%U%!%/%?!<$rJd@5(B} +% \changes{v1.2s}{2017/09/27}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B} +% \changes{v1.2s}{2017/09/27}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/09/26 v1.2r pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/09/27 v1.2s pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1376,9 +1379,16 @@ % $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 +% +% $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{v1.2s}{2017/09/27}{$BAj8_;2>H$N%9%Z!<%9%U%!%/%?!<$rJd@5(B} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref} +%<platexrelease>\plIncludeInRelease{2017/10/28}{\@setref} %<platexrelease> {Spacing after \ref in moving arguments}% %<*plcore|platexrelease> \def\@setref#1#2#3{% @@ -1388,10 +1398,22 @@ \@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} %</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{% @@ -1419,15 +1441,25 @@ % |\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$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{v1.2s}{2017/09/27}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B} % \begin{macrocode} %</plcore> -%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb} -%<platexrelease> {Disable hyphenation in verb}% +%<platexrelease>\plIncludeInRelease{2017/10/28}{\verb} +%<platexrelease> {Preserve beginning space characters}% %<*plcore|platexrelease> \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 @@ -1442,6 +1474,17 @@ \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 @@ -1459,6 +1502,44 @@ % % \subsection{tabbing$B4D6-(B} % +% \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{v1.2s}{2017/09/27}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B} +% \begin{macrocode} +%</plcore> +%<platexrelease>\plIncludeInRelease{2017/10/28}{\@startline} +%<platexrelease> {Inhibit JFM glue at the beginning}% +%<*plcore|platexrelease> +\gdef\@startline{% + \ifnum \@nxttabmar >\@hightab + \@badtab + \global\@nxttabmar \@hightab + \fi + \global\@curtabmar \@nxttabmar + \global\@curtab \@curtabmar + \global\setbox\@curline \hbox {}% + \@startfield + \strut\inhibitglue} +%</plcore|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\@startline} +%<platexrelease> {Inhibit JFM glue at the beginning}% +%<platexrelease>\gdef\@startline{% +%<platexrelease> \ifnum \@nxttabmar >\@hightab +%<platexrelease> \@badtab +%<platexrelease> \global\@nxttabmar \@hightab +%<platexrelease> \fi +%<platexrelease> \global\@curtabmar \@nxttabmar +%<platexrelease> \global\@curtab \@curtabmar +%<platexrelease> \global\setbox\@curline \hbox {}% +%<platexrelease> \@startfield +%<platexrelease> \strut} +%<platexrelease>\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@stopfield} % \changes{v1.1d}{1996/03/12}{\cs{=}$B$N8e$m$KOB2$J84V%9%Z!<%9$,F~$k$N$r=$@5(B} % $BAj8_;2>H$d5?;w%?%$%WF~NO$G$O!"OB2$J84V%9%Z!<%9$,F~$i$J$$$N$G!"(B|\null|$B$r(B diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 66ee0ead1e7..47f216fd2fa 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -66,13 +66,16 @@ % \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B} % \changes{v1.6h}{2017/08/05}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B} % \changes{v1.6h}{2017/08/05}{trace$B$N%3!<%I$N(B\texttt{\%}$BK:$l$r=$@5(B} +% \changes{v1.6i}{2017/09/24}{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} +% \changes{v1.6i}{2017/09/24}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2017/08/05 v1.6h pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2017/09/24 v1.6i pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -2029,34 +2032,81 @@ %</pldefs> % \end{macrocode} % -% \subsection{$B%$%?%j%C%/Jd@5(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} +% \subsection{$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 -% \begin{macrocode} -%<*pldefs> -\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 -} +% \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{v1.6i}{2017/09/24}{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{2017/10/28}{\check@nocorr@} +%<platexrelease> {Italic correction before \textt...}% +%<platexrelease>\def \check@nocorr@ #1#2\nocorr#3\@nil {% +%<platexrelease> \let \check@icl \maybe@ic +%<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 +%<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 % changed from \maybe@ic +%<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} % @@ -2067,6 +2117,7 @@ % \noindent % $B=D2#%(%s%3!<%I6&DL!'(B % \begin{macrocode} +%<*pldefs> \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} % \end{macrocode} @@ -2235,12 +2286,39 @@ % \begin{macrocode} \jcharwidowpenalty=500 % \end{macrocode} +% +% \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 +% p\LaTeX{}$B$NDI2CL?Na$G$"$k(B|\<|$B$OCJMnF,$G$b8z$/$h$&$K=$@5$7$^$9!#(B +% +% |\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{v1.6i}{2017/09/24}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B} % \begin{macrocode} +%</pldefs> +%<platexrelease>\plIncludeInRelease{2017/10/28}{\<} +%<platexrelease> {\inhibitglue in vertical mode}% +%<*pldefs|platexrelease> +\ifx\protected\@undefined \def\<{\inhibitglue} +\else +\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue} +\fi +%</pldefs|platexrelease> +%<platexrelease>\plEndIncludeInRelease +%<platexrelease>\plIncludeInRelease{0000/00/00}{\<} +%<platexrelease> {\inhibitglue in vertical mode}% +%<platexrelease>\def\<{\inhibitglue} +%<platexrelease>\plEndIncludeInRelease +%<*pldefs> % \end{macrocode} +% \end{macro} % % $B$3$3$^$G$,!"(B\file{pldefs.ltx}$B$NFbMF$G$9!#(B % \begin{macrocode} diff --git a/Master/texmf-dist/source/platex/base/plnewsc08.tex b/Master/texmf-dist/source/platex/base/plnewsc08.tex new file mode 100644 index 00000000000..30f4a98aad7 --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc08.tex @@ -0,0 +1,96 @@ +%% <2017/09/26> and <2017/10/28> +\documentclass{plnews} + +\publicationyear{2017}% $BH/9TG/(B +\publicationmonth{10}% $BH/9T7n(B +\publicationissue{c8}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92 #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +\begin{document} + +\maketitle + +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2017/10/28>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2017/07/29>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9(B +\footnote{$BESCf$N%j%j!<%9(B\texttt{<2017/09/26>}$B$G$N99?72U=j$r4^$_$^$9!#(B}$B!#(B + + +\section{$B5lHG$N(Btabular$B4D6-$N%P%0=$@5(B} +\pLaTeXe\ \texttt{<2017/07/29>}$B$N%j%j!<%9$G=$@5$7$?(B|tabular|$B4D6-$K!"(B +$B1&B7$((B(|r|)$B$N%;%k$,$:$l$k%P%0$,:.F~$7$F$$$?$N$r=$@5$7$^$7$?!#(B + + +\section{tabbing$B4D6-$N(BJFM$B%0%k!<BP:v(B} +|tabular|$B4D6-$HF1MM$K(B|tabbing|$B4D6-$G$b!"9T$N:G=i$N9`L\$@$1!"3g8LN`$J$I$G(B +$B;O$^$k>l9g$K(BJFM$B%0%k!<$,F~$C$F$$$^$7$?!#(B +$B?7$7$$%P!<%8%g%s(B\pLaTeXe\ \texttt{<2017/10/28>}$B$G$O!"0lN'$KKAF,$N(B +JFM$B%0%k!<$,F~$i$J$$$h$&$K$7$^$7$?!#(B + + +\section{\LaTeXe{}$B$H$N8_49@-8~>e(B} +\pLaTeXe{}$B$G2C$($i$l$?=$@5$K$h$C$F(B\LaTeXe{}$B$N5sF0$,2u$l$F$$$?2U=j$r!"(B +$B0J2<$N$h$&$K2~NI$7$^$7$?!#(B + +\subsection{\cs{ref}$BD>8e$N%9%Z!<%9%U%!%/%?!<(B} +\<$B!V(B|\ref|$BL?NaD>8e$NOBJ8J8;z$H$N4V$K(B|\xkanjiskip|$B$,A^F~$5$l$k$h$&$K!W(B +$B$H$$$&%"%9%-!<(B\pLaTeXe{}$B$NJQ99$K$O!"K\2H(B\LaTeXe{}$B$HHf$Y$F(B +\begin{itemize} +\item $BL\<!$K8=$l$k9`L\$G(B|\ref|$B$,;H$o$l$?>l9g$K!"8eB3$NH>3Q6uGr$,>C$($k(B +\item |\ref|$B$N7k2L$,(B``A''$B$N$h$&$J1QBgJ8;z$N>l9g$K!"%9%Z!<%9%U%!%/%?!<(B +\footnote{$BJ8Kv6uGr$+C18l4V6uGr$+$r7h$a$k0x;R!#(B}$B$,@5$7$/07$o$l$J$$(B +\end{itemize} +$B$H$$$&LdBj$,$"$j$^$7$?!#A0<T$NLdBj$O%3%_%e%K%F%#HG(B +\pLaTeXe\ \texttt{<2017/04/08>}$B$GBP=h:Q$_$G$7$?$,!"8e<T$NLdBj$O(B +$B;D$C$F$$$?$N$G=$@5$7$^$7$?(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 + +\subsection{\cs{verb}$B$NKAF,$N6uGr(B} +\<$B!V(B|\verb|$BL?NaD>A0$G(B|\xkanjiskip|$B$,E,@Z$KA^F~$5$l$k$h$&$K!W(B +$B$H$$$&%"%9%-!<(B\pLaTeXe{}$B$NJQ99$K$O!"!V(B|\verb|$B$NKAF,$KH>3Q6uGr$,$"$k>l9g(B +$B!JNc$($P(B|\verb+ abc+|$B$J$I!K$K$=$l$,>C$($F$7$^$&!W$H$$$&LdBj$,$"$j$^$7$?(B +$B$N$G!"$3$l$r=$@5$7$^$7$?!#(B + +\subsection{\cs{text..}$BL?Na$N%$%?%j%C%/Jd@5(B} +$B%"%9%-!<(B\pLaTeXe{}$B$O!"!V(B{\gtfamily $B$"(B\null\verb|\texttt{abc}|$B$$(B} $B$N$h$&$J(B +$B=qBNJQ99;~$K(B|\xkanjiskip|$B$,F~$i$J$$!W$H$$$&8=>]$KBP=h$9$k$?$a!"(B +$B!V%$%?%j%C%/Jd@5$r5>@7$K$7$F(B|\xkanjiskip|$B$rF~$l$k!W$H$$$&2sHr:v$r$H$C$F(B +$B$$$^$7$?!#$3$N2sHr:v$O(B2010$BG/$N(B\pTeX{}$BB&$N=$@5$GITMW$H$J$C$?$?$a!"(B +\pLaTeXe{}$B$NEv3:%3!<%I$r:o=|$7$FK\2H(B\LaTeXe{}$B$NDj5A$KLa$7$^$7$?!#(B +$B$3$l$GNc$($P(B|\emph{f\textrm{a}}|$B$N$h$&$J>l9g$K(B|\text..|$BL?Na$N:8B&$K(B +$B%$%?%j%C%/Jd@5$,8z$/$h$&$K$J$j$^$7$?!#(B + + +\section{\cs{inhibitglue}$B$N>JN,7A$N2~NI(B} +\pLaTeXe{}$B$O!"(B|\inhibitglue|$B$N>JN,7A$H$7$F;H$($k(B|\<|$B$H$$$&L?Na$rDs6!$7$F(B +$B$$$^$7$?!#$7$+$7!"(B2014$BG/$N(B\pTeX{}$B$N=$@5$KH<$$!"(B|\<|$B$,CJMnF,$G8z$+$J$/(B +$B$J$C$F$$$^$7$?(B\footnote{\cs{inhibitglue}$B$,(B\pTeX{}$B$N5sF0JQ99$K$h$j(B +$B?bD>%b!<%I$G8z$+$J$/$J$C$?$?$a!#(B}$B$N$G!"Dj5A$r2~NI$7$^$7$?!#(B + + +\section{$BI8=`%/%i%9$N=$@5(B} +\pLaTeXe{}$BI8=`%/%i%9$N(B|\Cht|$B$J$I$NA43QJ8;z4p=`$r!"A43Q6uGrJ8;z$+$i!V4A!W$K(B +$BJQ99$7$^$7$?!#(B + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B:#8e(B\pLaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B +$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +$B$H=q$/$3$H$G!"3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B +$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B +\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 88ed34c8f8c..d01c1283121 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -56,12 +56,13 @@ % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B % (sync with ltfinal 2017/03/09 v2.0t)} % \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017/04/15!>}$BHGBP1~3NG'(B} +% \changes{v1.1d}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2017/04/23 v1.1c pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2017/09/24 v1.1d pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -127,7 +128,7 @@ %</plcore> %<platexrelease>\edef\platexreleaseversion %<*plcore|platexrelease> - {2017/09/26} + {2017/10/28} %</plcore|platexrelease> %<*plcore> \def\ppatch@level{0} @@ -194,6 +195,7 @@ % \changes{v1.0w}{2016/05/12}{$B5/F0;~$NJ8;zNs$KF~$l$k(B\LaTeX{}$B$N%P!<%8%g%s$r(B % $B85$N(B\LaTeX{}$B$N%P%J!<$+$i0z$-7Q$0$h$&$K2~NI(B} % \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B} +% \changes{v1.1d}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B} % \begin{macrocode} \ifx\patch@level\@undefined % fallback if undefined in LaTeX \def\patch@level{0}\fi @@ -206,11 +208,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/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'. |