platex (3sep18)

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

2 files changed, 47 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index aac95a71650..114f64dd5cf 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -133,6 +133,7 @@ of this package available from CTAN}
       some critical bugs. We advise you to\MessageBreak
       select another format date}
 \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}%
+  % * <2018-07-28>+1
   % * <2018-07-28>
   % * <2018-05-20>
   % * <2018-04-01>+2
@@ -807,7 +808,7 @@ of this package available from CTAN}
 \let\removejfmglue\@undefined
 \plEndIncludeInRelease
 \plIncludeInRelease{2017/10/28}{\@no@lnbk}
-                   {Break before prebreakpenalty}%
+                   {Break before prebreakpenalty (revert)}%
 \def\@no@lnbk #1[#2]{%
   \ifvmode
     \@nolnerr
@@ -822,7 +823,7 @@ of this package available from CTAN}
   \fi}
 \plEndIncludeInRelease
 \plIncludeInRelease{2017/07/29}{\@no@lnbk}
-                   {Break before prebreakpenalty}%
+                   {Break before prebreakpenalty (another)}%
 \def\@no@lnbk #1[#2]{%
   \ifvmode
     \@nolnerr
@@ -854,7 +855,7 @@ of this package available from CTAN}
   \fi}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@no@lnbk}
-                   {Break before prebreakpenalty}%
+                   {LaTeX2e original}%
 \def\@no@lnbk #1[#2]{%
   \ifvmode
     \@nolnerr
@@ -868,7 +869,8 @@ of this package available from CTAN}
     \fi
   \fi}
 \plEndIncludeInRelease
-\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}%
+\plIncludeInRelease{2017/04/08}{\@makecol}
+                   {Take into account depth of footnote}%
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
    \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)
@@ -894,6 +896,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
@@ -906,7 +909,8 @@ of this package available from CTAN}
    \global \maxdepth \@maxdepth
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}%
+\plIncludeInRelease{2016/09/03}{\@makecol}
+                   {Avoid infinite loop}%
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
    \xdef\@freelist{\@freelist\@midlist}%
@@ -916,7 +920,7 @@ of this package available from CTAN}
      \@makespecialcolbox
    \else
      \setbox\@outputbox \vbox to\@colht {%
-%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
+       %\boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
        \@texttop
        \dimen@ \dp\@outputbox
        \unvbox \@outputbox
@@ -936,7 +940,8 @@ of this package available from CTAN}
    \global \maxdepth \@maxdepth
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}%
+\plIncludeInRelease{2016/04/17}{\@makecol}
+                   {Adjust for \dp\@outputbox in tate mode}%
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
    \xdef\@freelist{\@freelist\@midlist}%
@@ -946,7 +951,7 @@ of this package available from CTAN}
      \@makespecialcolbox
    \else
      \setbox\@outputbox \vbox to\@colht {%
-%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
+       %\boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
        \@texttop
        \dimen@ \dp\@outputbox
        \unvbox \@outputbox
@@ -966,7 +971,8 @@ of this package available from CTAN}
    \global \maxdepth \@maxdepth
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{0000/00/00}{\@makecol}{\@makecol}%
+\plIncludeInRelease{0000/00/00}{\@makecol}
+                   {ASCII Corporation original}%
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
    \xdef\@freelist{\@freelist\@midlist}%
@@ -976,7 +982,7 @@ of this package available from CTAN}
      \@makespecialcolbox
    \else
      \setbox\@outputbox \vbox to\@colht {%
-%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
+       %\boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
        \@texttop
        \dimen@ \dp\@outputbox
        \unvbox \@outputbox
@@ -1055,7 +1061,7 @@ of this package available from CTAN}
 }
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\maketombowbox}
-                               {Use \@tombowbleed}%
+                               {ASCII Corporation original}%
 \def\maketombowbox{%
   \setbox\@TL\hbox to\z@{\yoko\hss
       \vrule width13mm height\@tombowwidth depth\z@
@@ -1101,6 +1107,7 @@ of this package available from CTAN}
 }
 \plEndIncludeInRelease
 \plIncludeInRelease{2018/05/20}{\@outputtombow}
