platex (28jul18)

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

25 files changed, 333 insertions, 224 deletions

diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index b3b29d9ae21..a07dcc657aa 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}
-                [2018/05/20 v1.0v Experimental pLaTeX2e features]
+                [2018/07/28 v1.0w Experimental pLaTeX2e features]
   \PackageWarningNoLine{exppl2e}{%
       This is the unstable, experimental part of pLaTeX2e.\MessageBreak
       This package may contain:\MessageBreak
@@ -124,149 +124,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B}
-%
-% \begin{macro}{\pltx@isletter}
-% \changes{v???}{????/??/??}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{????/??/??}{\pltx@isletter}
-%<platexrelease>                   {Support PD1 encoding}%
-%<*plcore|platexrelease>
-\def\pltx@mark{\pltx@mark@}
-\let\pltx@scanstop\relax
-\long\def\pltx@cond#1\fi{%
-  #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\def\pltx@pdfencA{PD1}
-\def\pltx@composite@chkenc{%
-  \ifx\pltx@pdfencA\f@encoding
-    \expandafter\@firstoftwo
-  \else
-    \expandafter\@secondoftwo
-  \fi}
-\long\def\pltx@isletter#1{%
-  \expandafter\pltx@isletter@i#1\pltx@scanstop}
-\long\def\pltx@isletter@i#1\pltx@scanstop{%
-  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
-    {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
-\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
-  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
-    {\pltx@isletter@iii}{\pltx@isletter@iv}}
-\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
-\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
-  \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
-    \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
-      {\@firstoftwo}{\pltx@composite@chkenc}%
-  }{\pltx@composite@chkenc}}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter}
-%<platexrelease>                   {Added \pltx@isletter}%
-%<platexrelease>\def\pltx@mark{\pltx@mark@}
-%<platexrelease>\let\pltx@scanstop\relax
-%<platexrelease>\long\def\pltx@cond#1\fi{%
-%<platexrelease>  #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-%<platexrelease>\long\def\pltx@isletter#1{%
-%<platexrelease>  \expandafter\pltx@isletter@i#1\pltx@scanstop}
-%<platexrelease>\long\def\pltx@isletter@i#1\pltx@scanstop{%
-%<platexrelease>  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
-%<platexrelease>    {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
-%<platexrelease>\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
-%<platexrelease>  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
-%<platexrelease>    {\pltx@isletter@iii}{\pltx@isletter@iv}}
-%<platexrelease>\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
-%<platexrelease>\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
-%<platexrelease>  \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
-%<platexrelease>    \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
-%<platexrelease>      {\@firstoftwo}{\@secondoftwo}%
-%<platexrelease>  }{\@secondoftwo}}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@text@composite@x}
-% \changes{v???}{????/??/??}{v1.6e$B$G$$$C$?$s%Q%C%A$r=|5n$7$?%3!<%I$r:FF3F~(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{????/??/??}{\@text@composite@x}
-%<platexrelease>                   {Fix for non-zero baselineshift}%
-%<*plcore|platexrelease>
-\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\leavevmode\lower\@tempdima\box\z@\fi
-    \fi
-    \endgroup}%
-  \fi
-}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B}
-%
-% p\LaTeXe{}$B%+!<%M%k(B(2016/09/03)$B$KF3F~$7$?$?$a:o=|!#(B
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \section{$B;YCl(B}
-%
-% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B}
-%
-% p\LaTeXe{}$B%+!<%M%k(B(2016/11/29)$B$KF3F~$7$?$?$a:o=|!#(B
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
 % \section{$B2~9T(B}
 %
 % $B6/@)2~9T(B|\\|$B$H(B|\par|$B$,O"B3$7$?>l9g$N5sF0$K$D$$$F$O0J2<$N$H$*$jJ]N1Cf!#(B
@@ -344,20 +201,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B
-% p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B
-%
-% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B
-% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B
-% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B
+% |\linebreak|$B$N5sF0$N=$@5$O!"%P%0$,Aj<!$$$@$?$a<h$j$d$a$F$$$^$9!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$BAj8_;2>H(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
-%
-% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
+% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$N=$@5$K2C$(!"0J2<$N=$@5$r8!F$Cf$G$9$,!"(B
+% $B8=;~E@$G$OJ]N1$7$F$$$^$9!#(B
 %
 % \begin{macro}{\@setref@}
 % $B$5$i$K!";2>H$7$?7k2L$,!V6u!W$N>l9g(B
@@ -381,59 +232,81 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B}
+% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2016/09/03$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{$B2<@~%^%/%m(B}
+% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2016/11/29$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B}
+% \section{$B;YCl(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/04/08$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{verb$B$NKAF,$N%9%Z!<%9(B}
+% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/04/08$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B}
+% \section{\cs{textunderscore}$B$N%Y!<%9%i%$%sJd@5(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/04/08$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B}
+% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B}
+%
+% 2017/04/08$B$KF3F~:Q$_!#(B
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{\cs{verb}$B$NKAF,$N%9%Z!<%9(B}
 %
-% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/10/28$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/10/28$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{\cs{inhibitglue}$B$N4JN,7A(B}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/10/28$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}}
 %
-% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
+% 2017/10/28$B$KF3F~:Q$_!#(B
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B}
+%
+% 2018/03/09$B$KF3F~:Q$_!#(B
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B}
+%
+% 2018/03/09$B$KF3F~:Q$_!#(B
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B}
+%
+% 2018/07/28$B$KF3F~:Q$_!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls
index ad7dda0cd24..d20bc4f79ce 100644
--- a/Master/texmf-dist/tex/platex/base/jarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/jarticle.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jarticle}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -764,7 +764,7 @@
   \kern2.6\p@}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo
index db8f59405f2..acd70a73140 100644
--- a/Master/texmf-dist/tex/platex/base/jbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk10.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jbk10.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo
index e948cdc37b2..cccc01a445f 100644
--- a/Master/texmf-dist/tex/platex/base/jbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk11.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jbk11.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo
index c3d78b9d9c6..5c17be75076 100644
--- a/Master/texmf-dist/tex/platex/base/jbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk12.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jbk12.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls
index 9d8c8f0a0ab..30d6a50f3f7 100644
--- a/Master/texmf-dist/tex/platex/base/jbook.cls
+++ b/Master/texmf-dist/tex/platex/base/jbook.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jbook}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -867,7 +867,7 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls
index 2979b63fffe..c09e5eddbc9 100644
--- a/Master/texmf-dist/tex/platex/base/jreport.cls
+++ b/Master/texmf-dist/tex/platex/base/jreport.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jreport}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -863,7 +863,7 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo
index 159b590f2e7..c408ff5ae1d 100644
--- a/Master/texmf-dist/tex/platex/base/jsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize10.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jsize10.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo
index b3e8cdb8b43..d1f4e3f32c8 100644
--- a/Master/texmf-dist/tex/platex/base/jsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize11.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jsize11.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo
index 62cb93d187a..e7e845e097e 100644
--- a/Master/texmf-dist/tex/platex/base/jsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize12.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{jsize12.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jt1gt.fd b/Master/texmf-dist/tex/platex/base/jt1gt.fd
index 29bc547fc04..7786551eb1a 100644
--- a/Master/texmf-dist/tex/platex/base/jt1gt.fd
+++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd
@@ -14,7 +14,7 @@
 %% 
 %% File: plfonts.dtx
 \ProvidesFile{jt1gt.fd}
-       [2018/02/04 v1.6l KANJI font defines]
+       [2018/07/03 v1.6q KANJI font defines]
 \DeclareKanjiFamily{JT1}{gt}{}
 \DeclareRelationFont{JT1}{gt}{m}{}{OT1}{cmr}{bx}{}
 \DeclareFontShape{JT1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*tgoth
@@ -22,6 +22,7 @@
     <-> tgoth10
     }{}
 \DeclareFontShape{JT1}{gt}{bx}{n}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT1}{gt}{b}{n}{<->ssub*gt/bx/n}{}
 \endinput
 %%
 %% End of file `jt1gt.fd'.
diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd
index 3fba2724099..881002be513 100644
--- a/Master/texmf-dist/tex/platex/base/jt1mc.fd
+++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd
@@ -14,7 +14,7 @@
 %% 
 %% File: plfonts.dtx
 \ProvidesFile{jt1mc.fd}
-       [2018/02/04 v1.6l KANJI font defines]
+       [2018/07/03 v1.6q KANJI font defines]
 \DeclareKanjiFamily{JT1}{mc}{}
 \DeclareRelationFont{JT1}{mc}{m}{}{OT1}{cmr}{m}{}
 \DeclareRelationFont{JT1}{mc}{bx}{}{OT1}{cmr}{bx}{}
@@ -23,6 +23,7 @@
     <-> tmin10
     }{}
 \DeclareFontShape{JT1}{mc}{bx}{n}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JT1}{mc}{b}{n}{<->ssub*mc/bx/n}{}
 \endinput
 %%
 %% End of file `jt1mc.fd'.
diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd
index 2d6943e5862..1a209828462 100644
--- a/Master/texmf-dist/tex/platex/base/jy1gt.fd
+++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd
@@ -14,7 +14,7 @@
 %% 
 %% File: plfonts.dtx
 \ProvidesFile{jy1gt.fd}
-       [2018/02/04 v1.6l KANJI font defines]
+       [2018/07/03 v1.6q KANJI font defines]
 \DeclareKanjiFamily{JY1}{gt}{}
 \DeclareRelationFont{JY1}{gt}{m}{}{OT1}{cmr}{bx}{}
 \DeclareFontShape{JY1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*goth
@@ -22,6 +22,7 @@
     <-> goth10
     }{}
 \DeclareFontShape{JY1}{gt}{bx}{n}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY1}{gt}{b}{n}{<->ssub*gt/bx/n}{}
 \endinput
 %%
 %% End of file `jy1gt.fd'.
diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd
index 0fd86603a06..00cd00e1b08 100644
--- a/Master/texmf-dist/tex/platex/base/jy1mc.fd
+++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd
@@ -14,7 +14,7 @@
 %% 
 %% File: plfonts.dtx
 \ProvidesFile{jy1mc.fd}
-       [2018/02/04 v1.6l KANJI font defines]
+       [2018/07/03 v1.6q KANJI font defines]
 \DeclareKanjiFamily{JY1}{mc}{}
 \DeclareRelationFont{JY1}{mc}{m}{}{OT1}{cmr}{m}{}
 \DeclareRelationFont{JY1}{mc}{bx}{}{OT1}{cmr}{bx}{}
@@ -23,6 +23,7 @@
     <-> min10
     }{}
 \DeclareFontShape{JY1}{mc}{bx}{n}{<->ssub*gt/m/n}{}
+\DeclareFontShape{JY1}{mc}{b}{n}{<->ssub*mc/bx/n}{}
 \endinput
 %%
 %% End of file `jy1mc.fd'.
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 0dcc1e3ac2c..aac95a71650 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -18,7 +18,7 @@
 \edef\p@known@latexreleaseversion
    {2018-04-01}
 \edef\platexreleaseversion
