platex (1jul16)

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

5 files changed, 184 insertions, 89 deletions

diff --git a/Master/texmf-dist/source/platex/base/Makefile b/Master/texmf-dist/source/platex/base/Makefile
index 072131cfe91..e7294bfdd2f 100644
--- a/Master/texmf-dist/source/platex/base/Makefile
+++ b/Master/texmf-dist/source/platex/base/Makefile
@@ -1,7 +1,7 @@
 TARGET1 = platex.ltx jarticle.cls pl209.def platexrelease.sty \
 	nidanfloat.sty tascmac.sty
 TARGET2 = platex.pdf platexrelease.pdf pldoc.pdf \
-	nidanfloat.pdf ascmac.pdf
+	nidanfloat.pdf ascmac.pdf exppl2e.pdf
 KANJI = -kanji=jis
 FONTMAP = -f ipaex.map -f ptex-ipaex.map
 
@@ -71,7 +71,7 @@ nidanfloat.sty: $(NIDAN_SRC)
 	rm nidanfloat.log
 
 tascmac.sty: $(ASCMAC_SRC)
-	rm -f $(ASCNAC)
+	rm -f $(ASCMAC)
 	platex $(KANJI) ascmac.ins
 	rm ascmac.log
 
@@ -97,7 +97,7 @@ pldoc.pdf: $(PLDOC_SRC)
 	dvipdfmx $(FONTMAP) pldoc.dvi
 	rm *.aux *.log pldoc.toc pldoc.idx pldoc.ind pldoc.ilg
 	rm pldoc.glo pldoc.gls *.dvi pldoc.tex Xins.ins
-	rm *.cfg pldoc.dic mkpldoc.sh dstcheck.pl
+	rm ltxdoc.cfg pldoc.dic mkpldoc.sh dstcheck.pl
 
 nidanfloat.pdf: $(NIDAN_SRC)
 	platex $(KANJI) nidanfloat.dtx
@@ -111,10 +111,16 @@ ascmac.pdf: $(ASCMAC_SRC)
 	dvipdfmx $(FONTMAP) ascmac.dvi
 	rm ascmac.aux ascmac.log ascmac.toc ascmac.dvi
 
+exppl2e.pdf: exppl2e.sty
+	platex $(KANJI) exppl2e.sty
+	platex $(KANJI) exppl2e.sty
+	dvipdfmx $(FONTMAP) exppl2e.dvi
+	rm exppl2e.aux exppl2e.log exppl2e.dvi
+
 .PHONY: clean
 clean:
 	rm -f $(PLFMT) $(PLCLS) $(PL209) $(PLREL) \
 	$(NIDAN) $(ASCMAC) \
 	platex.pdf platexrelease.pdf pldoc.pdf \
-	nidanfloat.pdf ascmac.pdf \
+	nidanfloat.pdf ascmac.pdf exppl2e.pdf \
 	jltxdoc.cls pldoc.tex Xins.ins
diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx
index 650487e8343..22a6a26d65c 100644
--- a/Master/texmf-dist/source/platex/base/platexrelease.dtx
+++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx
@@ -33,6 +33,7 @@
 % \changes{v1.0c}{2016/04/12}{$B%I%-%e%a%s%H$r99?7(B}
 % \changes{v1.0d}{2016/06/08}{p\LaTeX\ \texttt{!<2016/04/17!>}$BHG$H(B
 %      p\LaTeX\ \texttt{!<2016/05/07!>}$BHG$K7Y9p(B}
+% \changes{v1.0e}{2016/06/30}{p\LaTeX\ \texttt{!<2016/06/10!>}$BHG$K7Y9p(B}
 % \fi
 %
 % \iffalse
@@ -41,7 +42,7 @@
 \ProvidesFile{platexrelease.dtx}
 %</driver>
 %<platexrelease>\ProvidesPackage{platexrelease}
-                [2016/06/08 v1.0d latexrelease support for pLaTeX Kernel]
+                [2016/06/30 v1.0e latexrelease support for pLaTeX Kernel]
 %<*driver>
 \documentclass{jltxdoc}
 \GetFileInfo{platexrelease.dtx}
@@ -305,9 +306,9 @@ of this package available from CTAN}
 % $B%(%_%e%l!<%H$7$h$&$H9M$($F$$$k>l9g$O!"Cm0U$7$F$/$@$5$$!#(B
 % \changes{v1.0d}{2016/06/08}{p\LaTeX\ \texttt{!<2016/04/17!>}$BHG$H(B
 %      p\LaTeX\ \texttt{!<2016/05/07!>}$BHG$K7Y9p(B}
-%
+% \changes{v1.0e}{2016/06/30}{p\LaTeX\ \texttt{!<2016/06/10!>}$BHG$K7Y9p(B}
 %    \begin{macrocode}
-\plIncludeInRelease{2016/06/10}{\PackageWarning}{pLaTeX Info}%
+\plIncludeInRelease{2016/07/01}{\PackageWarning}{pLaTeX Info}%
 \plEndIncludeInRelease
 \plIncludeInRelease{2016/04/17}{\PackageWarning}{pLaTeX Info}%
   \PackageWarningNoLine{platexrelease}{%
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index b0cb34d7e46..19db1ed8592 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -10,7 +10,7 @@
 %
 % \fi
 %
-% \CheckSum{1269}
+% \CheckSum{1292}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -59,13 +59,14 @@
 % \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}
+% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2016/05/20 v1.2e pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2016/06/30 v1.2f pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -763,6 +764,41 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\AtBeginDvi}
+% p\LaTeX{}$B$N=PNO%k!<%A%s$N(B|\@outputpage|$B$G$O!"(B|\shipout|$B$9$k(Bvbox$B$NCf?H$K(B
+% |\yoko|$B$r;XDj$7$F$$$^$9!#$3$N$?$a!"(B|\AtBeginDocument{\AtBeginDvi{}}|$B$H$$$&(B
+% $B%3!<%I$r=q$/$H(B\texttt{Incompatible direction list can't be unboxed.}$B$H$$$&(B
+% $B%(%i!<$,=P$F$7$^$$$^$9!#(B
+%
+% $B$=$3$G!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O!V(B|\shipout|$B$G(B|\yoko|$B$,;XDj$5$l$F$$$k!W(B
+% $B$3$H$r:,5r$H$7$F(B
+% \begin{center}
+% |\@begindvibox|$B$O!J6u$G$J$$8B$j!K>o$K2#AH$G$J$1$l$P$J$i$J$$(B
+% \end{center}
+% $B$H2>Dj$7$^$9!#$3$N2>Dj$K=>$$!"(B|\AtBeginDvi|$B$r:FDj5A$7$^$9!#(B
+% \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}$B$r>o$K2#AH$K(B}
+%    \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2016/07/01}{\AtBeginDvi}
+%<platexrelease>                   {Fix for incompatible direction}%
+%<*plcore|platexrelease>
+\def \AtBeginDvi #1{%
+  \global \setbox \@begindvibox
+    \vbox{\yoko \unvbox \@begindvibox #1}%
+}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\AtBeginDvi}
+%<platexrelease>                   {Fix for incompatible direction}%
+%<platexrelease>\def \AtBeginDvi #1{%
+%<platexrelease>  \global \setbox \@begindvibox
+%<platexrelease>    \vbox{\unvbox \@begindvibox #1}%
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+%    \end{macrocode}
+% \end{macro}
+%
 %
 % \subsection{$B5SCm%^%/%m(B}
 % $B5SCm$rAH$_N)$F$kItJ,$N%^%/%m$r:FDj5A$7$^$9!#(B
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 2d41a75de67..2a511f743d7 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -10,7 +10,7 @@
 %
 % \fi
 %
-% \CheckSum{2029}
+% \CheckSum{2061}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -72,13 +72,15 @@
 % \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B
 %    $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B}
 % \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)}
+% \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B
+%    $B%H%i%V%k$,Aj<!$$$@$?$a!"$$$C$?$s%Q%C%A$r=|5n!#(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plfonts.dtx}[2016/06/19 v1.6d pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2016/06/26 v1.6e pLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plfonts.dtx}
@@ -1640,33 +1642,42 @@
 %    \begin{macrocode}
 %<*pldefs>
 \ProvidesFile{pldefs.ltx}
-      [2016/06/19 v1.6d pLaTeX Kernel (Default settings)] 
+      [2016/06/26 v1.6e pLaTeX Kernel (Default settings)] 
 %</pldefs>
 %    \end{macrocode}
 %
 % \subsection{$B9g@.J8;z(B}
 % \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N%Y!<%9%i%$%s(B
 % $BJd@5NL$,%<%m$G$J$$$H$-$K9g@.J8;z$,$*$+$7$/$J$C$F$$$?$?$a!"BP:v$7$^$9!#(B
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite}
-%<platexrelease>                   {Fix for non-zero baselineshift}%
-%<*pldefs|platexrelease>
-%    \end{macrocode}
+%
 % \begin{macro}{\g@tlastchart@}
 % \TeX\ Live 2015$B$GDI2C$5$l$?(B\cs{lastnodechar}$B$rMxMQ$7$F!"(B
 % $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B\cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B
 % $-1$$B$,JV$j$^$9!#(B
 % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B}
 %    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\g@tlastchart@}
+%<platexrelease>                   {Added \g@tlastchart@}%
+%<*pldefs|platexrelease>
 \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\g@tlastchart@}
+%<platexrelease>                   {Added \g@tlastchart@}%
+%<platexrelease>\let\g@tlastchart@\@undefined
+%<platexrelease>\plEndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
+%
 % \begin{macro}{\pltx@isletter}
 % $BBh0l0z?t$N%^%/%m(B(|#1|)$B$NCV49%F%-%9%H$,!"%+%F%4%j%3!<%I(B11$B$+(B12$B$NJ8;z%H!<%/%s(B1$BJ8;z$G$"$C$?(B
 % $B>l9g$KBhFs0z?t$NFbMF$KE83+$5$l!"$=$&$G$J$$>l9g$OBh;00z?t$NFbMF$KE83+$5$l$^$9!#(B
 % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B}
 % \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)}
 %    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter}
+%<platexrelease>                   {Added \pltx@isletter}%
+%<*pldefs|platexrelease>
 \def\pltx@mark{\pltx@mark@}
 \let\pltx@scanstop\relax
 \long\def\pltx@cond#1\fi{%
@@ -1685,83 +1696,114 @@
     \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
       {\@firstoftwo}{\@secondoftwo}%
   }{\@secondoftwo}}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@isletter}
+%<platexrelease>                   {Added \pltx@isletter}%
+%<platexrelease>\let\pltx@isletter\@undefined
+%<platexrelease>\plEndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
+%
 % \begin{macro}{\@text@composite}
-% \begin{macro}{\@text@composite@x}
+% $B9g@.J8;z$NFbItL?Na$G$9!#(Bv1.6a$B$G8m$C$F(B\LaTeX{}$B$NDj5A$r>e=q$-$7$F$7$^$$$^$7$?(B
+% $B$,!"(Bv1.6c$B$G30$7$^$7$?!#(B
 % \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B
-%    \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B}
-% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B
-%    $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B}
+%    \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$KBP1~$9$k$?$a:FDj5A(B}
+% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N8m$C$?:FDj5A$r:o=|(B(forum:1941)}
 %    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite}
+%<platexrelease>                   {Wrong fix for non-zero baselineshift}%
 %<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
 %<platexrelease>   \expandafter\@text@composite@x
 %<platexrelease>      \csname\string#1-\string#2\endcsname}
-\def\@text@composite@x#1#2{%
-  \ifx#1\relax
-    #2%
-  \else\pltx@isletter{#1}{#1}{%
-    \begingroup
-    \setbox\z@\hbox\bgroup%
-      \ybaselineshift\z@\tbaselineshift\z@
-      #1%
-      \g@tlastchart@\@tempcntb
-      \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
-      \aftergroup\pltx@composite@temp
-    \egroup
-%    \end{macrocode}
-%    \begin{macrocode}
-    \ifnum\@tempcntb<\z@
-      \@tempdima=\iftdir
-          \ifmdir
-            \ifmmode\tbaselineshift\else\ybaselineshift\fi
-          \else
-            \tbaselineshift
-          \fi
-        \else
-          \ybaselineshift
-        \fi
-      \@tempcntb=\@cclvi
-    \else\@tempdima=\z@
-    \fi
-%    \end{macrocode}
-% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B
-% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B\cs{xkanjiskip}$B$,A08e$KF~$k$h$&$K$7$^$9!#(B
-% $BI,MW$J$i!"?t<0%b!<%I$NA08e$K(B\cs{null}$B$rJd$C$F(B\cs{xkanjiskip}$B$NA^F~$rM^@)$7$^$9!#(B
-%    \begin{macrocode}
-    \ifnum\@tempcntb<\@cclvi
-      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
-        \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi
-      \fi\fi
-      \begingroup\mathsurround\z@$%
-        \ifx\textbaselineshiftfactor\@undefined\else
-          \textbaselineshiftfactor\z@\fi
-        \box\z@
-      $\endgroup%
-      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
-        \ifnum\xspcode\@tempcntb<2\hbox{}\fi
-      \fi\fi
-%    \end{macrocode}
-%    \begin{macrocode}
-    \else
-      \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
-      \else\lower\@tempdima\box\z@\fi
-    \fi
-    \endgroup}%
-  \fi
-}
-%</pldefs|platexrelease>
 %<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite}