+                   {Use \@tombowcolor and \@tombowbleed}%
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax\relax
@@ -1125,7 +1132,8 @@ of this package available from CTAN}
   \fi
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/04/17}{\@outputtombow}{\@outputtombow}%
+\plIncludeInRelease{2016/04/17}{\@outputtombow}
+                   {Safe \boxmaxdepth}%
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-13mm\relax
@@ -1147,7 +1155,8 @@ of this package available from CTAN}
   \fi
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{0000/00/00}{\@outputtombow}{\@outputtombow}%
+\plIncludeInRelease{0000/00/00}{\@outputtombow}
+                   {ASCII Corporation original}%
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-13mm\relax
@@ -1321,7 +1330,7 @@ of this package available from CTAN}
 }
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@outputpage}
-                   {Reset language for hyphenation}%
+                   {ASCII Corporation original}%
 \def\@outputpage{%
 \begingroup % the \endgroup is put in by \aftergroup
   \iftdir
@@ -1397,7 +1406,7 @@ of this package available from CTAN}
 }
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\AtBeginDvi}
-                   {Fix for incompatible direction}%
+                   {LaTeX2e original}%
 \def \AtBeginDvi #1{%
   \global \setbox \@begindvibox
     \vbox{\unvbox \@begindvibox #1}%
@@ -1410,7 +1419,7 @@ of this package available from CTAN}
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@makefnmark}
-                   {Remove extra \xkanjiskip}%
+                   {ASCII Corporation original}%
 \renewcommand\@makefnmark{\hbox{%
   \ifydir \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}}
@@ -1437,7 +1446,7 @@ of this package available from CTAN}
       \@footnotemark}}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\footnote}
-                   {Append \inhibitglue in \footnotemark}%
+                   {LaTeX2e original}%
 \def\footnote{\@ifnextchar[\@xfootnote{\stepcounter\@mpfn
      \protected@xdef\@thefnmark{\thempfn}%
      \@footnotemark\@footnotetext}}
@@ -1456,7 +1465,7 @@ of this package available from CTAN}
      \@footnotetext}}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\footnotetext}
-                   {Preserve penalty before \footnotetext}%
+                   {LaTeX2e original}%
 \def\footnotetext{%
      \@ifnextchar [\@xfootnotenext
        {\protected@xdef\@thefnmark{\thempfn}%
@@ -1507,7 +1516,7 @@ of this package available from CTAN}
     \fi}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@footnotetext}
-                   {Allow break after \footnote}%
+                   {ASCII Corporation original}%
 \long\def\@footnotetext#1{%
   \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
   \insert\footins{\@tempa%
@@ -1525,7 +1534,7 @@ of this package available from CTAN}
     \color@endgroup}}
 \plEndIncludeInRelease
 \plIncludeInRelease{2017/10/28}{\@setref}
-                   {Spacing after \ref in moving arguments}%
+                   {Space factor after \ref}%
 \def\@setref#1#2#3{%
   \ifx#1\relax
     \protect\G@refundefinedtrue
@@ -1551,7 +1560,7 @@ of this package available from CTAN}
 \let\@setref@\@undefined
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@setref}
-                   {Spacing after \ref in moving arguments}%
+                   {ASCII Corporation original}%
 \def\@setref#1#2#3{%
   \ifx#1\relax
     \protect\G@refundefinedtrue
@@ -1586,7 +1595,7 @@ of this package available from CTAN}
 \fi
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\verb}
-                   {Disable hyphenation in verb}%
+                   {ASCII Corporation original}%
 \if@compatibility\else
 \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
   \bgroup
@@ -1609,7 +1618,7 @@ of this package available from CTAN}
      \strut\inhibitglue}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@startline}
-                   {Inhibit JFM glue at the beginning}%
+                   {LaTeX2e original}%
 \gdef\@startline{%
      \ifnum \@nxttabmar >\@hightab
        \@badtab
@@ -1622,7 +1631,7 @@ of this package available from CTAN}
      \strut}
 \plEndIncludeInRelease
 \plIncludeInRelease{2018/03/09}{\@tabclassz}
-                   {Inhibit JFM glue in tabular cells}%
+                   {Inhibit JFM glue in tabular cells (better)}%
 \ifx\removejfmglue\@undefined
 \def\@tabclassz{%
   \ifcase\@lastchclass
@@ -1700,7 +1709,7 @@ of this package available from CTAN}
       \fi}}}
 \plEndIncludeInRelease
 \plIncludeInRelease{2017/07/29}{\@tabclassz}
