platex (7dec17)

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

7 files changed, 39 insertions, 110 deletions

diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty
index 5ee8fa6a08b..c7d11fa8cc2 100644
--- a/Master/texmf-dist/tex/platex/base/ascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/ascmac.sty
@@ -16,7 +16,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ascmac}
-  [2017/07/22 v2.0d
+  [2017/12/06 v2.0e
   ascmac wrapper (community edition)
   ]
 \RequirePackage{tascmac}
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index 19cbf76d981..3365ad72fc3 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/10/26 v1.0q Experimental pLaTeX2e features]
+                [2017/12/06 v1.0r Experimental pLaTeX2e features]
   \PackageWarningNoLine{exppl2e}{%
       This is the unstable, experimental part of pLaTeX2e.\MessageBreak
       This package may contain:\MessageBreak
@@ -393,76 +393,13 @@
 %
 % \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(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}
-%<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
-%    \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \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
-% 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}
-%<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
-%    \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/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx
index 5d486ae53ef..37c4e0d7eb4 100644
--- a/Master/texmf-dist/tex/platex/base/platex.ltx
+++ b/Master/texmf-dist/tex/platex/base/platex.ltx
@@ -16,7 +16,6 @@
 \let\orgdump\dump
 \let\dump\relax
 \input latex.ltx