-   {2018-05-20}
+   {2018-07-28}
 \newif\if@plincludeinrelease
 \@plincludeinreleasefalse
 \def\plIncludeInRelease#1{%
@@ -68,7 +68,7 @@
 %% File: platexrelease.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{platexrelease}
-          [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel
+          [2018/05/22 v1.0m latexrelease support for pLaTeX Kernel
               (including releases up to \platexreleaseversion)]
 \RequirePackageWithOptions{latexrelease}
 \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil
@@ -81,10 +81,12 @@
   \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}%
   \let\requestedplpatchdate\CurrentOption}
 \DeclareOption{latest}{%
-  \let\requestedplpatchdate\platexreleaseversion}
+  \let\requestedplpatchdate\platexreleaseversion
+  \AtEndOfPackage{\def\requestedpLaTeXdate{0}}}
 \DeclareOption{current}{%
-  \let\requestedplpatchdate\pfmtversion}
-\ExecuteOptions{current}
+  \let\requestedplpatchdate\pfmtversion
+  \AtEndOfPackage{\def\requestedpLaTeXdate{0}}}
+\let\requestedplpatchdate\pfmtversion
 \ProcessOptions\relax
 \def\reserved@a{%
 \edef\requestedpLaTeXdate{\the\count@}%
@@ -131,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>
   % * <2018-05-20>
   % * <2018-04-01>+2
   % * <2018-04-01>+1
@@ -401,6 +404,47 @@ of this package available from CTAN}
   \iftdir\raise-\tbaselineshift\fi
   \vbox{\hrule\@width.3em}}
 \plEndIncludeInRelease