-                   {Inhibit JFM glue in tabular cells}%
+                   {Inhibit JFM glue in tabular cells (wrong)}%
 \def\@tabclassz{%
   \ifcase\@lastchclass
     \@acolampacol
@@ -1726,7 +1735,7 @@ of this package available from CTAN}
       \fi}}}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@tabclassz}
-                   {Inhibit JFM glue in tabular cells}%
+                   {LaTeX2e original}%
 \def\@tabclassz{%
   \ifcase\@lastchclass
     \@acolampacol
@@ -1752,7 +1761,7 @@ of this package available from CTAN}
       \fi}}}
 \plEndIncludeInRelease
 \plIncludeInRelease{2018/03/09}{\@classv}
-                   {Inhibit JFM glue in tabular cells}%
+                   {Inhibit JFM glue in tabular cells (better)}%
 \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
 \@sharp\unskip\@endpbox}}
 \plEndIncludeInRelease
@@ -1762,7 +1771,7 @@ of this package available from CTAN}
 \@sharp\unskip\@endpbox}}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@classv}
-                   {Inhibit JFM glue in tabular cells}%
+                   {LaTeX2e original}%
 \def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
 \@sharp\@endpbox}}
 \plEndIncludeInRelease
@@ -1786,7 +1795,7 @@ of this package available from CTAN}
    \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@tabular}
-                   {Remove extra \xkanjiskip}%
+                   {LaTeX2e original}%
 \def\@tabular{\leavevmode \hbox \bgroup $\let\@acol\@tabacol
    \let\@classz\@tabclassz
    \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
@@ -1797,7 +1806,7 @@ of this package available from CTAN}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\endtabular}
-                   {Remove extra \xkanjiskip}%
+                   {LaTeX2e original}%
 \def\endtabular{\crcr\egroup\egroup $\egroup}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
 \plEndIncludeInRelease
@@ -1824,7 +1833,7 @@ of this package available from CTAN}
   \@end@tempboxa}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@iiiparbox}
-                   {Remove extra \xkanjiskip}%
+                   {LaTeX2e original}%
 \let\@parboxto\@empty
 \long\def\@iiiparbox#1#2[#3]#4#5{%
   \leavevmode
@@ -1853,7 +1862,7 @@ of this package available from CTAN}
   \else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\underline}
-                   {Remove extra \xkanjiskip}%
+                   {LaTeX2e original}%
 \def\underline#1{%
   \relax
   \ifmmode\@@underline{#1}%
@@ -1895,7 +1904,7 @@ of this package available from CTAN}
 \fi
 \plEndIncludeInRelease
 \plIncludeInRelease{2015/01/01}%
-                   {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+                   {\e@alloc@chardef}{LaTeX2e original}%
 \ifx\widowpenalties\@undefined
   \mathchardef\e@alloc@top=255
   \let\e@alloc@chardef\chardef
@@ -1905,7 +1914,7 @@ of this package available from CTAN}
 \fi
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}%
-                   {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+                   {\e@alloc@chardef}{LaTeX2e original}%
 \let\e@alloc@top\@undefined
 \let\e@alloc@chardef\@undefined
 \plEndIncludeInRelease
@@ -1918,11 +1927,11 @@ of this package available from CTAN}
 \fi
 \plEndIncludeInRelease
 \plIncludeInRelease{2015/01/01}%
-                   {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+                   {\e@mathgroup@top}{LaTeX2e original}%
 \chardef\e@mathgroup@top=16
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}%
-                   {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+                   {\e@mathgroup@top}{LaTeX2e original}%
 \let\e@mathgroup@top\@undefined
 \plEndIncludeInRelease
 \endinput
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 9628bf64596..93ea6b7cc52 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -34,7 +34,7 @@
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
    {2018-07-28}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 \edef\platexBANNER{\noexpand\platexNILa
                    \the\everyjob % LaTeX banner and delayed codes
                    \noexpand\platexNILb}
@@ -927,6 +927,7 @@
      \@makespecialcolbox
    \else
      \setbox\@outputbox \vbox to\@colht {%
+       %\boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
        \@texttop
        \dimen@ \dp\@outputbox
        \unvbox \@outputbox