platex (7apr18)

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

19 files changed, 398 insertions, 89 deletions

diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 4b93f85235c..8c00743fec4 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-03-16
+2018-04-07
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf
index 6edfb0d3f7f..0ce852a975a 100644
--- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf
+++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf
diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf
index 028e4108d5a..00c0e6db82f 100644
--- a/Master/texmf-dist/doc/platex/base/platex-en.pdf
+++ b/Master/texmf-dist/doc/platex/base/platex-en.pdf
diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf
index 1c09c427610..b49b3758e92 100644
--- a/Master/texmf-dist/doc/platex/base/platex.pdf
+++ b/Master/texmf-dist/doc/platex/base/platex.pdf
diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf
index 9351a4007f8..158c4488480 100644
--- a/Master/texmf-dist/doc/platex/base/platexrelease.pdf
+++ b/Master/texmf-dist/doc/platex/base/platexrelease.pdf
diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf
index 6964de7ce4b..a1b3aa37611 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/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx
index 1c05126c938..f4dfefe2902 100644
--- a/Master/texmf-dist/source/platex/base/jclasses.dtx
+++ b/Master/texmf-dist/source/platex/base/jclasses.dtx
@@ -2795,13 +2795,13 @@
 %    \begin{macrocode}
 %<*report|book>
 \def\@endpart{\vfil\newpage
-  \if@twoside
-   \if@openleft %% \if@openleft added (2017/02/15)
-    \null\thispagestyle{empty}\newpage
-   \else\if@openright %% \if@openright added (2016/12/18)
-    \null\thispagestyle{empty}\newpage
-   \fi\fi %% added (2016/12/18, 2017/02/15)
-  \fi
+   \if@twoside
+    \if@openleft %% \if@openleft added (2017/02/15)
+     \null\thispagestyle{empty}\newpage
+    \else\if@openright %% \if@openright added (2016/12/18)
+     \null\thispagestyle{empty}\newpage
+    \fi\fi %% added (2016/12/18, 2017/02/15)
+   \fi
 %    \end{macrocode}
 % $BFsCJAHJ8=q$N$H$-!"%9%$%C%A$rFsCJAH%b!<%I$KLa$9I,MW$,$"$j$^$9!#(B
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx
index 994136cbb0d..febb8d0d65b 100644
--- a/Master/texmf-dist/source/platex/base/platex.dtx
+++ b/Master/texmf-dist/source/platex/base/platex.dtx
@@ -77,6 +77,7 @@
 %    \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
 % \changes{v1.0t}{2018/02/07}{ascmac$B%Q%C%1!<%8$rFHN)$5$;$?(B}
 % \changes{v1.0u}{2018/02/18}{nidanfloat$B%Q%C%1!<%8$rFHN)$5$;$?(B}
+% \changes{v1.0v}{2018/04/06}{$B:G?7$N(Bsource2e$B$X$NDI?o(B}
 %\else
 % \changes{v1.0}{1995/05/08}{first edition}
 % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}'
@@ -112,6 +113,7 @@
 %    from \file{plcore.ltx} to \file{platex.ltx}}
 % \changes{v1.0t}{2018/02/07}{Moved ascmac package to separate bundle}
 % \changes{v1.0u}{2018/02/18}{Moved nidanfloat package to separate bundle}
+% \changes{v1.0v}{2018/04/06}{Sync with the latest \file{source2e.tex}}
 %\fi
 % \fi
 %
@@ -119,7 +121,7 @@
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{platex.dtx}[2018/02/18 v1.0u pLaTeX document file]
+\ProvidesFile{platex.dtx}[2018/04/06 v1.0v pLaTeX document file]
 % \iffalse
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -1109,7 +1111,8 @@ all others indicate the places where it is used.}
 \makeatletter
 \def\changes@#1#2#3{%
   \let\protect\@unexpandable@protect