-\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
 \typeout{**************************^^J%
          *^^J%
          * making pLaTeX format^^J%
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index d59c8287771..3c696a41285 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -25,14 +25,14 @@
 \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
 \def\@plIncludeInRele@se#1#2#3{%
   \toks@{[#1] #3}%
-  \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+  \expandafter\ifx\csname\string#2+\@currname+plIIR\endcsname\relax
     \ifnum\expandafter\@parse@version#1//00\@nil
           >\expandafter\@parse@version\pfmtversion//00\@nil
       \GenericInfo{}{Skipping: \the\toks@}%
      \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
     \else
       \GenericInfo{}{Applying: \the\toks@}%
-      \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+      \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
     \fi
   \else
     \GenericInfo{}{Already applied: \the\toks@}%
@@ -44,7 +44,7 @@
 %% File: platexrelease.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{platexrelease}
-                [2017/09/26 v1.0h latexrelease support for pLaTeX Kernel]
+                [2017/12/06 v1.0i latexrelease support for pLaTeX Kernel]
 \RequirePackageWithOptions{latexrelease}
 \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil
   >\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil
@@ -102,7 +102,7 @@ of this package available from CTAN}
 \let\currentpLaTeXdate\requestedpLaTeXdate
 \plIncludeInRelease{2017/09/26}{\PackageWarning}{pLaTeX Info}%
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/07/29}{\PackageWarning}{pLaTeX Info}%
+\plIncludeInRelease{2017/07/29}{\PackageWarning}{pLaTeX Info}%
   \PackageWarningNoLine{platexrelease}{%
       You selected pLaTeX2e <\pfmtversion>, but\MessageBreak
       this version of pLaTeX2e is known to have\MessageBreak
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index a22cbc9e952..0c5fbf0477b 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -19,21 +19,22 @@
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
    {2017/10/28}
-\def\ppatch@level{2}
+\def\ppatch@level{3}
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
   {\@plIncludeInRelease{#1}[#1]}}
 \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
 \def\@plIncludeInRele@se#1#2#3{%
   \toks@{[#1] #3}%
-  \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+  \expandafter\ifx\csname\string#2+\@currname+plIIR\endcsname\relax
     \ifnum\expandafter\@parse@version#1//00\@nil
           >\expandafter\@parse@version\pfmtversion//00\@nil
       \GenericInfo{}{Skipping: \the\toks@}%
      \expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
     \else
       \GenericInfo{}{Applying: \the\toks@}%
-      \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+      \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
     \fi
   \else
     \GenericInfo{}{Already applied: \the\toks@}%
@@ -45,8 +46,8 @@
 %% File: plfonts.dtx
 \let\k@encoding\@empty
 \let\ck@encoding\@empty
-\def\cy@encoding{JY1}
-\def\ct@encoding{JT1}
+\let\cy@encoding\@empty
+\let\ct@encoding\@empty
 \let\k@family\@empty
 \let\k@series\@empty
 \let\k@shape\@empty
@@ -194,6 +195,7 @@
 \let\default@KT\@empty
 \let\default@KM\@empty
 \@onlypreamble\DeclareKanjiEncodingDefaults
+\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
 \def\DeclareFontFamily#1#2#3{%
  \@ifundefined{T@#1}%
     {\@latex@error{Encoding scheme `#1' unknown}\@eha}%
@@ -417,8 +419,6 @@
     \set@fontsize\baselinestretch\f@size\f@baselineskip
   \fi
   \size@update}
-\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
-\KanjiEncodingPair{JY1}{JT1}
 \def\set@fontsize#1#2#3{%
     \@defaultunits\@tempdimb#2pt\relax\@nnil
     \edef\f@size{\strip@pt\@tempdimb}%
@@ -1118,35 +1118,27 @@
   \def\ppatch@level{0}\fi
 \begingroup
   \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
-  \edef\platexTMP{%
-    \ifnum\ppatch@level=0
-      \everyjob{\noexpand\typeout{%
-        \pfmtname\space<\pfmtversion>\space
-          (based on \expandafter\parse@@BANNER\platexBANNER)}}%
-    \else\ifnum\ppatch@level>0
-      \everyjob{\noexpand\typeout{%
-        \pfmtname\space<\pfmtversion>+\ppatch@level\space
-          (based on \expandafter\parse@@BANNER\platexBANNER)}}%
-    \else
-      \everyjob{\noexpand\typeout{%
-        \pfmtname\space<\pfmtversion>-pre\ppatch@level\space
-          (based on \expandafter\parse@@BANNER\platexBANNER)}}%
-    \fi\fi
-  }
-\expandafter
-\endgroup \platexTMP
+  \toks0=\expandafter\expandafter\expandafter{%
+           \expandafter\parse@@BANNER\platexBANNER}
+  \ifnum\ppatch@level=0
+    \toks2={\pfmtname\space<\pfmtversion>\space}%
+  \else\ifnum\ppatch@level>0
+    \toks2={\pfmtname\space<\pfmtversion>+\ppatch@level\space}%
+  \else
+    \toks2={\pfmtname\space<\pfmtversion>-pre\ppatch@level\space}%
+  \fi\fi
+  \edef\platexBANNER{\the\toks2 (based on \the\toks0)}
+  \global\everyjob\expandafter{%
+    \expandafter\typeout\expandafter{\platexBANNER}}%
+\endgroup
 \begingroup
   \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
-  \edef\platexTMP{%
-    \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
-  }
-  \everyjob=\expandafter{\platexTMP}%
-  \edef\platexTMP{%
-    \noexpand\let\noexpand\platexBANNER=\noexpand\@undefined
-    \noexpand\everyjob={\the\everyjob}%
-  }
-  \expandafter
-\endgroup \platexTMP
+  \toks0=\expandafter\expandafter\expandafter{%
+           \expandafter\parse@@BANNER\platexBANNER}
+  \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+  \global\everyjob\expandafter{\platexBANNER}%
+\endgroup
+\let\platexBANNER=\@undefined
 \ifx\l@nohyphenation \@undefined
   \newlanguage\l@nohyphenation
 \fi
diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx
index dab26d03327..147f0190c5a 100644
--- a/Master/texmf-dist/tex/platex/base/pldefs.ltx
+++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx
@@ -14,13 +14,14 @@
 %% 
 %% File: plfonts.dtx
 \ProvidesFile{pldefs.ltx}
-      [2017/08/05 v1.6h pLaTeX Kernel (Default settings)]
+      [2017/11/06 v1.6j pLaTeX Kernel (Default settings)]
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10}
 \DeclareYokoKanjiEncoding{JY1}{}{}
 \DeclareKanjiSubstitution{JY1}{mc}{m}{n}
 \DeclareTateKanjiEncoding{JT1}{}{}
 \DeclareKanjiSubstitution{JT1}{mc}{m}{n}
+\KanjiEncodingPair{JY1}{JT1}
 \newcommand\mcdefault{mc}
 \newcommand\gtdefault{gt}
 \newcommand\kanjiencodingdefault{JY1}
diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty
index 3fcd103cc9f..317f97565d0 100644
--- a/Master/texmf-dist/tex/platex/base/tascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/tascmac.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tascmac}
-  [2017/07/22 v2.0d
+  [2017/12/06 v2.0e
   ascmac package (community edition)
   ]
 %%
@@ -52,12 +52,12 @@
 %%
 %% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
 \ifascmac@ptex\else
-  \ifdefined\pdfextension
+  \ifx\pdfextension\@undefined
     % LuaTeX (>=0.85)
     \pdfextension mapline{+ascgrp <ascgrp.pfb}
     \pdfextension mapline{+ascii10 <ascii10.pfb}
     \pdfextension mapline{+ascii36 <ascii36.pfb}
-  \else\ifdefined\pdfmapline
+  \else\ifx\pdfmapline\@undefined
     % pdfTeX, LuaTeX (<=0.81)
     \pdfmapline{+ascgrp <ascgrp.pfb}
     \pdfmapline{+ascii10 <ascii10.pfb}