platex (29jul17)

git-svn-id: svn://tug.org/texlive/trunk@44913 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 157 insertions, 23 deletions

diff --git a/Master/texmf-dist/source/platex/base/ascmac.dtx b/Master/texmf-dist/source/platex/base/ascmac.dtx
index b9f06627127..84f2197343f 100644
--- a/Master/texmf-dist/source/platex/base/ascmac.dtx
+++ b/Master/texmf-dist/source/platex/base/ascmac.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 %  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).
 %  -------------------------------------------------------------
@@ -11,6 +11,9 @@
 %
 % \iffalse
 %
+% 2017/07/22 v2.0d
+%     - Check existing \Return definition and throw an error
+%       if it is not compatible with ascmac.
 % 2016/08/21 v2.0c
 %     - Support pdfLaTeX, XeLaTeX and LuaLaTeX.
 % 2016/04/15 v2.0b
@@ -62,7 +65,7 @@
 %</driver>
 %<tascmac>\ProvidesPackage{tascmac}
 %<ascmac>\ProvidesPackage{ascmac}
-  [2016/08/21 v2.0c
+  [2017/07/22 v2.0d
 %<driver|tascmac>  ascmac package (community edition)
 %<ascmac>  ascmac wrapper (community edition)
   ]
@@ -554,9 +557,34 @@ Q \iftdir\yoko\fi
 %
 % \begin{macro}{\return}
 % \begin{macro}{\Return}
-% $B2~9T5-9f$G$9!#(B
+% $B2~9T5-9f$G$9!#(B|\return|$B$d(B|\Return|$B$H$$$&L>>N$O$"$j$U$l$F$$$k$N$G!"(B
+% ascmac$B%Q%C%1!<%8$NDj5A$,JL$N%Q%C%1!<%8$H>WFM$9$k>l9g$,$"$j$^$9(B
+% $B!JNc!'(Balgorithm2e$B%Q%C%1!<%8!K!#(B
+% $B$=$3$G!"(B|\Return|$B$H$$$&L?Na$,4{$KDj5A$5$l$F$$$F!"$+$D(Bascgrp$B%U%)%s%H$,(B
+% $BIT;HMQ$HH=CG$5$l$k>l9g$O%(%i!<$r=P$7$^$9!#K\Mh$J$i$P(B|\return|$B$bF1MM$K(B
+% $B%A%'%C%/$7$?$$$N$G$9$,!"!V(Bokumacro$B%Q%C%1!<%8$N8e$K(Bascmac$B%Q%C%1!<%8$r(B
+% $BFI$_9~$`$H!"%(%i!<$J$7$K(Bascmac$B%Q%C%1!<%8$NDj5A$,>!$D!W$H$$$&=>Mh$N5sF0(B
+% $B$r0];}$9$k$?$a!"8=;~E@$G$O%A%'%C%/$7$^$;$s!#(B
 %    \begin{macrocode}
 %% return-key
+\begingroup
+\def\ascmac@definable{\PackageInfo{ascmac}{Command
+  \@backslashchar\reserved@a\space already defined, but
+  compatible with\MessageBreak ascmac package, overwriting}}
+\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi}
+\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}%
+  \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}%
+  \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil}
+\expandafter\def\expandafter\ascmac@parse@i
+  \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax
+  \@notdefinable\else\ascmac@definable\fi}
+%\ascmac@check{\return}% conflict with okumacro, no check
+\ascmac@check{\Return}
+\endgroup
+%    \end{macrocode}
+%
+% $B2~9T5-9f$NDj5A$NK\BN$G$9!#(B
+%    \begin{macrocode}
 \def\return{\leavevmode\hbox{%
 Q \iftdir\yoko\fi
   \@ascgrp\char"20}}
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index 5f04e22a119..5cdc2337634 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -37,8 +37,9 @@
 %    $B$H$N4V$K(Bxkanjiskip$B$,F~$C$F$7$^$&LdBj$KBP1~!#(B
 %    \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.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
-%     tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B}
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B}
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B}
 % \changes{v1.2d}{2016/04/01}{multicol$B%Q%C%1!<%8$r;H$&$H%H%s%\$N2<C<$,=L$`LdBj$r=$@5(B}
 % \changes{v1.2e}{2016/05/20}{\file{fltrace}$B%Q%C%1!<%8$N(Bp\LaTeX{}$BHG(B
 %    $B$H$7$F(B\file{pfltrace}$B%Q%C%1!<%8$r?7@_(B}
@@ -66,13 +67,14 @@
 %    $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)}
 % \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
 % \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
+% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2017/05/03 v1.2o pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/07/21 v1.2p pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -1474,15 +1476,108 @@
 % \end{macro}
 % \end{macro}
 %
-% \subsection{tabular$B4D6-$J$I(B}
-% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B
-%     tabular$B4D6-!"(B\cs{parbox}$BL?Na!"(B\cs{underline}$BL?Na$K$b9T$C$?(B}
-% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N(B|\xkanjiskip|$BM3Mh$N(B
-% $B%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#(B
+% \subsection{tabular$B4D6-(B}
+% \LaTeX{}$B%+!<%M%k(B(lttab.dtx)$B$NL?Na72$r=$@5$7$^$9!#(B
+%
+% \begin{macro}{\@tabclassz}
+% \LaTeX{}$B%+!<%M%k$O!"%"%i%$%s%a%s%HJ8;z(B|&|$B$N<~0O$KH>3Q6uGr$r=q$$$?$+$I$&$+$K(B
+% $B$+$+$o$i$:M>J,$J%9%Z!<%9$r=PNO$7$J$$$h$&$K!"(B|\ignorespaces|$B$H(B|\unskip|$B$r(B
+% $BH/9T$7$F$$$^$9(B(lttab.dtx)$B!#$7$+$7!"$3$l$@$1$G$O(BJFM$B%0%k!<$,>C$($:$K;D$C$F(B
+% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
+%
+% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
+% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$KM>J,$J(B|\unskip|$B$rH/9T$9$k(B
+% $B$3$H$G!"%;%kMWAG$N<~0O$N(BJFM$B%0%k!=$r>C$7$^$9!#(B
+% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+%    \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
+%<platexrelease>                   {Inhibit JFM glue in tabular cells}%
+%<*plcore|platexrelease>
+\def\@tabclassz{%
+  \ifcase\@lastchclass
+    \@acolampacol
+  \or
+    \@ampacol
+  \or
+  \or
+  \or
+    \@addamp
+  \or
+    \@acolampacol
+  \or
+    \@firstampfalse\@acol
+  \fi
+  \edef\@preamble{%
+    \@preamble{%
+      \ifcase\@chnum
+        \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+      \or
+        \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+      \or
+        \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+      \fi}}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabclassz}
+%<platexrelease>                   {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@tabclassz{%
+%<platexrelease>  \ifcase\@lastchclass
+%<platexrelease>    \@acolampacol
+%<platexrelease>  \or
+%<platexrelease>    \@ampacol
+%<platexrelease>  \or
+%<platexrelease>  \or
+%<platexrelease>  \or
+%<platexrelease>    \@addamp
+%<platexrelease>  \or
+%<platexrelease>    \@acolampacol
+%<platexrelease>  \or
+%<platexrelease>    \@firstampfalse\@acol
+%<platexrelease>  \fi
+%<platexrelease>  \edef\@preamble{%
+%<platexrelease>    \@preamble{%
+%<platexrelease>      \ifcase\@chnum
+%<platexrelease>        \hfil\ignorespaces\@sharp\unskip\hfil
+%<platexrelease>      \or
+%<platexrelease>        \hskip1sp\ignorespaces\@sharp\unskip\hfil
+%<platexrelease>      \or
+%<platexrelease>        \hfil\hskip1sp\ignorespaces\@sharp\unskip
+%<platexrelease>      \fi}}}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@classv}
+% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$9!#(B
+% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv}
+%<platexrelease>                   {Inhibit JFM glue in tabular cells}%
+%<*plcore|platexrelease>
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+\@sharp\unskip\@endpbox}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@classv}
+%<platexrelease>                   {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
+%<platexrelease>\@sharp\@endpbox}}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \section{2013$BG/0J9_$N?7$7$$(Bp\TeX{}$BBP1~(B}
+% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(B2013$BG/0J9_$N(Bp\TeX{}$B$G$O(B
+% |\xkanjiskip|$BM3Mh$N%"%-$,A08e$KF~$C$F$7$^$&$3$H$,$"$j$^$7$?!#(B
+% $B$=$&$7$?L?Na$K%Q%C%A$r$"$F$^$9!#$J$*!"4{$K=P$F$-$?(B|\footnote|$B$NFbItL?Na(B
+% $B!J(B|\@makefnmark|$B!K$K$OF1MM$N%Q%C%A$,$b$&$"$F$F$"$j$^$9!#(B
+%
 % \begin{macro}{\@tabular}
 % tabular$B4D6-$NFbItL?Na$G$9!#$b$H$O(B\file{lttab.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(Btabular$B4D6-$K$b9T$C$?(B}
 %    \begin{macrocode}
-%</plcore>
 %<platexrelease>\plIncludeInRelease{2016/04/17}{\@tabular}
 %<platexrelease>                   {Remove extra \xkanjiskip}%
 %<*plcore|platexrelease>
@@ -1521,6 +1616,7 @@
 %
 % \begin{macro}{\@iiiparbox}
 % |\parbox|$B$NFbItL?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{parbox}$BL?Na$K$b9T$C$?(B}
 %    \begin{macrocode}
 %<platexrelease>\plIncludeInRelease{2016/04/17}{\@iiiparbox}
 %<platexrelease>                   {Remove extra \xkanjiskip}%
@@ -1573,6 +1669,7 @@
 %
 % \begin{macro}{\underline}
 % $B2<@~$r0z$/L?Na$G$9!#$b$H$O(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v1.2c}{2016/02/28}{1.2b$B$HF1MM$N=$@5$r(B\cs{underline}$BL?Na$K$b9T$C$?(B}
 %    \begin{macrocode}
 %<platexrelease>\plIncludeInRelease{2016/04/17}{\underline}
 %<platexrelease>                   {Remove extra \xkanjiskip}%
diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx
index 0ea21fad485..639d28f1e9a 100644
--- a/Master/texmf-dist/source/platex/base/plext.dtx
+++ b/Master/texmf-dist/source/platex/base/plext.dtx
@@ -59,6 +59,7 @@
 % \changes{v1.2g}{2017/05/04}{Make \cs{pbox} Robust}
 % \changes{v1.2g}{2017/05/04}{Use \cs{setlength}, so that
 %           calc extensions apply}
+% \changes{v1.2h}{2017/07/21}{$BI=$H<~0O$H$NB7$(0LCV$r$5$i$K=$@5(B}
 % \fi
 %
 % \iffalse
@@ -67,7 +68,7 @@
 \ProvidesFile{plext.dtx}
 %</driver>
 %<package>\ProvidesPackage{plext}
-   [2017/05/04 v1.2g pLaTeX package file (community edition)]
+   [2017/07/21 v1.2h pLaTeX package file (community edition)]
 %<*driver>
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -318,14 +319,14 @@
 %   \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW!J7S@~$N>l9g$OOBJ8%Y!<%9%i%$%s$N0LCV!K(B
 % \end{itemize}
 % \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B
-%  [TODO] $BL$Dj!*(B
-%^^A \begin{itemize}
-%^^A   \item |[t]|$B;XDj$N$H$-(B\\$BI=AH$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
-%^^A   \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
-%^^A   \item |[b]|$B;XDj$N$H$-(B\\$BI=AH$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
-%^^A \end{itemize}
+% \begin{itemize}
+%   \item |[t]|$B;XDj$N$H$-(B\\$B0l9TL\$N2$J8%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+%   \item |[c]|$B;XDj$N$H$-(B\\$BI=AH$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+%   \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N2$J8%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
+% \end{itemize}
 % \end{itemize}
 % \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B}
+% \changes{v1.2h}{2017/07/21}{$BI=$H<~0O$H$NB7$(0LCV$r$5$i$K=$@5(B}
 %    \begin{macrocode}
 \def\fork@array@option<#1>[#2]{%
 \@rotswfalse
@@ -352,10 +353,18 @@
   \fi\fi
 \else\if #1z\relax\let\box@dir\relax\@rotswtrue
   \if #2t\relax
-     \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}%
+     \def\@begin@alignbox{%
+         \@tempdima=\tbaselineshift
+         \advance\@tempdima-\ybaselineshift
+         \advance\@tempdima\ht\tstrutbox
+         \raise\arraystretch\@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
+         \advance\@tempdima-\dp\tstrutbox
+         \raise\arraystretch\@tempdima\vbox\bgroup\vbox}%
      \def\@end@alignbox{\kern\z@\egroup}%
   \else
      \let\@begin@alignbox\vcenter
@@ -946,7 +955,7 @@
    \fi\fi\fi
 \else\if #1z\relax\@rotswtrue \let\box@dir\relax
    \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}%
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 8a9add2a2b0..2f494586ec1 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -127,7 +127,7 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2017/05/05}
+   {2017/07/29}
 %</plcore|platexrelease>
 %<*plcore>
 \def\ppatch@level{0}