+%\plIncludeInRelease{0000/00/00}{\pltx@saved@oalign}
+%    {Special case! (This block is required for any emulation date)}%
+\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+  \ialign{##\crcr#1\crcr}}}
+%\plEndIncludeInRelease
+\plIncludeInRelease{2018/07/28}{\pltx@oalign}
+                   {Fix for non-zero baselineshift}%
+\def\pltx@oalign#1{\ifmmode
+  \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+    \ialign{##\crcr#1\crcr}}%
+\else
+  \iftdir\ybaselineshift\tbaselineshift\fi
+  \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex%
+    \ialign{##\crcr#1\crcr}}}$%
+\fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\pltx@oalign}
+                   {Fix for non-zero baselineshift}%
+\let\pltx@oalign\@undefined
+\plEndIncludeInRelease
+%\plIncludeInRelease{0000/00/00}{\pltx@saved@ltx@sh@ft}
+%    {Special case! (This block is required for any emulation date)}%
+\def\pltx@saved@ltx@sh@ft #1{%
+  \dimen@ #1%
+  \kern \strip@pt
+    \fontdimen1\font \dimen@
+  } % kern by #1 times the current slant
+%\plEndIncludeInRelease
+\plIncludeInRelease{2018/07/28}{\pltx@ltx@sh@ft}
+                   {Fix for non-zero baselineshift}%
+\def\pltx@ltx@sh@ft #1{%
+  \ybaselineshift\z@
+  \dimen@ #1%
+  \kern \strip@pt
+    \fontdimen1\font \dimen@
+  } % kern by #1 times the current slant
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\pltx@ltx@sh@ft}
+                   {Fix for non-zero baselineshift}%
+\let\pltx@ltx@sh@ft\@undefined
+\plEndIncludeInRelease
 \plIncludeInRelease{2016/06/10}{\g@tlastchart@}
                    {Added \g@tlastchart@}%
 \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
@@ -409,6 +453,34 @@ of this package available from CTAN}
                    {Added \g@tlastchart@}%
 \let\g@tlastchart@\@undefined
 \plEndIncludeInRelease
+\plIncludeInRelease{2018/07/28}{\pltx@isletter}
+                   {Support PD1 encoding}%
+\def\pltx@mark{\pltx@mark@}
+\let\pltx@scanstop\relax
+\long\def\pltx@cond#1\fi{%
+  #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\def\pltx@pdfencA{PD1}
+\def\pltx@composite@chkenc{%
+  \ifx\pltx@pdfencA\f@encoding
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi}
+\long\def\pltx@isletter#1{%
+  \expandafter\pltx@isletter@i#1\pltx@scanstop}
+\long\def\pltx@isletter@i#1\pltx@scanstop{%
+  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
+    {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
+\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
+  \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
+    {\pltx@isletter@iii}{\pltx@isletter@iv}}
+\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
+\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
+  \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
+    \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+      {\@firstoftwo}{\pltx@composite@chkenc}%
+  }{\pltx@composite@chkenc}}
+\plEndIncludeInRelease
 \plIncludeInRelease{2016/06/10}{\pltx@isletter}
                    {Added \pltx@isletter}%
 \def\pltx@mark{\pltx@mark@}
@@ -435,13 +507,13 @@ of this package available from CTAN}
 \let\pltx@isletter\@undefined
 \plEndIncludeInRelease
 \plIncludeInRelease{2016/06/10}{\@text@composite}
-                   {Wrong fix for non-zero baselineshift}%
+                   {Fix for non-zero baselineshift (wrong)}%
 \def\@text@composite#1#2#3\@text@composite{%
    \expandafter\@text@composite@x
       \csname\string#1-\string#2\endcsname}
 \plEndIncludeInRelease
 \plIncludeInRelease{2016/04/17}{\@text@composite}