-%<platexrelease>                   {Fix for non-zero baselineshift}%
-%<platexrelease>\let\g@tlastchart@\@undefined
-%<platexrelease>\let\pltx@isletter\@undefined
+%<platexrelease>                   {Wrong fix for non-zero baselineshift}%
 %<platexrelease>\def\@text@composite#1#2#3#{%
 %<platexrelease>  \begingroup
 %<platexrelease>  \setbox\z@=\hbox\bgroup%
 %<platexrelease>  \ybaselineshift\z@\tbaselineshift\z@
 %<platexrelease>  \expandafter\@text@composite@x
 %<platexrelease>  \csname\string#1-\string#2\endcsname}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite}
+%<platexrelease>                   {Wrong fix for non-zero baselineshift}%
+%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
+%<platexrelease>   \expandafter\@text@composite@x
+%<platexrelease>      \csname\string#1-\string#2\endcsname}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@text@composite@x}
+% $B9g@.J8;z$NFbItL?Na$G$9!#(B|\g@tlastchart@|$B$H(B|\pltx@isletter|$B$r;H$$$^$9!#(B
+% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B
+%    \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B}
+% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B
+%    $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B}
+% \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B
+%    $B%H%i%V%k$,Aj<!$$$@$?$a!"$$$C$?$s%Q%C%A$r=|5n!#(B}
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/07/01}{\@text@composite@x}
+%<platexrelease>                   {Fix for non-zero baselineshift}%
+%<platexrelease>\def\@text@composite@x#1{%
+%<platexrelease>   \ifx#1\relax
+%<platexrelease>      \expandafter\@secondoftwo
+%<platexrelease>   \else
+%<platexrelease>      \expandafter\@firstoftwo
+%<platexrelease>   \fi
+%<platexrelease>   #1}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite@x}
+%<platexrelease>                   {Fix for non-zero baselineshift}%
+%<platexrelease>\def\@text@composite@x#1#2{%
+%<platexrelease>  \ifx#1\relax
+%<platexrelease>    #2%
+%<platexrelease>  \else\pltx@isletter{#1}{#1}{%
+%<platexrelease>    \begingroup
+%<platexrelease>    \setbox\z@\hbox\bgroup%
+%<platexrelease>      \ybaselineshift\z@\tbaselineshift\z@
+%<platexrelease>      #1%
+%<platexrelease>      \g@tlastchart@\@tempcntb
+%<platexrelease>      \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+%<platexrelease>      \aftergroup\pltx@composite@temp
+%<platexrelease>    \egroup
+%<platexrelease>    \ifnum\@tempcntb<\z@
+%<platexrelease>      \@tempdima=\iftdir
+%<platexrelease>          \ifmdir
+%<platexrelease>            \ifmmode\tbaselineshift\else\ybaselineshift\fi
+%<platexrelease>          \else
+%<platexrelease>            \tbaselineshift
+%<platexrelease>          \fi
+%<platexrelease>        \else
+%<platexrelease>          \ybaselineshift
+%<platexrelease>        \fi
+%<platexrelease>      \@tempcntb=\@cclvi
+%<platexrelease>    \else\@tempdima=\z@
+%<platexrelease>    \fi
+%<platexrelease>    \ifnum\@tempcntb<\@cclvi
+%<platexrelease>      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
+%<platexrelease>        \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi
+%<platexrelease>      \fi\fi
+%<platexrelease>      \begingroup\mathsurround\z@$%
+%<platexrelease>        \ifx\textbaselineshiftfactor\@undefined\else
+%<platexrelease>          \textbaselineshiftfactor\z@\fi
+%<platexrelease>        \box\z@
+%<platexrelease>      $\endgroup%
+%<platexrelease>      \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
+%<platexrelease>        \ifnum\xspcode\@tempcntb<2\hbox{}\fi
+%<platexrelease>      \fi\fi
+%<platexrelease>    \else
+%<platexrelease>      \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
+%<platexrelease>      \else\lower\@tempdima\box\z@\fi
+%<platexrelease>    \fi
+%<platexrelease>    \endgroup}%
+%<platexrelease>  \fi
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite@x}
+%<platexrelease>                   {Fix for non-zero baselineshift}%
 %<platexrelease>\def\@text@composite@x#1#2{%
 %<platexrelease>  \ifx#1\relax
 %<platexrelease>    \expandafter\@secondoftwo