-  \edef\@tempa{\noexpand\glossary{#2\space\currentfile\space#1\levelchar
+  \edef\@tempa{\noexpand\glossary{#2\space
+               \currentfile\space#1\levelchar
                \ifx\saved@macroname\@empty
                   \space\actualchar\generalname
                \else
@@ -1121,6 +1124,31 @@ all others indicate the places where it is used.}
                \fi
                :\levelchar #3}}%
   \@tempa\endgroup\@esphack}
+%    \end{macrocode}
+%\ifJAPANESE
+% $B%3!<%I9T$G$O!">/$7$N(BOverfull$B$r7Y9pL5$7$K5vMF$7$^$9!#(B
+% \changes{v1.0v}{2018/04/06}{$B:G?7$N(Bsource2e$B$X$NDI?o(B}
+%\else
+% Codelines are allowed to run over a bit without
+% showing up as overfull.
+% \changes{v1.0v}{2018/04/06}{Sync with the latest \file{source2e.tex}}
+%\fi
+%    \begin{macrocode}
+\renewcommand*\MacroFont{\fontencoding\encodingdefault
+                   \fontfamily\ttdefault
+                   \fontseries\mddefault
+                   \fontshape\updefault
+                   \small
+                   \hfuzz 6pt\relax}
+%    \end{macrocode}
+%\ifJAPANESE
+% $B>OHV9f$N7e?t$,B?$$>l9g$r9MN8$7!"L\<!$G$N%9%Z!<%9$r>/$7A}$d$7$^$9!#(B
+%\else
+% Section numbers now reach eg 19.12 which need more space.
+%\fi
+%    \begin{macrocode}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.8em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{3.4em}}
 \makeatother
 %    \end{macrocode}
 %\ifJAPANESE
diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx
index 3ed5b4dc385..6b34e3516f1 100644
--- a/Master/texmf-dist/source/platex/base/platexrelease.dtx
+++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx
@@ -24,7 +24,10 @@
 % \changes{v1.0i}{2017/12/06}{$B%?%$%]=$@5(B}
 % \changes{v1.0j}{2018/01/27}{p\LaTeX\ \texttt{!<2017/09/26!>}$BHG$K7Y9p(B}
 % \changes{v1.0k}{2018/01/27}{Add \cs{platexreleaseversion} info
-%      to \cs{ProvidesPackage} output (sync with latexrelease.dtx v1.0i)}
+%      to \cs{ProvidesPackage} output
+%      (sync with latexrelease.dtx 2017/12/17 v1.0i)}
+% \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message
+%      (sync with latexrelease.dtx 2018/02/18 v1.0j)}
 % \fi
 %
 % \iffalse
@@ -34,7 +37,7 @@
 \ProvidesFile{platexrelease.dtx}
 %</driver>
 %<platexrelease>\ProvidesPackage{platexrelease}
-          [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel
+          [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel
               (including releases up to \platexreleaseversion)]
 %<*driver>
 \documentclass{jltxdoc}
@@ -236,7 +239,7 @@
 \ifx\reserved@b\@empty\else
 \PackageError{platexrelease}%
              {Unexpected option \requestedplpatchdate}%
-             {The option must be of the form yyyy/mm/dd}%
+             {The option must be of the form yyyy/mm/dd or yyyy-mm-dd}%
 \fi}
 \afterassignment\reserved@a
 \count@\expandafter
@@ -251,7 +254,7 @@
 %    \begin{macrocode}
 \ifnum\requestedpLaTeXdate=\currentpLaTeXdate
 \PackageWarningNoLine{platexrelease}{%
-  Current format date selected, no patches applied.}
+  Current format date selected, no patches applied}
 \expandafter\endinput
 \fi
 %    \end{macrocode}
@@ -313,6 +316,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-04-01>
   % * <2018/03/09>+1
   % * <2018/03/09>
   % * <2017/10/28>+4
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index dd8137673d7..cf71b1582c5 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -215,8 +215,17 @@
 \ifx\lastnodesubtype\@undefined
   \let\removejfmglue\@undefined
 \else
-  \def\pltx@gluetype{11}
-  \def\pltx@jfmgluesubtype{21}
+  \setbox0\hbox{%
+    \ifdefined\ucs %% upTeX check
+      \jfont\tenmin=upjisr-h at 9.62216pt
+    \else
+      \jfont\tenmin=min10
+    \fi\tenmin
+    \char\jis"214B\null\setbox0\lastbox
+    \global\chardef\pltx@gluetype\lastnodetype
+    \global\chardef\pltx@jfmgluesubtype\lastnodesubtype
+  }
+  \setbox0=\box\voidb@x
   \protected\def\removejfmglue{%
     \ifnum\lastnodetype=\pltx@gluetype\relax
       \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 08d4ac126ff..f4a502ffadc 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -76,13 +76,17 @@
 % \changes{v1.6k}{2017/12/05}{$B%G%U%)%k%H@_Dj%U%!%$%k$NFI$_9~$_$r(B
 %    \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
 % \changes{v1.6l}{2018/02/04}{$BOBJ8%9%1!<%kCM$rL@J82=(B}
+% \changes{v1.6m}{2018/03/31}{\file{utf8.def}$BM3Mh$N%3!<%I$rDI2C(B}
+% \changes{v1.6n}{2018/04/06}{\cs{UseRawInputEncoding}$B$G;H$o$l$k(B
+%    \cs{DeclareFontEncoding@}$B$NJ]B8HG$bDj5A(B
+%    (sync with ltfinal.dtx 2018/04/06 v2.1b)}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plfonts.dtx}[2018/02/04 v1.6l pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2018/04/06 v1.6n pLaTeX New Font Selection Scheme]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plfonts.dtx}
@@ -611,7 +615,20 @@
   \nfss@catcodes
   \expandafter\endgroup
   \DeclareFontEncoding@}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2018/04/01}{\DeclareFontEncoding@}
+%<platexrelease>                   {UTF-8 Encoding}%
+%<*plcore|platexrelease>
+%    \end{macrocode}
 %
+% $B$^$:!"(B\LaTeXe\ 2017-04-15$B0JA0$N>l9g$N%3!<%I$G$9!#$3$N%3!<%I$O!"(B
+% |\UseRawInputEncoding|$B$NFbIt$G$b;H$o$l$^$9!#(B
+% \changes{v1.6n}{2018/04/06}{\cs{UseRawInputEncoding}$B$G;H$o$l$k(B
+%    \cs{DeclareFontEncoding@}$B$NJ]B8HG!J=>Mh$NDj5A!K$r=`Hw(B
+%    (sync with ltfinal.dtx 2018/04/06 v2.1b)}
+%    \begin{macrocode}
+% for compatibility with LaTeX2e 2017-04-15 or earlier.
+% this code is used if MLTeX is enabled
 \def\DeclareFontEncoding@#1#2#3{%
   \expandafter
   \ifx\csname T@#1\endcsname\relax
@@ -620,8 +637,13 @@
                     {\default@family}{\default@series}%
                     {\default@shape}}%
      \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+%    \end{macrocode}
+% $B0J2<$N(B2$B9T$,(Bp\LaTeXe{}$B$K$h$kDI2CItJ,$G$9!#(B
+%    \begin{macrocode}
      \def\enc@elt{\noexpand\enc@elt}%
      \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+%    \end{macrocode}
+%    \begin{macrocode}
   \else
      \@font@info{Redeclaring font encoding #1}%
   \fi
@@ -629,6 +651,77 @@
   \global\@namedef{M@#1}{\default@M#3}%
   \xdef\LastDeclaredEncoding{#1}%
   }
+\let\DeclareFontEncoding@saved\DeclareFontEncoding@
+%    \end{macrocode}
+%
+% $B<!$K!"(B\LaTeXe\ 2018-04-01$B0J9_$N>l9g$N%3!<%I$G$9!#(B
+%    \begin{macrocode}
+\ifx\IeC\@undefined\else
+% for LaTeX2e with UTF-8 input.
+\def\DeclareFontEncoding@#1#2#3{%
+  \expandafter
+  \ifx\csname T@#1\endcsname\relax
+     \def\cdp@elt{\noexpand\cdp@elt}%
+     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+                    {\default@family}{\default@series}%
+                    {\default@shape}}%
+     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+%    \end{macrocode}
+% \LaTeXe\ 2018-04-01$B!JM=Dj!K$G!"4{Dj$NF~NO%(%s%3!<%G%#%s%0$,(B
+% UTF-8$B$K$J$j$^$9!#$3$l$O!"(B\file{latex.ltx}$B$,(B\file{utf8.def}$B!J=>Mh$O(B
+% \LaTeX{}$B%=!<%9$K(B |\usepackage[utf8]{inputenc}| $B$H=q$$$?$H$-$K(B
+% $BFI$_9~$^$l$F$$$?$b$N!K$rFI$_9~$`$3$H$G<B8=$5$l$F$$$^$9!#(B
+% \file{utf8.def}$B$O(B |\DeclareFontEncoding@| $B$r:FDj5A$9$k$N$G!"(B
+% $B$3$l$K9g$o$;$k$?$a$N%3!<%I$rDI2C$7$^$9!#(B
+% \changes{v1.6m}{2018/03/31}{\file{utf8.def}$BM3Mh$N%3!<%I$rDI2C(B}
+%    \begin{macrocode}
+     \begingroup
+       \wlog{Now handling font encoding #1 ...}%
+       \lowercase{%
+         \InputIfFileExists{#1enc.dfu}}%
+            {\wlog{... processing UTF-8 mapping file for font %
+                       encoding #1}}%
+            {\wlog{... no UTF-8 mapping file for font encoding #1}}%
+     \endgroup
+%    \end{macrocode}
+% $B0J2<$N(B2$B9T$,(Bp\LaTeXe{}$B$K$h$kDI2CItJ,$G$9!#(B
+%    \begin{macrocode}
+     \def\enc@elt{\noexpand\enc@elt}%
+     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+%    \end{macrocode}
+%    \begin{macrocode}
+  \else
+     \@font@info{Redeclaring font encoding #1}%
+  \fi
+  \global\@namedef{T@#1}{#2}%
+  \global\@namedef{M@#1}{\default@M#3}%
+  \xdef\LastDeclaredEncoding{#1}%
+  }
+\fi
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@}
+%<platexrelease>                   {UTF-8 Encoding}%
+%<platexrelease>\def\DeclareFontEncoding@#1#2#3{%
+%<platexrelease>  \expandafter
+%<platexrelease>  \ifx\csname T@#1\endcsname\relax
+%<platexrelease>     \def\cdp@elt{\noexpand\cdp@elt}%
+%<platexrelease>     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+%<platexrelease>                    {\default@family}{\default@series}%
+%<platexrelease>                    {\default@shape}}%
+%<platexrelease>     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+%<platexrelease>     \def\enc@elt{\noexpand\enc@elt}%
+%<platexrelease>     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+%<platexrelease>  \else
+%<platexrelease>     \@font@info{Redeclaring font encoding #1}%
+%<platexrelease>  \fi
+%<platexrelease>  \global\@namedef{T@#1}{#2}%
+%<platexrelease>  \global\@namedef{M@#1}{\default@M#3}%
+%<platexrelease>  \xdef\LastDeclaredEncoding{#1}%
+%<platexrelease>  }
+%<platexrelease>\let\DeclareFontEncoding@saved\@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 2550dc18048..d407f35107b 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -55,7 +55,7 @@
 %    (sync with ltfinal 2017/03/09 v2.0t)}
 % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B
 %    (sync with ltfinal 2017/03/09 v2.0t)}
-% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017/04/15!>}$BHGBP1~3NG'(B}
+% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}$BHGBP1~3NG'(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.1e}{2017/11/09}{\file{latexrelease}$B$H(B
 %    \cs{platexrelease}$B$N%(%_%e%l!<%HFbIt=hM}$rJ,N%(B}
@@ -66,12 +66,14 @@
 % \changes{v1.1h}{2018/01/10}{Modify \cs{plIncludeInRelease} code
 %    to check matching \cs{plEndIncluderelease}
 %    (sync with ltvers 2018/01/08 v1.1a)}
+% \changes{v1.1i}{2018/03/31}{\LaTeXe\ 2017-04-15$B0J9_I,?\(B}
+% \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{plvers.dtx}[2018/01/10 v1.1h pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2018/04/07 v1.1j pLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plvers.dtx}
@@ -106,7 +108,8 @@
 % \changes{v1.0s}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}$BHGMQ$K=$@5(B}
 % \changes{v1.0u}{2016/04/17}{\LaTeX\ \texttt{!<2016/03/31!>}$BHGBP1~3NG'(B}
 % \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}$BHGBP1~3NG'(B}
-% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017/04/15!>}$BHGBP1~3NG'(B}
+% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017-04-15!>}$BHGBP1~3NG'(B}
+% \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B}
 %
 % $B$3$N%P!<%8%g%s$N(Bp\LaTeXe{}$B$O!"<!$N%P!<%8%g%s$N(B\LaTeX{}\footnote{%
 % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey,
@@ -120,10 +123,36 @@
 %<latexrelease>\edef\latexreleaseversion
 %<platexrelease>\edef\p@known@latexreleaseversion
 %<*2ekernel|latexrelease|platexrelease>
-   {2017/04/15}
+   {2018-04-01}
 %</2ekernel|latexrelease|platexrelease>
 %    \end{macrocode}
 %
+% $B$^$:!"<!$N%P!<%8%g%s$N(B\LaTeX{}$B$,MxMQ2DG=$J$3$H$r3NG'$7$^$9!#(B
+% \LaTeXe\ 2017-04-15$B$G!"%P!<%8%g%sHV9f!JF|IU!K$N%U%)!<%^%C%H$,(B
+% YYYY/MM/DD$B7A<0$+$i(BYYYY-MM-DD$B$KJQ99$5$l!"$^$?%O%$%U%M!<%7%g%s$K4X78$9$k(B
+% $B%Q%i%a!<%?(B|\document@default@language|$BEy$,F3F~$5$l$F$$$^$9!#(B
+% ^^A \LaTeXe\ 2017/01/01$B0J9_$O(Be-\TeX{}$BI,?\$K$J$C$F$$$^$9!#(B
+% \changes{v1.1i}{2018/03/31}{\LaTeXe\ 2017-04-15$B0J9_I,?\(B}
+%    \begin{macrocode}
+%<*plcore>
+\ifx\fmtversion\@undefined
+    \errhelp{Please reinstall LaTeX.}%
+    \errmessage{This cannot happen!^^JYour file `latex.ltx'
+                might be broken}\@@end
+\else
+  \ifnum\expandafter\@parse@version\fmtversion//00\@nil<20170415
+    \errhelp{Please update your TeX installation; if not available,
+             obtain it^^Jmanually from CTAN
+             (https://ctan.org/pkg/latex-base) or from^^JGitHub
+             (https://github.com/latex3/latex2e).}%
+    \errmessage{This version of pLaTeX2e requires LaTeX2e 2017-04-15
+                or newer!^^JObtain a newer version of `latex',
+                otherwise pLaTeX2e setup will^^Jnever succeed}\@@end
+  \fi
+\fi
+%</plcore>
+%    \end{macrocode}
+%
 % \begin{macro}{\pfmtname}
 % \begin{macro}{\pfmtversion}
 % \begin{macro}{\ppatch@level}
@@ -136,10 +165,10 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2018/03/09}
+   {2018-04-01}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{0}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
@@ -195,17 +224,19 @@
 %
 % \subsection{$B%Q%C%A%U%!%$%k$N%m!<%I(B}
 %
+% $B%3%_%e%K%F%#HG(B\pLaTeXe{}$B$G$O%Q%C%A%U%!%$%k$r;HMQ$7$J$$$N$G!"(B
+% $B%3%a%s%H%"%&%H$7$^$7$?!#(B
+% \changes{v1.0v}{2016/05/07}{$B%Q%C%A%U%!%$%k$r%m!<%I$9$k$N$r$d$a$?!#(B}
+%
+% \iffalse
 % $B<!$NItJ,$O!"(Bp\LaTeXe{}$B$N%Q%C%A%U%!%$%k$r%m!<%I$9$k$?$a$N%3!<%I$G$9!#(B
 % $B%P%0$r=$@5$9$k$?$a$N%Q%C%A$rG[I[$9$k$+$b$7$l$^$;$s!#(B
-%
-% $B%Q%C%A%U%!%$%k$r%m!<%I$9$k%3!<%I$O%3%a%s%H%"%&%H$7$^$7$?!#(B
-% \changes{v1.0v}{2016/05/07}{$B%Q%C%A%U%!%$%k$r%m!<%I$9$k$N$r$d$a$?!#(B}
 %    \begin{macrocode}
 %<*plfinal>
 %\IfFileExists{plpatch.ltx}
-%  {\typeout{************************************^^J%
-%            * Appliying patch file plpatch.ltx *^^J%
-%            ************************************}
+%  {\typeout{***********************************^^J%
+%            * Applying patch file plpatch.ltx *^^J%
+%            ***********************************}
 %  \def\pfmtversion@topatch{unknown}
 %  \input{plpatch.ltx}
 %  \ifx\pfmtversion\pfmtversion@topatch
@@ -234,7 +265,9 @@
 %  \fi
 %  \let\pfmtversion@topatch\relax
 %  }{}
+%</plfinal>
 %    \end{macrocode}
+% \fi
 %
 % \subsection{$B5/F0;~$KI=<($9$k%P%J!<(B}
 %
@@ -250,10 +283,9 @@
 % \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}
 %    \begin{macrocode}
-\ifx\patch@level\@undefined % fallback if undefined in LaTeX
-  \def\patch@level{0}\fi
-\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
-  \def\ppatch@level{0}\fi
+%<*plfinal>
+%\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}
   \toks0=\expandafter\expandafter\expandafter{%
@@ -297,6 +329,7 @@
 % \changes{v1.0z}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B
 %    \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
 %
+% \iffalse
 % \subsection{$B%O%$%U%M!<%7%g%s4XO"(B}
 %
 % \begin{macro}{\l@nohyphenation}
@@ -309,9 +342,9 @@
 %    (sync with ltfinal 2017/03/09 v2.0t)}
 %    \begin{macrocode}
 %<*plfinal>
-\ifx\l@nohyphenation \@undefined
-  \newlanguage\l@nohyphenation
-\fi
+%\ifx\l@nohyphenation \@undefined
+%  \newlanguage\l@nohyphenation
+%\fi
 %    \end{macrocode}
 % \end{macro}
 %
@@ -324,12 +357,13 @@
 % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}$B$NDj5A$rJ]>Z(B
 %    (sync with ltfinal 2017/03/09 v2.0t)}
 %    \begin{macrocode}
-\ifx\document@default@language \@undefined
-  \let\document@default@language\m@ne
-\fi
+%\ifx\document@default@language \@undefined
+%  \let\document@default@language\m@ne
+%\fi
 %</plfinal>
 %    \end{macrocode}
 % \end{macro}
+% \fi
 %
 % \subsection{latexrelease$B%Q%C%1!<%8$X$NBP1~(B}
 %
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index ed4430d05a3..afdc6718398 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/03/12 v1.0t Experimental pLaTeX2e features]
+                [2018/04/06 v1.0u Experimental pLaTeX2e features]
   \PackageWarningNoLine{exppl2e}{%
       This is the unstable, experimental part of pLaTeX2e.\MessageBreak
       This package may contain:\MessageBreak
@@ -359,6 +359,26 @@
 %
 % $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B
 %
+% \begin{macro}{\@setref@}
+% $B$5$i$K!";2>H$7$?7k2L$,!V6u!W$N>l9g(B
+%\begin{verbatim}
+% \documentclass{article}
+% \pagenumbering{gobble}
+% \begin{document}
+% \pageref{a}\label{a}
+% \end{document}
+%\end{verbatim}
+% $B$KAj8_;2>H$,<}B+$7$J$/$J$k$N$rKI$0$?$a!"?eJ?%b!<%I0J30$G$O(B
+% $B$d$O$j(B|\null|$B$rH/9T$7$F$_$^$9!#(B
+%    \begin{macrocode}
+%\def\@setref@{\ifhmode\spacefactor\@m\else\null\fi}
+%    \end{macrocode}
+% \end{macro}
+% $B$3$N%3!<%I$O!"(Bemath$B$N(B|\marusuuref|$B$N$h$&$J(B
+% $B!V(B|\ref|$B$r;H$C$F;2>H@h$NHV9f$@$1$r<hF@$9$k!W(B
+% $B$H$$$&%^%/%m$NF0:n$K!J?bD>%b!<%I$G;H$&>l9g$J$I!K1F6A$9$k$?$a!"(B
+% $B$R$H$^$:%3%a%s%H%"%&%H$7$F$*$-$^$9!#(B
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B}
diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls
index ae4cef59e17..9d8c8f0a0ab 100644
--- a/Master/texmf-dist/tex/platex/base/jbook.cls
+++ b/Master/texmf-dist/tex/platex/base/jbook.cls
@@ -461,13 +461,13 @@
   \Huge\bfseries#1\par}%
   \@endpart}
 \def\@endpart{\vfil\newpage
-  \if@twoside
-   \if@openleft %% \if@openleft added (2017/02/15)
-    \null\thispagestyle{empty}\newpage
-   \else\if@openright %% \if@openright added (2016/12/18)
-    \null\thispagestyle{empty}\newpage
-   \fi\fi %% added (2016/12/18, 2017/02/15)
-  \fi
+   \if@twoside
+    \if@openleft %% \if@openleft added (2017/02/15)
+     \null\thispagestyle{empty}\newpage
+    \else\if@openright %% \if@openright added (2016/12/18)
+     \null\thispagestyle{empty}\newpage
+    \fi\fi %% added (2016/12/18, 2017/02/15)
+   \fi
    \if@tempswa\twocolumn\fi}
 \newcommand{\chapter}{%
   \if@openleft \cleardoublepage \else
diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls
index e6541e5929e..2979b63fffe 100644
--- a/Master/texmf-dist/tex/platex/base/jreport.cls
+++ b/Master/texmf-dist/tex/platex/base/jreport.cls
@@ -461,13 +461,13 @@
   \Huge\bfseries#1\par}%
   \@endpart}
 \def\@endpart{\vfil\newpage
-  \if@twoside
-   \if@openleft %% \if@openleft added (2017/02/15)
-    \null\thispagestyle{empty}\newpage
-   \else\if@openright %% \if@openright added (2016/12/18)
-    \null\thispagestyle{empty}\newpage
-   \fi\fi %% added (2016/12/18, 2017/02/15)
-  \fi
+   \if@twoside
+    \if@openleft %% \if@openleft added (2017/02/15)
+     \null\thispagestyle{empty}\newpage
+    \else\if@openright %% \if@openright added (2016/12/18)
+     \null\thispagestyle{empty}\newpage
+    \fi\fi %% added (2016/12/18, 2017/02/15)
+   \fi
    \if@tempswa\twocolumn\fi}
 \newcommand{\chapter}{%
   \if@openleft \cleardoublepage \else
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 619c40ecb90..f11e6f6a556 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -16,9 +16,9 @@
 %% 
 %% File: plvers.dtx
 \edef\p@known@latexreleaseversion
-   {2017/04/15}
+   {2018-04-01}
 \edef\platexreleaseversion
-   {2018/03/09}
+   {2018-04-01}
 \newif\if@plincludeinrelease
 \@plincludeinreleasefalse
 \def\plIncludeInRelease#1{%
@@ -68,7 +68,7 @@
 %% File: platexrelease.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{platexrelease}
-          [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel
+          [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel
               (including releases up to \platexreleaseversion)]
 \RequirePackageWithOptions{latexrelease}
 \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil
@@ -94,7 +94,7 @@
 \ifx\reserved@b\@empty\else
 \PackageError{platexrelease}%
              {Unexpected option \requestedplpatchdate}%
-             {The option must be of the form yyyy/mm/dd}%
+             {The option must be of the form yyyy/mm/dd or yyyy-mm-dd}%
 \fi}
 \afterassignment\reserved@a
 \count@\expandafter
@@ -103,7 +103,7 @@
    \expandafter\@parse@version\pfmtversion//00\@nil}
 \ifnum\requestedpLaTeXdate=\currentpLaTeXdate
 \PackageWarningNoLine{platexrelease}{%
-  Current format date selected, no patches applied.}
+  Current format date selected, no patches applied}
 \expandafter\endinput
 \fi
 \ifnum\currentpLaTeXdate
@@ -131,6 +131,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-04-01>
   % * <2018/03/09>+1
   % * <2018/03/09>
   % * <2017/10/28>+4
@@ -220,6 +221,75 @@ of this package available from CTAN}
                    {Add \ystrut}%
 \let\ystrut\@undefined
 \plEndIncludeInRelease
+\plIncludeInRelease{2018/04/01}{\DeclareFontEncoding@}
+                   {UTF-8 Encoding}%
+\def\DeclareFontEncoding@#1#2#3{%
+  \expandafter
+  \ifx\csname T@#1\endcsname\relax
+     \def\cdp@elt{\noexpand\cdp@elt}%
+     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+                    {\default@family}{\default@series}%
+                    {\default@shape}}%
+     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+     \def\enc@elt{\noexpand\enc@elt}%
+     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+  \else
+     \@font@info{Redeclaring font encoding #1}%
+  \fi
+  \global\@namedef{T@#1}{#2}%
+  \global\@namedef{M@#1}{\default@M#3}%
+  \xdef\LastDeclaredEncoding{#1}%
+  }
+\let\DeclareFontEncoding@saved\DeclareFontEncoding@
+\ifx\IeC\@undefined\else
+\def\DeclareFontEncoding@#1#2#3{%
+  \expandafter
+  \ifx\csname T@#1\endcsname\relax
+     \def\cdp@elt{\noexpand\cdp@elt}%
+     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+                    {\default@family}{\default@series}%
+                    {\default@shape}}%
+     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+     \begingroup
+       \wlog{Now handling font encoding #1 ...}%
+       \lowercase{%
+         \InputIfFileExists{#1enc.dfu}}%
+            {\wlog{... processing UTF-8 mapping file for font %
+                       encoding #1}}%
+            {\wlog{... no UTF-8 mapping file for font encoding #1}}%
+     \endgroup
+     \def\enc@elt{\noexpand\enc@elt}%
+     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+  \else
+     \@font@info{Redeclaring font encoding #1}%
+  \fi
+  \global\@namedef{T@#1}{#2}%
+  \global\@namedef{M@#1}{\default@M#3}%
+  \xdef\LastDeclaredEncoding{#1}%
+  }
+\fi
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@}
+                   {UTF-8 Encoding}%
+\def\DeclareFontEncoding@#1#2#3{%
+  \expandafter
+  \ifx\csname T@#1\endcsname\relax
+     \def\cdp@elt{\noexpand\cdp@elt}%
+     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+                    {\default@family}{\default@series}%
+                    {\default@shape}}%
+     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+     \def\enc@elt{\noexpand\enc@elt}%
+     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+  \else
+     \@font@info{Redeclaring font encoding #1}%
+  \fi
+  \global\@namedef{T@#1}{#2}%
+  \global\@namedef{M@#1}{\default@M#3}%
+  \xdef\LastDeclaredEncoding{#1}%
+  }
+\let\DeclareFontEncoding@saved\@undefined
+\plEndIncludeInRelease
 \plIncludeInRelease{2017/04/08}{\set@fontsize}
                    {Construct \ystrutbox}%
 \def\set@fontsize#1#2#3{%
@@ -554,8 +624,17 @@ of this package available from CTAN}
 \ifx\lastnodesubtype\@undefined
   \let\removejfmglue\@undefined
 \else
-  \def\pltx@gluetype{11}
-  \def\pltx@jfmgluesubtype{21}
+  \setbox0\hbox{%
+    \ifdefined\ucs %% upTeX check
+      \jfont\tenmin=upjisr-h at 9.62216pt
+    \else
+      \jfont\tenmin=min10
+    \fi\tenmin
+    \char\jis"214B\null\setbox0\lastbox
+    \global\chardef\pltx@gluetype\lastnodetype
+    \global\chardef\pltx@jfmgluesubtype\lastnodesubtype
+  }
+  \setbox0=\box\voidb@x
   \protected\def\removejfmglue{%
     \ifnum\lastnodetype=\pltx@gluetype\relax
       \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 8d723a272a8..b81e7669f1f 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -16,10 +16,25 @@
 %% -------------------------------------------------------------
 %% 
 %% File: plvers.dtx
+\ifx\fmtversion\@undefined
+    \errhelp{Please reinstall LaTeX.}%
+    \errmessage{This cannot happen!^^JYour file `latex.ltx'
+                might be broken}\@@end
+\else
+  \ifnum\expandafter\@parse@version\fmtversion//00\@nil<20170415
+    \errhelp{Please update your TeX installation; if not available,
+             obtain it^^Jmanually from CTAN
+             (https://ctan.org/pkg/latex-base) or from^^JGitHub
+             (https://github.com/latex3/latex2e).}%
+    \errmessage{This version of pLaTeX2e requires LaTeX2e 2017-04-15
+                or newer!^^JObtain a newer version of `latex',
+                otherwise pLaTeX2e setup will^^Jnever succeed}\@@end
+  \fi
+\fi
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
-   {2018/03/09}
-\def\ppatch@level{1}
+   {2018-04-01}
+\def\ppatch@level{0}
 \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
 \newif\if@plincludeinrelease
 \@plincludeinreleasefalse
@@ -143,6 +158,34 @@
   \global\@namedef{M@#1}{\default@M#3}%
   \xdef\LastDeclaredEncoding{#1}%
   }
+\let\DeclareFontEncoding@saved\DeclareFontEncoding@
+\ifx\IeC\@undefined\else
+\def\DeclareFontEncoding@#1#2#3{%
+  \expandafter
+  \ifx\csname T@#1\endcsname\relax
+     \def\cdp@elt{\noexpand\cdp@elt}%
+     \xdef\cdp@list{\cdp@list\cdp@elt{#1}%
+                    {\default@family}{\default@series}%
+                    {\default@shape}}%
+     \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
+     \begingroup
+       \wlog{Now handling font encoding #1 ...}%
+       \lowercase{%
+         \InputIfFileExists{#1enc.dfu}}%
+            {\wlog{... processing UTF-8 mapping file for font %
+                       encoding #1}}%
+            {\wlog{... no UTF-8 mapping file for font encoding #1}}%
+     \endgroup
+     \def\enc@elt{\noexpand\enc@elt}%
+     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
+  \else
+     \@font@info{Redeclaring font encoding #1}%
+  \fi
+  \global\@namedef{T@#1}{#2}%
+  \global\@namedef{M@#1}{\default@M#3}%
+  \xdef\LastDeclaredEncoding{#1}%
+  }
+\fi
 \def\DeclareKanjiEncoding#1{%
   \@latex@warning{%
      The \string\DeclareKanjiEncoding\space is obsoleted command.  Please use
@@ -715,8 +758,17 @@
 \ifx\lastnodesubtype\@undefined
   \let\removejfmglue\@undefined
 \else
-  \def\pltx@gluetype{11}
-  \def\pltx@jfmgluesubtype{21}
+  \setbox0\hbox{%
+    \ifdefined\ucs %% upTeX check
+      \jfont\tenmin=upjisr-h at 9.62216pt
+    \else
+      \jfont\tenmin=min10
+    \fi\tenmin
+    \char\jis"214B\null\setbox0\lastbox
+    \global\chardef\pltx@gluetype\lastnodetype
+    \global\chardef\pltx@jfmgluesubtype\lastnodesubtype
+  }
+  \setbox0=\box\voidb@x
   \protected\def\removejfmglue{%
     \ifnum\lastnodetype=\pltx@gluetype\relax
       \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
@@ -1157,10 +1209,6 @@
   \mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
 \fi
 %% File: plvers.dtx
-\ifx\patch@level\@undefined % fallback if undefined in LaTeX
-  \def\patch@level{0}\fi
-\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}
   \toks0=\expandafter\expandafter\expandafter{%
@@ -1184,12 +1232,6 @@
   \global\everyjob\expandafter{\platexBANNER}%
 \endgroup
 \let\platexBANNER=\@undefined
-\ifx\l@nohyphenation \@undefined
-  \newlanguage\l@nohyphenation
-\fi
-\ifx\document@default@language \@undefined
-  \let\document@default@language\m@ne
-\fi
 \AtBeginDocument{%
   \@ifpackageloaded{latexrelease}{%
     \@ifpackageloaded{platexrelease}{}{%
diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls
index a2555dacbbf..7361af9b65a 100644
--- a/Master/texmf-dist/tex/platex/base/tbook.cls
+++ b/Master/texmf-dist/tex/platex/base/tbook.cls
@@ -465,13 +465,13 @@
   \Huge\bfseries#1\par}%
   \@endpart}
 \def\@endpart{\vfil\newpage
-  \if@twoside
-   \if@openleft %% \if@openleft added (2017/02/15)
-    \null\thispagestyle{empty}\newpage
-   \else\if@openright %% \if@openright added (2016/12/18)
-    \null\thispagestyle{empty}\newpage
-   \fi\fi %% added (2016/12/18, 2017/02/15)
-  \fi
+   \if@twoside
+    \if@openleft %% \if@openleft added (2017/02/15)
+     \null\thispagestyle{empty}\newpage
+    \else\if@openright %% \if@openright added (2016/12/18)
+     \null\thispagestyle{empty}\newpage
+    \fi\fi %% added (2016/12/18, 2017/02/15)
+   \fi
    \if@tempswa\twocolumn\fi}
 \newcommand{\chapter}{%
   \if@openleft \cleardoublepage \else
diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls
index f1d9f0f1a63..712bd02dd1d 100644
--- a/Master/texmf-dist/tex/platex/base/treport.cls
+++ b/Master/texmf-dist/tex/platex/base/treport.cls
@@ -465,13 +465,13 @@
   \Huge\bfseries#1\par}%
   \@endpart}
 \def\@endpart{\vfil\newpage
-  \if@twoside
-   \if@openleft %% \if@openleft added (2017/02/15)
-    \null\thispagestyle{empty}\newpage
-   \else\if@openright %% \if@openright added (2016/12/18)
-    \null\thispagestyle{empty}\newpage
-   \fi\fi %% added (2016/12/18, 2017/02/15)
-  \fi
+   \if@twoside
+    \if@openleft %% \if@openleft added (2017/02/15)
+     \null\thispagestyle{empty}\newpage
+    \else\if@openright %% \if@openright added (2016/12/18)
+     \null\thispagestyle{empty}\newpage
+    \fi\fi %% added (2016/12/18, 2017/02/15)
+   \fi
    \if@tempswa\twocolumn\fi}
 \newcommand{\chapter}{%
   \if@openleft \cleardoublepage \else