-                   {Wrong fix for non-zero baselineshift}%
+                   {Fix for non-zero baselineshift (wrong)}%
 \def\@text@composite#1#2#3#{%
   \begingroup
   \setbox\z@=\hbox\bgroup%
@@ -450,24 +522,57 @@ of this package available from CTAN}
   \csname\string#1-\string#2\endcsname}
 \plEndIncludeInRelease
 \plIncludeInRelease{0000/00/00}{\@text@composite}
-                   {Wrong fix for non-zero baselineshift}%
+                   {Fix for non-zero baselineshift (wrong)}%
 \def\@text@composite#1#2#3\@text@composite{%
    \expandafter\@text@composite@x
       \csname\string#1-\string#2\endcsname}
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/07/01}{\@text@composite@x}
-                   {Fix for non-zero baselineshift}%
-\def\@text@composite@x#1{%
+%\plIncludeInRelease{0000/00/00}{\pltx@saved@text@composite@x}
+%    {Special case! (This block is required for any emulation date)}%
+\def\pltx@saved@text@composite@x#1{%
    \ifx#1\relax
       \expandafter\@secondoftwo
    \else
       \expandafter\@firstoftwo
    \fi
    #1}
+%\plEndIncludeInRelease
+\plIncludeInRelease{2018/07/28}{\pltx@text@composite@x}
+                   {Fix for non-zero baselineshift}%
+\def\pltx@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
+    \ifnum\@tempcntb<\@cclvi
+      \ifnum\@tempcntb>\m@ne
+        \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi
+      \fi
+      \begingroup\m@th$%
+        \ifx\textbaselineshiftfactor\@undefined\else
+          \textbaselineshiftfactor\z@\fi
+        \box\z@
+      $\endgroup
+      \ifnum\@tempcntb>\m@ne
+        \ifnum\xspcode\@tempcntb<2\null\fi
+      \fi
+    \else
+      {\ybaselineshift\z@\tbaselineshift\z@#1}%
+    \fi
+    \endgroup}%
+  \fi
+}
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/06/10}{\@text@composite@x}
+\plIncludeInRelease{2016/06/10}{\pltx@text@composite@x}
                    {Fix for non-zero baselineshift}%
-\def\@text@composite@x#1#2{%
+\def\pltx@text@composite@x#1#2{%
   \ifx#1\relax
     #2%
   \else\pltx@isletter{#1}{#1}{%
@@ -506,15 +611,15 @@ of this package available from CTAN}
       \fi\fi
     \else
       \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
-      \else\lower\@tempdima\box\z@\fi
+      \else\leavevmode\lower\@tempdima\box\z@\fi
     \fi
     \endgroup}%
   \fi
 }
 \plEndIncludeInRelease
-\plIncludeInRelease{2016/04/17}{\@text@composite@x}
+\plIncludeInRelease{2016/04/17}{\pltx@text@composite@x}
                    {Fix for non-zero baselineshift}%
-\def\@text@composite@x#1#2{%
+\def\pltx@text@composite@x#1#2{%
   \ifx#1\relax
     \expandafter\@secondoftwo
   \else
@@ -535,15 +640,66 @@ of this package available from CTAN}
     \box\z@
   \endgroup}
 \plEndIncludeInRelease
-\plIncludeInRelease{0000/00/00}{\@text@composite@x}
+\plIncludeInRelease{0000/00/00}{\pltx@text@composite@x}
                    {Fix for non-zero baselineshift}%