@@ -1783,13 +1825,8 @@
 %<platexrelease>    \box\z@
 %<platexrelease>  \endgroup}
 %<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite}
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite@x}
 %<platexrelease>                   {Fix for non-zero baselineshift}%
-%<platexrelease>\let\g@tlastchart@\@undefined
-%<platexrelease>\let\pltx@isletter\@undefined
-%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
-%<platexrelease>   \expandafter\@text@composite@x
-%<platexrelease>      \csname\string#1-\string#2\endcsname}
 %<platexrelease>\def\@text@composite@x#1{%
 %<platexrelease>   \ifx#1\relax
 %<platexrelease>      \expandafter\@secondoftwo
@@ -1801,7 +1838,6 @@
 %<*pldefs>
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \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
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 1dd8c527cc2..0497a16b904 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -10,7 +10,7 @@
 %
 % \fi
 %
-% \CheckSum{189}
+% \CheckSum{196}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -63,12 +63,13 @@
 % \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}
 % \changes{v1.0x}{2016/06/19}{$B%Q%C%A%l%Y%k$r(B\file{plvers.dtx}$B$G@_Dj(B}
+% \changes{v1.0y}{2016/06/27}{platex.cfg$B$NFI$_9~$_$rDI2C(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{plvers.dtx}[2016/06/19 v1.0x pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2016/06/27 v1.0y pLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plvers.dtx}
@@ -132,10 +133,10 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2016/06/10}
+   {2016/07/01}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{0}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
@@ -278,6 +279,21 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% $B5/F0;~$K(Bplatex.cfg$B$,$"$k>l9g!"$=$l$rFI$_9~$`$h$&$K$7$^$9!#(B
+% \changes{v1.0y}{2016/06/27}{platex.cfg$B$NFI$_9~$_$rDI2C(B}
+%    \begin{macrocode}
+%<*plfinal>
+\everyjob\expandafter{%
+  \the\everyjob
+  \IfFileExists{platex.cfg}{%
+    \typeout{*************************^^J%
+             * Loading platex.cfg.^^J%
+             *************************}%
+    \input{platex.cfg}}{}%
+}
+%</plfinal>
+%    \end{macrocode}
+%
 % \LaTeXe{}$B$,Ds6!$9$k(Blatexrelease$B%Q%C%1!<%8$,FI$_9~$^$l$F$$$F!"(B
 % $B$+$D(Bp\LaTeXe{}$B$,Ds6!$9$k(Bplatexrelease$B%Q%C%1!<%8$,FI$_9~$^$l$F$$$J$$(B
 % $B>l9g$O!"7Y9p$r=P$7$^$9!#(B