platex (11may18)

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

5 files changed, 76 insertions, 82 deletions

diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 110429fbba5..1a032d3ba84 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
 
-2018-04-08
+2018-05-11
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf
index 72ec95bdfa6..29bcdc25c4b 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/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 7c2e6cde393..5f64044580f 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -82,13 +82,15 @@
 %    (sync with ltfinal.dtx 2018/04/06 v2.1b)}
 % \changes{v1.6o}{2018/04/08}{Delay full UTF-8 handling to \cs{everyjob}
 %    (sync with ltfinal.dtx 2018/04/08 v2.1d)}
+% \changes{v1.6p}{2018/04/09}{v1.6o$B$G2C$($?BP:v$r:o=|!#(B
+%    $B;29M!'(Bplvers.dtx 2018/04/09 v1.1l$B$N(B\cs{everyjob}}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plfonts.dtx}[2018/04/08 v1.6o pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2018/04/09 v1.6p pLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plfonts.dtx}
@@ -700,20 +702,16 @@
   \xdef\LastDeclaredEncoding{#1}%
   }
 %    \end{macrocode}
-% $B$5$i$K!"(B\LaTeXe\ 2018-04-01 Patch level 2$B$G(B
-% $B!V%3%^%s%I%i%$%s0z?t$K(BUnicode$BJ8;z$,;H$o$l$?>l9g$X$NBP=h!W(B
-% $B$,2C$($i$l$^$7$?$N$G!"$=$l$KDI?o$7$^$9!#(B
+% ^^A pLaTeX2e <2018-04-01>+1$B$G$O0l;~E*$K!"$3$N>l=j$G(B
+% ^^A \LaTeXe\ 2018-04-01 Patch level 2$B$GF3F~$5$l$?(B
+% ^^A $B!V%3%^%s%I%i%$%s0z?t$K(BUnicode$BJ8;z$,;H$o$l$?>l9g$X$NBP=h!W(B
+% ^^A $B$X$NBP:v$r<B9T$7$F$$$^$7$?$,!"(B
+% ^^A pLaTeX2e <2018-04-01>+2$B$r0J$C$F!"(B\file{plvers.dtx}$BB&$,(B
+% ^^A $BBP1~40N;$7$?$?$a:o=|$7$^$7$?!#(B
 % \changes{v1.6o}{2018/04/08}{Delay full UTF-8 handling to \cs{everyjob}
 %    (sync with ltfinal.dtx 2018/04/08 v2.1d)}
-%    \begin{macrocode}
-%<plcore>\ifx\UTFviii@two@octets@@\@undefined\else
-%<plcore>  \everyjob\expandafter{\the\everyjob
-%<plcore>    \let\UTFviii@two@octets\UTFviii@two@octets@@
-%<plcore>    \let\UTFviii@three@octets\UTFviii@three@octets@@
-%<plcore>    \let\UTFviii@four@octets\UTFviii@four@octets@@
-%<plcore>  }
-%<plcore>\fi
-%    \end{macrocode}
+% \changes{v1.6p}{2018/04/09}{v1.6o$B$G2C$($?BP:v$r:o=|!#(B
+%    $B;29M!'(Bplvers.dtx 2018/04/09 v1.1l$B$N(B\cs{everyjob}}
 %    \begin{macrocode}
 \fi
 %</plcore|platexrelease>
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 1b24ce7f421..291bb1487a9 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -70,12 +70,14 @@
 % \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B}
 % \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B
 %    $B:G=i(B(plcore)$B$KAa$a$?(B}
+% \changes{v1.1l}{2018/04/09}{$B%P%J!<$NJ]B8$7$+$?$r2~NI(B}
+% \changes{v1.1l}{2018/04/09}{$B%P%J!<$N:F9=C[$N$7$+$?$r2~NI(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{plvers.dtx}[2018/04/08 v1.1k pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2018/04/09 v1.1l pLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plvers.dtx}
@@ -170,7 +172,7 @@
    {2018-04-01}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{2}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
@@ -181,46 +183,23 @@
 % $B$3$N%U%!%$%k$ND>A0$G(B\LaTeXe{}$B$N(B\file{latex.ltx}$B$,FI$_9~$^$l$F$$$k$O$:(B
 % $B$J$N$G!"$=$N5/F0;~$N%P%J!<$rJ]B8$7$^$9!#(B
 %
-% 2016/05/07$B$N<BAu$G$O!"(B\file{platex.ltx}$B$N$J$+$G(B
-%\begin{verbatim}
-% \edef\platexBANNER{\the\everyjob}
-%\end{verbatim}
-% $B$H$7$F%P%J!<$rJ]B8$7!"$3$NFbMF$,(B
+% \LaTeXe\ 2018-04-01 patch level 1$B$^$G$O!"(B|\everyjob|$B$,(B
 %\begin{verbatim}
 %   \typeout{LaTeX2e version}\typeout{Babel version}
 %\end{verbatim}
-% $B$H$$$&(B4$B$D$N%H!<%/%s$+$i@.$k$H2>Dj$7$F!"(B\file{plcore.ltx}$B$N$J$+$G(B
-%\begin{verbatim}
-%   \def\parse@@BANNER#1#2#3#4{#2}
-%\end{verbatim}
-% $B$N$h$&$K%Q!<%9$7$F$$$^$7$?!#$H$3$m$,!"$3$N!V(B4$B$D$N%H!<%/%s$+$i@.$k!W$H(B
-% $B$$$&2>Dj$O(BBabel$BM3Mh$N(B\file{hyphen.cfg}$B$r;HMQ$7$?>l9g$N$_@.$jN)$A!"(B
-% $B$=$l0J30$NFCJL$J(B\file{hyphen.cfg}$B$d(B\file{hyphen.ltx}$B$r;HMQ$7$?>l9g$K(B
-% $B%(%i!<$K$J$C$F$7$^$$$^$9!#(B
-% $B$=$3$G!"?7$?$K(B2016/09/14$B$N<BAu$G$O!"(B\file{platex.ltx}$B$N$J$+$G(B
-%\begin{verbatim}
-% \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}
-%\end{verbatim}
-% $B$H$7$F%@%_!<$rDI2C$7$^$9!J(B|\relax|$B$O$?$@$N6h@Z$j%H!<%/%s$NLr3d!K!#(B
-% $B$3$&$9$k$H!"(B|\platexBANNER|$B$NFbMF$O!"(BBabel$B$N(B\file{hyphen.cfg}$B$N$H$-(B
-%\begin{verbatim}
-%   \typeout{LaTeX2e version}\typeout{Babel version}\typeout{}\relax
-%\end{verbatim}
-% $B$H$J$j!"$=$l0J30$N$H$-(B
-%\begin{verbatim}
-%   \typeout{LaTeX2e version}\typeout{}\relax
-%\end{verbatim}
-% $B$H$J$k$O$:$G$9!#$3$N$h$&$K!">/$J$/$H$b(B|\typeout|$B$,(B2$B2s4^$^$l$F$$$^$9(B
-% $B$N$G!"(B\file{plcore.ltx}$B$N$J$+$G(B
-%\begin{verbatim}
-%   \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
-%\end{verbatim}
-% $B$H%Q!<%9$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
+% $B$@$1$G$7$?$,!"(B\LaTeXe\ 2018-04-01 patch level 2$B$G?7$?$J%H!<%/%sNs$,(B
+% $BDI2C$5$l$^$7$?!#:#8e$b(B\LaTeXe{}$BB&$G(B|\everyjob|$B$K<B9T$rCY$i$;$k(B
+% $B%3!<%I$,DI2C$5$l$k2DG=@-$,$"$j$^$9$N$G!"$=$N%3!<%I$rCj=P$7$J$1$l$P(B
+% $B$J$j$^$;$s!#$=$3$G!":G=i$H:G8e$K6h@Z$j%H!<%/%s!J$=$l$>$l(B|\platexNILa|$B$H(B
+% |\platexNILb|$B!K$rIU$1$F$*$-$^$9!#(B
 % \changes{v1.1f}{2017/11/11}{\LaTeX{}$B$N%P%J!<$rJ]B8$9$k%3!<%I$r(B
 %    \file{platex.ltx}$B$+$i(B\file{plcore.ltx}$B$X0\F0(B}
+% \changes{v1.1l}{2018/04/09}{$B%P%J!<$NJ]B8$7$+$?$r2~NI(B}
 %    \begin{macrocode}
 %<*plcore>
-\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
+\edef\platexBANNER{\noexpand\platexNILa
+                   \the\everyjob % LaTeX banner and delayed codes
+                   \noexpand\platexNILb}
 %</plcore>
 %    \end{macrocode}
 %
@@ -271,27 +250,42 @@
 %    \end{macrocode}
 % \fi
 %
-% \subsection{$B5/F0;~$KI=<($9$k%P%J!<(B}
+% \subsection{$B5/F0;~$K<B9T$9$k%3!<%I(B}
 %
 % \begin{macro}{\everyjob}
-% p\LaTeXe{}$B$,5/F0$5$l$?$H$-$KI=<($5$l$kJ8;zNs$G$9!#(B
-% \LaTeXe{}$B$N%P!<%8%g%s$bJ;$;$FI=<($7$^$9!#(B
+% p\LaTeXe{}$B$,5/F0$5$l$?$H$-$K<B9T$5$l$k%3!<%I$G$9!#(B
+% \LaTeXe{}$B$N<B9T%3!<%I$r85$K!"(B\pLaTeXe{}$BMQ$ND4@0$r2C$($^$9!#(B
+% \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B}
+% \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B
+%    $B:G=i(B(plcore)$B$KAa$a$?(B}
+% \changes{v1.1l}{2018/04/09}{$B%P%J!<$N:F9=C[$N$7$+$?$r2~NI(B}
+%
+% $B$^$:!"(B\LaTeXe{}$B$N%P!<%8%g%sI=<(!J(B|\typeout{LaTeX2e version}|$B!K$h$j(B
+% $BA0$K<B9T$5$l$k%3!<%I$,$"$l$P!"$=$l$rCj=P$7$F(B|\everyjob|$B$KF~$l$^$9!#(B
+% \LaTeXe\ 2018-04-01 patch level 2$B$N;~E@$G$O6u$G$9!#(B
+%    \begin{macrocode}
+%<*plcore>
+\begingroup
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#1}
+  \toks0=\expandafter\expandafter\expandafter{%
+           \expandafter\parse@@BANNER\platexBANNER}
+  \global\everyjob\expandafter{\the\toks0}%
+\endgroup
+%    \end{macrocode}
 %
+% $B<!$K!"(B\LaTeXe{}$B$N%P!<%8%g%s$rI=<($9$k%3!<%I$rCj=P$7!"(B
+% \pLaTeXe{}$B$N%P!<%8%g%s$H$^$H$a$FI=<($9$k$h$&$K@07A$7$^$9!#(B
 % \changes{v1.0v}{2016/05/07}{$B5/F0;~$NJ8;zNs$r:G?7$N(B\LaTeX{}$B$K9g$o$;$?!#(B}
 % \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}
 % \changes{v1.1g}{2017/12/04}{\pLaTeX{}$B$N%P%J!<$NDj5A;~$K(B
 %    \cs{pfmtname}, \cs{pfmtversion}, \cs{ppatch@level}$B$rE83+$7$J$$$h$&$K(B}
-% \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B
-%    $B:G=i(B(plcore)$B$KAa$a$?(B}
 %    \begin{macrocode}
-%<*plcore>
 %\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
 %  \def\ppatch@level{0}\fi
 \begingroup
-  \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#2}
   \toks0=\expandafter\expandafter\expandafter{%
            \expandafter\parse@@BANNER\platexBANNER}
   \ifnum\ppatch@level=0
@@ -301,25 +295,26 @@
   \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}}%
+  \edef\platexBANNER{\the\everyjob
+    \noexpand\typeout{\the\toks2 (based on \the\toks0)}}
+  \global\everyjob\expandafter{\platexBANNER}%
 \endgroup
 %    \end{macrocode}
 %
-% p\LaTeX{}$B$O!"FH<+$N%O%$%U%M!<%7%g%s!&%Q%?!<%s$rDj5A$7$F$$$^$;$s!#(B
-% \TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$O!"Be$o$j$K(B\LaTeX{}$B$,FI$_9~$s$G$$$k(B
-% Babel$B%Q%C%1!<%8$N$b$N$,E,MQ$5$l$k$O$:$G$9$+$i!"5/F0;~$NJ8;zNs$K$b(B
-% \file{hyphen.cfg}$B$N%P!<%8%g%s$rH?1G$7$^$9!J(BBabel$B%Q%C%1!<%8$N(B
-% \file{hyphen.cfg}$B$G$J$$>l9g$O!"2?$bI=<($5$l$:6u9T$K$J$k$O$:$G$9!K!#(B
+% \LaTeXe{}$B$N%P!<%8%g%sI=<($N8e$K;D$C$F$$$k%3!<%I$r!"(B
+% $B$=$N$^$^(B|\everyjob|$B$KDI2C$7$^$9!#(B
+% $B$3$NCf$K$O!"(B|\typeout{Babel version}|$B$b4^$^$l$k(B
+% $B$O$:$G$9!J(Bp\LaTeX{}$B$OFH<+$N%O%$%U%M!<%7%g%s!&%Q%?!<%s$rDj5A$7$F(B
+% $B$$$J$$$N$G!"(B\TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$OBe$o$j$K(B\LaTeX{}$B$,(B
+% $BFI$_9~$s$G$$$k(BBabel$B%Q%C%1!<%8$N(B\file{hyphen.cfg}$B$,E,MQ$5$l$k$?$a!K!#(B
 % \changes{v1.0w}{2016/05/12}{$B5/F0;~$NJ8;zNs$KF~$l$k(BBabel$B$N%P!<%8%g%s$r(B
 %    $B85$N(B\LaTeX{}$B$N%P%J!<$+$i<hF@$9$k%3!<%I$r(B\file{platex.ini}$B$+$i<h$jF~$l$?(B}
 %    \begin{macrocode}
 \begingroup
-  \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#3}
   \toks0=\expandafter\expandafter\expandafter{%
            \expandafter\parse@@BANNER\platexBANNER}
-  \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+  \edef\platexBANNER{\the\everyjob \the\toks0}
   \global\everyjob\expandafter{\platexBANNER}%
 \endgroup
 \let\platexBANNER=\@undefined
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 5725e1c5cf4..5d4fc36f743 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -34,10 +34,18 @@
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
    {2018-04-01}
-\def\ppatch@level{1}
-\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
+\def\ppatch@level{2}
+\edef\platexBANNER{\noexpand\platexNILa
+                   \the\everyjob % LaTeX banner and delayed codes
+                   \noexpand\platexNILb}
 \begingroup
-  \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#1}
+  \toks0=\expandafter\expandafter\expandafter{%
+           \expandafter\parse@@BANNER\platexBANNER}
+  \global\everyjob\expandafter{\the\toks0}%
+\endgroup
+\begingroup
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#2}
   \toks0=\expandafter\expandafter\expandafter{%
            \expandafter\parse@@BANNER\platexBANNER}
   \ifnum\ppatch@level=0
@@ -47,15 +55,15 @@
   \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}}%
+  \edef\platexBANNER{\the\everyjob
+    \noexpand\typeout{\the\toks2 (based on \the\toks0)}}
+  \global\everyjob\expandafter{\platexBANNER}%
 \endgroup
 \begingroup
-  \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
+  \def\parse@@BANNER\platexNILa#1\typeout#2#3\platexNILb{#3}
   \toks0=\expandafter\expandafter\expandafter{%
            \expandafter\parse@@BANNER\platexBANNER}
-  \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+  \edef\platexBANNER{\the\everyjob \the\toks0}
   \global\everyjob\expandafter{\platexBANNER}%
 \endgroup
 \let\platexBANNER=\@undefined
@@ -208,13 +216,6 @@
   \global\@namedef{M@#1}{\default@M#3}%
   \xdef\LastDeclaredEncoding{#1}%
   }
-\ifx\UTFviii@two@octets@@\@undefined\else
-  \everyjob\expandafter{\the\everyjob
-    \let\UTFviii@two@octets\UTFviii@two@octets@@
-    \let\UTFviii@three@octets\UTFviii@three@octets@@
-    \let\UTFviii@four@octets\UTFviii@four@octets@@
-  }
-\fi
 \fi
 \def\DeclareKanjiEncoding#1{%
   \@latex@warning{%