-\def\@text@composite@x#1{%
-   \ifx#1\relax
-      \expandafter\@secondoftwo
-   \else
-      \expandafter\@firstoftwo
-   \fi
-   #1}
+\let\pltx@text@composite@x\@undefined
+\plEndIncludeInRelease
+%\plIncludeInRelease{0000/00/00}{\@text@composite@x}
+%    {Special case! (This block is required for any emulation date)}%
+\DeclareRobustCommand\fixcompositeaccent{%
+  \let\oalign\pltx@oalign
+  \let\ltx@sh@ft\pltx@ltx@sh@ft
+  \let\@text@composite@x\pltx@text@composite@x
+}
+\DeclareRobustCommand\nofixcompositeaccent{%
+  \let\oalign\pltx@saved@oalign
+  \let\ltx@sh@ft\pltx@saved@ltx@sh@ft
+  \let\@text@composite@x\pltx@saved@text@composite@x
+}
+\nofixcompositeaccent
+%\plEndIncludeInRelease
+\plIncludeInRelease{2018/07/28}{\fixcompositeaccent}
+                   {Fix for non-zero baselineshift}%
+\nofixcompositeaccent % force LaTeX original (conditional default)
+% other commands are actually defined for pLaTeX2e 2018-07-28
+\plEndIncludeInRelease
+\plIncludeInRelease{2016/07/01}{\fixcompositeaccent}
+                   {Fix for non-zero baselineshift}%
+\nofixcompositeaccent % force LaTeX original (always)
+\let\fixcompositeaccent\@undefined
+\let\nofixcompositeaccent\@undefined
+\let\pltx@saved@oalign\@undefined
+\let\pltx@oalign\@undefined
+\let\pltx@saved@ltx@sh@ft\@undefined
+\let\pltx@ltx@sh@ft\@undefined
+\let\pltx@saved@text@composite@x\@undefined
+\let\pltx@text@composite@x\@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{2016/04/17}{\fixcompositeaccent}
+                   {Fix for non-zero baselineshift}%
+\fixcompositeaccent % force pLaTeX definition (always)
+\let\oalign\pltx@saved@oalign % no fix at that time
+\let\ltx@sh@ft\pltx@saved@ltx@sh@ft % no fix at that time
+\let\fixcompositeaccent\@undefined
+\let\nofixcompositeaccent\@undefined
+\let\pltx@saved@oalign\@undefined
+\let\pltx@oalign\@undefined
+\let\pltx@saved@ltx@sh@ft\@undefined
+\let\pltx@ltx@sh@ft\@undefined
+\let\pltx@saved@text@composite@x\@undefined
+\let\pltx@text@composite@x\@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\fixcompositeaccent}
+                   {Fix for non-zero baselineshift}%
+\nofixcompositeaccent % force LaTeX original (always)
+\let\fixcompositeaccent\@undefined
+\let\nofixcompositeaccent\@undefined
+\let\pltx@saved@oalign\@undefined
+\let\pltx@oalign\@undefined
+\let\pltx@saved@ltx@sh@ft\@undefined
+\let\pltx@ltx@sh@ft\@undefined
+\let\pltx@saved@text@composite@x\@undefined
+\let\pltx@text@composite@x\@undefined
 \plEndIncludeInRelease
 \plIncludeInRelease{2017/10/28}{\check@nocorr@}
                    {Italic correction before \textt...}%
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 5da961f7a26..9628bf64596 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -33,7 +33,7 @@
 \fi
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
-   {2018-05-20}
+   {2018-07-28}
 \def\ppatch@level{0}
 \edef\platexBANNER{\noexpand\platexNILa
                    \the\everyjob % LaTeX banner and delayed codes
@@ -738,11 +738,39 @@
          \else\tbaselineshift\fi
          \else\ybaselineshift\fi
   \vbox{\hrule\@width.3em}}
+\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+  \ialign{##\crcr#1\crcr}}}
+\def\pltx@oalign#1{\ifmmode
+  \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex%
+    \ialign{##\crcr#1\crcr}}%
+\else
+  \iftdir\ybaselineshift\tbaselineshift\fi
+  \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex%
+    \ialign{##\crcr#1\crcr}}}$%
+\fi}
+\def\pltx@saved@ltx@sh@ft #1{%
+  \dimen@ #1%
+  \kern \strip@pt
+    \fontdimen1\font \dimen@
+  } % kern by #1 times the current slant
+\def\pltx@ltx@sh@ft #1{%
+  \ybaselineshift\z@
+  \dimen@ #1%
+  \kern \strip@pt
+    \fontdimen1\font \dimen@
+  } % kern by #1 times the current slant
 \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
 \def\pltx@mark{\pltx@mark@}
 \let\pltx@scanstop\relax
 \long\def\pltx@cond#1\fi{%
   #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\def\pltx@pdfencA{PD1}
+\def\pltx@composite@chkenc{%
+  \ifx\pltx@pdfencA\f@encoding
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi}
 \long\def\pltx@isletter#1{%
   \expandafter\pltx@isletter@i#1\pltx@scanstop}
 \long\def\pltx@isletter@i#1\pltx@scanstop{%
@@ -755,8 +783,56 @@
 \long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
   \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
     \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
-      {\@firstoftwo}{\@secondoftwo}%
-  }{\@secondoftwo}}
+      {\@firstoftwo}{\pltx@composite@chkenc}%
+  }{\pltx@composite@chkenc}}
+\def\pltx@saved@text@composite@x#1{%
+   \ifx#1\relax
+      \expandafter\@secondoftwo
+   \else
+      \expandafter\@firstoftwo
+   \fi
+   #1}
+\def\pltx@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
+    \ifnum\@tempcntb<\@cclvi
+      \ifnum\@tempcntb>\m@ne
+        \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi
+      \fi
+      \begingroup\m@th$%
+        \ifx\textbaselineshiftfactor\@undefined\else
+          \textbaselineshiftfactor\z@\fi
+        \box\z@
+      $\endgroup
+      \ifnum\@tempcntb>\m@ne
+        \ifnum\xspcode\@tempcntb<2\null\fi
+      \fi
+    \else
+      {\ybaselineshift\z@\tbaselineshift\z@#1}%
+    \fi
+    \endgroup}%
+  \fi
+}
+\DeclareRobustCommand\fixcompositeaccent{%
+  \let\oalign\pltx@oalign
+  \let\ltx@sh@ft\pltx@ltx@sh@ft
+  \let\@text@composite@x\pltx@text@composite@x
+}
+\DeclareRobustCommand\nofixcompositeaccent{%
+  \let\oalign\pltx@saved@oalign
+  \let\ltx@sh@ft\pltx@saved@ltx@sh@ft
+  \let\@text@composite@x\pltx@saved@text@composite@x
+}
+\nofixcompositeaccent
 %% File: plcore.dtx
 \def\NeedsTeXFormat#1{%
    \def\reserved@a{#1}%
diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls
index 4fa11a3d2c1..5a6a6f2f66d 100644
--- a/Master/texmf-dist/tex/platex/base/tarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/tarticle.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{tarticle}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -768,7 +768,7 @@
   \kern2.6\p@}
 \newcommand\@makefntext[1]{\parindent 1zw
   \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo
index 90bb23e8cad..fcc4e2952c7 100644
--- a/Master/texmf-dist/tex/platex/base/tbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk10.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tbk10.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo
index e6acf9c2fb1..3cf967d12bf 100644
--- a/Master/texmf-dist/tex/platex/base/tbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk11.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tbk11.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo
index ca99d207471..480cbc16e4e 100644
--- a/Master/texmf-dist/tex/platex/base/tbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk12.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tbk12.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls
index 7361af9b65a..365c08943ad 100644
--- a/Master/texmf-dist/tex/platex/base/tbook.cls
+++ b/Master/texmf-dist/tex/platex/base/tbook.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{tbook}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -871,7 +871,7 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1zw
   \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls
index 712bd02dd1d..27422b20fbd 100644
--- a/Master/texmf-dist/tex/platex/base/treport.cls
+++ b/Master/texmf-dist/tex/platex/base/treport.cls
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{treport}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
  Standard pLaTeX class]
 \newcounter{@paper}
 \newif\if@landscape \@landscapefalse
@@ -867,7 +867,7 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1zw
   \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
-\newif\if$B@>Nq(B \$B@>Nq(Bfalse
+\newif\if$B@>Nq(B \$B@>Nq(Btrue
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo
index 986f4a10d9d..64e301fdffb 100644
--- a/Master/texmf-dist/tex/platex/base/tsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize10.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tsize10.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo
index aaea97795be..d3194562c76 100644
--- a/Master/texmf-dist/tex/platex/base/tsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize11.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tsize11.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo
index 33d26eea759..67e8e6e0687 100644
--- a/Master/texmf-dist/tex/platex/base/tsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize12.clo
@@ -15,7 +15,7 @@
 %% File: jclasses.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesFile{tsize12.clo}
-  [2018/02/04 v1.7h
+  [2018/07/03 v1.8
   Standard pLaTeX file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%