platex (5may17)

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

14 files changed, 329 insertions, 828 deletions

diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 10bfb50ee84..90255d7b828 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
 
-2017-04-15
+2017-05-05
 
 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 a52120809de..c8a14a05149 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/nidanfloat.pdf b/Master/texmf-dist/doc/platex/base/nidanfloat.pdf
index 790f6f946f2..c25d9fda39f 100644
--- a/Master/texmf-dist/doc/platex/base/nidanfloat.pdf
+++ b/Master/texmf-dist/doc/platex/base/nidanfloat.pdf
diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf
index c813d564a76..47d7452c06c 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/nidanfloat.dtx b/Master/texmf-dist/source/platex/base/nidanfloat.dtx
index 9ed2c035681..87546cfca9b 100644
--- a/Master/texmf-dist/source/platex/base/nidanfloat.dtx
+++ b/Master/texmf-dist/source/platex/base/nidanfloat.dtx
@@ -3,7 +3,7 @@
 %
 %  Copyright 1994 ASCII Co.
 %  Copyright (c) 2010 ASCII MEDIA WORKS
-%  Copyright (c) 2016 Japanese TeX Development Community
+%  Copyright (c) 2016-2017 Japanese TeX Development Community
 %
 %  This file is part of the pLaTeX2e system (community edition).
 %  -------------------------------------------------------------
@@ -27,6 +27,13 @@
 % \changes{v2.6}{2003/05/15}{\cs{@fstype}$B$r(B\cs{@fstyle}$B$H%?%$%W%_%9$7$F$$$?(B
 %    $B$N$r=$@5!J$"$j$,$H$&!"@n>e!w9R6u1'Ch8&5f=j$5$s!K(B}
 % \changes{v2.7}{2005/12/09}{$BI,?\%U%)!<%^%C%H%U%!%$%k$r(BpLaTeX2e$B$+$i(BLaTeX2e$B$XJQ99(B}
+% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B}
+% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B
+%    \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B}
+% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B}
+% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B}
+% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B
+%    $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B}
 % \fi
 %
 % \iffalse
@@ -35,7 +42,7 @@
 \ProvidesFile{nidanfloat.dtx}
 %</driver>
 %<core>\ProvidesPackage{nidanfloat}%
-  [2005/12/09 v2.7 Put double-floats at top/bottom within twocolumn mode]
+  [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode]
 %
 %<*driver>
 \documentclass{jltxdoc}
@@ -431,7 +438,7 @@
             \global\advance\@colroom-\dp\z@
           \fi
 %    \end{macrocode}
-% $B:G8e$K!"(B|@inert|$B%U%i%0$r??$K$9$k!#(B
+% $B:G8e$K!"(B|@insert|$B%U%i%0$r??$K$9$k!#(B
 %    \begin{macrocode}
           \@inserttrue
         \fi
@@ -685,9 +692,18 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\@rightfixht}
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B
+% |\@rightfixht|$B$O!"1&%+%i%`$N9b$5$r3JG<$9$k$N$KMQ$$$k!#(B
+% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B}
+%    \begin{macrocode}
+\global\newdimen\@rightfixht
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@combinefloats}
 % \changes{v2.4}{2001/07/23}{\cs{boxmaxdepth}$B$r(B\cs{maxdepth}$B$K$7$J$$$h$&$K$7$?(B}
-% |@combinefloats|$B$O!"%+%i%`C10L$G!"%F%-%9%H$H%U%m!<%H$r%^!<%8$9$k!#(B
+% |\@combinefloats|$B$O!"%+%i%`C10L$G!"%F%-%9%H$H%U%m!<%H$r%^!<%8$9$k!#(B
 % $B$3$N%^%/%m$O1&%+%i%`$N$H$-$K<B9T$9$k!#(B
 %    \begin{macrocode}
 \def\@combinefloats{%
@@ -725,15 +741,17 @@
 % $B$^$?!"%\%C%/%9#0$NFbMF$r:8%+%i%`$KLa$9!#(B
 % \changes{v2.4}{2001/02/19}{$B9T4V$,B7$o$J$$ItJ,$r=$@5(B}
 % \changes{v2.4}{2001/02/19}{$BCl$,=P$J$$$N$r=$@5(B}
+% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B
+%    \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B}
 %    \begin{macrocode}
         \advance\@fixht-\maxdepth
         \@tempdima\baselineskip \advance\@tempdima-\topskip
-        \setbox\@outputbox=\vbox to\@fixht{%
+        \setbox\@outputbox=\vbox{%
             \ifvoid\@leftcolumn
             \else
               \unvbox\@leftcolumn\vskip\@tempdima
             \fi\relax
-            \unvbox\@outputbox\vss}%
+            \unvbox\@outputbox}% \vss moved from here
 %    \end{macrocode}
 % \changes{v2.5}{2001/09/14}{\cs{vsplit}$B;~!"(Binfinite$B%(%i!<$K$J$k$N$r=$@5(B}
 % |\@leftcolumn|$B$r:n@.$9$k$H$-$KMQ$$$F$$$?(B|\vss|$B$,(B
@@ -741,14 +759,45 @@
 % ! Infinite glue shrinkage found in box being split.
 %\end{verbatim}
 % $B$N%(%i!<$r5/$3$9$3$H$,$"$k$N$G:o=|$7$?!#(B
+%
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$k=$@5(B}$B!'(B
+% $B$3$N>l=j$N$9$0>e$K$"$k%3!<%I$N(B|\unvbox\@outputbox|$B$ND>8e$K$"$C$?(B|vss|$B$r(B
+% $B$3$A$i$K;}$C$F$-$^$7$?!#(B
+% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B}
 %    \begin{macrocode}
-        \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@}%
+        \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01)
       \fi
 %    \end{macrocode}
-% $B:81&!"$=$l$>$l%F%-%9%H$H%+%i%`I}%U%m!<%H$rAH$_N)$F$k!#(B
+% $B:8%+%i%`$N%F%-%9%H%5%$%:$K:8%+%i%`$KF~$k%U%m!<%H$N9b$5$r2C$($k$3$H$G!"(B
+% $B:8%+%i%`$N9b$5$r(B|\@fixht|$B$K3JG<$7$^$9!#(B
 %    \begin{macrocode}
       \@fixht\ht\@leftcolumn
         \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht
+%    \end{macrocode}
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B
+% $B1&%+%i%`$K$D$$$F$bF1MM$K=hM}$7$^$9!#$3$l$G!"8E$/$+$i$"$C$?(B
+% $B1&%+%i%`$H%U%m!<%H$,=E$J$k%P%0$r2r>C$7$^$7$?!#(B
+% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B}
+%    \begin{macrocode}
+      \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox
+      \@chkdblfloatht \@tempdima\@floatht
+      \R@chkfloatht \advance\@tempdima\@floatht
+      \advance\@rightfixht\@tempdima
+      \ifdim\@rightfixht>\textheight
+        \@rightfixht\textheight
+        \advance\@rightfixht-\@tempdima
+        \advance\@rightfixht\maxdepth
+        \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
+        \setbox\z@=\vsplit\@outputbox to\@rightfixht
+        \advance\@rightfixht-\maxdepth
+        \unvbox\@outputbox
+        \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}%
+      \fi
+      \@rightfixht\ht\@outputbox
+        \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht
+%    \end{macrocode}
+% $B:81&!"$=$l$>$l%F%-%9%H$H%+%i%`I}%U%m!<%H$rAH$_N)$F$k!#(B
+%    \begin{macrocode}
       \ifx\L@toplist\@empty\else\L@cflt\fi
       \ifx\L@botlist\@empty\else\L@cflb\fi
       \ifx\R@toplist\@empty\else\R@cflt\fi
@@ -770,7 +819,13 @@
 % \begin{macro}{\R@cflt}
 % \begin{macro}{\R@cflb}
 % $B:8%+%i%`$H1&%+%i%`$rAH$_N)$F$k$N$KMQ$$$k!#(B
+%
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B
+% $B:8%+%i%`$G$O(B|\@fixht|$B!"1&%+%i%`$G$O(B|\@rightfixht|$B$N9b$5$K$J$k$h$&$K(B
+% $B$7$^$9!#$^$?!"(B|\@colht|$B$r$3$l$i$N9b$5$K99?7$7$^$9!#(B
 % \changes{v2.3}{2000/12/20}{\cs{gdef}$B$r(B\cs{global}\cs{let}$B$KJQ99(B}
+% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B
+%    $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B}
 %    \begin{macrocode}
 \def\L@cflt{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@toplist
@@ -780,6 +835,7 @@
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty
+  \@colht\@fixht
 }
 \def\L@cflb{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist
@@ -789,24 +845,27 @@
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty
+  \@colht\@fixht
 }
 \def\R@cflt{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist
-  \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth
+  \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
       \unvbox\@tempboxa
       \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty
+  \@colht\@rightfixht
 }
 \def\R@cflb{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist
-  \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth
+  \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
       \unvbox\@outputbox
       \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty
+  \@colht\@rightfixht
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index bfe4d5a0861..5f04e22a119 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -64,13 +64,15 @@
 %    (sync with ltoutput.dtx 2017/03/10 v1.3c)}
 % \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B
 %    $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)}
+% \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
+% \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2017/03/19 v1.2m pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/05/03 v1.2o pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -197,9 +199,11 @@
 % \end{macro}
 %
 % \subsection{$B2~9T(B}
+%
+% \begin{macro}{\@gnewline}
 % \changes{v1.1c}{1995/08/25}{$B9TF,6XB'J8;z$ND>A0$G$N2~9T$G$NIT6q9g$N=$@5(B}
 % $BF|K\8l(B\TeX{}$B$N9TF,6XB'=hM}$O!"6XB'BP>]J8;z$ND>A0$K!"(B
-% |\prekinsokupenalty|$B$G;XDj$5$l$?%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G(B
+% |\prebreakpenalty|$B$G;XDj$5$l$?%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G(B
 % $B9T$J$C$F$$$^$9!#(B
 % $B$H$3$m$,!"2~9T%3%^%s%I$OIi$N%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G2~9T$r9T$J$$$^$9!#(B
 % $B$=$N$?$a$K!"6XB'%Z%J%k%F%#$NCM$,(B$10000$$B$NJ8;z$ND>8e$G$O!"%Z%J%k%F%#$NCM$,(B
@@ -222,8 +226,26 @@
 %    $B$"$j$,$H$&!"1|B<$5$s!#(B}
 % \LaTeX\ \texttt{<1996/12/01>}$B$G2~9T%^%/%m$,JQ99$5$l!"(B|\\|$B$,(B
 % |\newline|$B$r8F$S=P$5$J$/$J$C$?$?$a!"JQ99$5$l$?2~9T%^%/%m$KBP1~$7$^$7(B
-% $B$?!#(B|\mbox{}|$B$NA^F~0LCV$OF1$8$G$9!#(B
+% $B$?!#(B|\null|$B$NA^F~0LCV$OF1$8$G$9!#(B
 % \file{ltspace.dtx}$B$NDj5A$r>e5-$K9g$o$;$F!"Dj5A$7$J$*$7$^$7$?!#(B
+%
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'(B
+% $B%"%9%-!<$K$h$k(Bp\LaTeX{}$B$G$O!"9TF,6XB'J8;z$ND>A0$G(B|\\|$B$K$h$k6/@)2~9T$r(B
+% $B9T$($k$h$&$K$9$k$H$$$&L\E*$G(B
+% |\null|$B$r(B|\@gnewline|$B%^%/%mFb$KA^F~$7$F$$$^$7$?!#(B
+% $B$7$+$7!"$3$l$G$O(B|\\\par|$B$H=q$$$?>l9g$K(BUnderfull$B7Y9p$,=P$J$/$J$C$F(B
+% $B$$$^$9!J(B|tests/newline_par.tex|$B$r(B\texttt{latex}$B$H(B\texttt{platex}$B$G(B
+% $B=hM}$7$F$_$F$/$@$5$$!K!#(B
+%
+% $B$b$7(B|\null|$B$NBe$o$j$K(B|\hskip\z@|$B$rA^F~$9$l$P!"(B\LaTeX{}$B$HF1MM$K(B
+% Underfull$B7Y9p$r=P$9$3$H$,$G$-$^$9!#(B
+% $B$?$@$7!"(B|\null|$B$rA^F~$7$?>l9g$H0[$J$j!"6/@)2~9T8e$N9TF,$K(B
+% JFM$B%0%k!=$,F~$i$J$/$J$j$^$9!#$3$l$O$`$7$m!"1|B<$5$s$N(Bjsclasses$B$G(B
+% $B9TF,$rE7%D%-$KD>$7$F$$$k$N$HF1$8$G$9$,!"(Bp\LaTeX{}$B$H$7$F$O5sF0$,(B
+% $BJQ2=$7$F$7$^$$$^$9$N$G!"8=;~E@$G$O(B|\null|$B"*(B|\hskip\z@|$B$X$NJQ99$r(B
+% $B8+Aw$C$F$$$^$9!#(B
+% \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
+%
 %    \begin{macrocode}
 \def\@gnewline #1{%
   \ifvmode
@@ -234,6 +256,57 @@
   \fi}
 %</plcore>
 %    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@no@lnbk}
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B
+% $B$5$i$K!"(B|\\|$B$@$1$G$J$/(B|\linebreak|$B$K$D$$$F$bF1MM$NBP=h$r$7$^$9!#(B
+% \LaTeX{}$B$NDj5A$N$^$^$G$O%^%/%m$K$h$k%Z%J%k%F%#(B$-10000$$B$H(B
+% $B9TF,J8;z$N%Z%J%k%F%#(B$10000$$B$,2C;;$5$l$F$7$^$&$?$a!"(B
+% |\hskip\z@\relax|$B$rF~$l$F$*$-$^$9!#$J$*!"(B|\linebreak|$B$rH/9T$7$F(B
+% $B9TJ,3d$,5/$-$?>l9g!"?7$7$$9TF,$N(BJFM$B%0%k!=$O>C$($k$H$$$&=>Mh$N(B
+% p\LaTeX{}$B$N5sF0$b0];}$7$F$$$^$9!#(B
+% \changes{v1.2o}{2017/05/03}{$B9TF,6XB'J8;z$ND>A0$G$b2~9T$9$k$h$&$K$7$?(B}
+%    \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2017/05/05}{\@no@lnbk}
+%<platexrelease>                   {Break before prebreakpenalty}%
+%<*plcore|platexrelease>
+\def\@no@lnbk #1[#2]{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \@tempskipa\lastskip
+    \unskip
+    \penalty #1\@getpen{#2}%
+    \hskip\z@\relax %% added (2017/05/03)
+    \ifdim\@tempskipa>\z@
+      \hskip\@tempskipa
+      \ignorespaces
+    \fi
+  \fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@no@lnbk}
+%<platexrelease>                   {Break before prebreakpenalty}%
+%<platexrelease>\def\@no@lnbk #1[#2]{%
+%<platexrelease>  \ifvmode
+%<platexrelease>    \@nolnerr
+%<platexrelease>  \else
+%<platexrelease>    \@tempskipa\lastskip
+%<platexrelease>    \unskip
+%<platexrelease>    \penalty #1\@getpen{#2}%
+%<platexrelease>    \ifdim\@tempskipa>\z@
+%<platexrelease>      \hskip\@tempskipa
+%<platexrelease>      \ignorespaces
+%<platexrelease>    \fi
+%<platexrelease>  \fi}
+%<platexrelease>\plEndIncludeInRelease
+%    \end{macrocode}
+% \end{macro}
+%
+% $B$J$*!"(B\LaTeX{}$BMQ$NL?Na$G$"$k(B|\\|$B$H(B|\linebreak|$B$K$O>e5-$N$h$&$J(B
+% $B6XB'J8;z$X$NBP:v$rF~$l$F$$$^$9$,!"(Bplain \TeX{}$B8_49$N%7%s%W%k$J(B
+% $BL?Na$G$"$k(B|\break|$B$d(B|\nobreak|$B$K$O!"BP:v$r9T$$$^$;$s!#(B
 %
 % \subsection{$B%*%V%8%'%/%H$N=PNO=g=x(B}
 % $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H(B
diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx
index d4cae9c7cf3..0ea21fad485 100644
--- a/Master/texmf-dist/source/platex/base/plext.dtx
+++ b/Master/texmf-dist/source/platex/base/plext.dtx
@@ -56,6 +56,9 @@
 %    (sync with ltboxes 2015/01/08 v1.1h)}
 % \changes{v1.2f}{2017/03/28}{$BI=$H<~0O$H$NB7$(0LCV$r=$@5(B}
 % \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B}
+% \changes{v1.2g}{2017/05/04}{Make \cs{pbox} Robust}
+% \changes{v1.2g}{2017/05/04}{Use \cs{setlength}, so that
+%           calc extensions apply}
 % \fi
 %
 % \iffalse
@@ -64,7 +67,7 @@
 \ProvidesFile{plext.dtx}
 %</driver>
 %<package>\ProvidesPackage{plext}
-   [2017/03/28 v1.2f pLaTeX package file (community edition)]
+   [2017/05/04 v1.2g pLaTeX package file (community edition)]
 %<*driver>
 \documentclass{jltxdoc}
 \usepackage{plext}
@@ -913,12 +916,11 @@
 %   \item |[b]|$B;XDj$N$H$-(B\\$B:G=*9T$N%Y!<%9%i%$%s$,<~0O$N$=$l$H0lCW(B
 % \end{itemize}
 % \item $B<~0O$NAHJ}8~$,=DAH$+$DAHJ}8~$,(B|<z>|$B;XDj$N>l9g(B
-%  [TODO] $BL$Dj!*(B
-%^^A \begin{itemize}
-%^^A   \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
-%^^A   \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
-%^^A   \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8%Y!<%9%i%$%s$H0lCW(B
-%^^A \end{itemize}
+% \begin{itemize}
+%   \item |[t]|$B;XDj$N$H$-(B\\$BH"$N>eC<$,<~0O$NOBJ8J8;z$N9b$5$H0lCW(B
+%   \item |[c]|$B;XDj$N$H$-(B\\$BH"$NCf?4$,<~0O$N?t<0<4$rDL$k!J2$J8%Y!<%9%i%$%s%7%U%H$N1F6A2<!K(B
+%   \item |[b]|$B;XDj$N$H$-(B\\$BH"$N2<C<$,<~0O$NOBJ8J8;z$N?<$5$H0lCW(B
+% \end{itemize}
 % \end{itemize}
 % \changes{v1.2f}{2017/03/28}{$BCJMn$NH"$H<~0O$H$NB7$(0LCV$r=$@5(B}
 %    \begin{macrocode}
@@ -1015,12 +1017,16 @@
 % |\pbox<|\meta{dir}|>[|\meta{width}|][|\meta{pos}|]{|\meta{obj}|}|
 %
 % \begin{macro}{\pbox}
-% \begin{macro}{\X@makepbox}
-% \begin{macro}{\@imakepbox}
 % $B%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2g}{2017/05/04}{Make \cs{pbox} Robust}
 %    \begin{macrocode}
-\def\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
+\DeclareRobustCommand\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
+%    \end{macrocode}
+% \end{macro}
 %
+% \begin{macro}{\X@makepbox}
+% \begin{macro}{\@imakepbox}
+%    \begin{macrocode}
 \def\X@makePbox<#1>{%
   \@ifnextchar[{\@imakePbox<#1>}{\@imakePbox<#1>[-5\p@]}}
 %
@@ -1029,11 +1035,12 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@iimakePbox}
 % |\pbox|$B$NFbIt7A<0$G$9!#(B
 % \changes{v1.1i}{2001/05/10}{$B=DAH$G(Bz$B$r;XDj$9$k$H%(%i!<$K$J$k$N$r=$@5!#(B}
+% \changes{v1.2g}{2017/05/04}{Use \cs{setlength}, so that
+%           calc extensions apply}
 %    \begin{macrocode}
 \def\@iimakePbox<#1>#2[#3]#4{%
   \bgroup \@rotswfalse \@pboxswfalse
@@ -1048,8 +1055,9 @@
     \fi
   \fi
   \ifmmode\else\if@rotsw\@pboxswtrue\hbox\bgroup$\fi\fi
-    \ifdim #2 <\z@ \hbox{\box@dir#4}\else
-    \hbox to#2{\box@dir
+    \setlength{\@tempdima}{#2}%
+    \ifdim\@tempdima<\z@ \hbox{\box@dir#4}\else
+    \hb@xt@\@tempdima{\box@dir
                \if #3l\relax\else\hss\fi
                #4\relax
                \if #3r\relax\else\hss\fi}\fi
diff --git a/Master/texmf-dist/source/platex/base/plnewsc06.tex b/Master/texmf-dist/source/platex/base/plnewsc06.tex
index 3181bd52266..0c07f625504 100644
--- a/Master/texmf-dist/source/platex/base/plnewsc06.tex
+++ b/Master/texmf-dist/source/platex/base/plnewsc06.tex
@@ -1,8 +1,8 @@
-%% <2017/04/08>
+%% <2017/04/08> and <2017/05/05>
 \documentclass{plnews}
 
 \publicationyear{2017}% $BH/9TG/(B
-\publicationmonth{04}% $BH/9T7n(B
+\publicationmonth{05}% $BH/9T7n(B
 \publicationissue{c6}% $BHV9f(B
 \author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B}
 
@@ -16,8 +16,9 @@
 
 \maketitle
 
-$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2017/04/08>}$B$K$D$$$F!"(B
-\pLaTeXe\ \texttt{<2016/11/29>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B
+$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2017/05/05>}$B$K$D$$$F!"(B
+\pLaTeXe\ \texttt{<2016/11/29>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9(B
+\footnote{$BESCf$N%j%j!<%9(B\texttt{<2017/04/08>}$B$G$N99?72U=j$r4^$_$^$9!#(B}$B!#(B
 
 
 \section{$BI8=`%/%i%9%U%!%$%k$N=$@5(B}
@@ -49,9 +50,8 @@
 $B%i%$%s$NB7$(J}$KE}0l@-$,$"$j$^$;$s$G$7$?!#$^$?!"%"%9%-!<Ev;~$N(B2001$BG/$+$i(B
 $B8=:_$K;j$k$^$G!"(B\pTeX{}$B$N?t!9$N;EMMJQ99$r<u$1$F2?EY$bB7$(0LCV$,!J>!<j$K!K(B
 $BJQ2=$7$F$-$?7P0^$,$"$j$^$9!#:#2s!"%3%_%e%K%F%#HG$G(B2017$BG/$N(B\pTeX{}$B$K9g$o$;$F(B
-$B;EMM$r:vDj$9$k$3$H$K$7$^$7$?!#(B
-$B$^$?!"(B\LaTeXe\ 2015/01/01$B$KDI?o$7$F(B|\parbox|$B$r(Brobust$B$K$7$?$[$+!"(B
-|\Kanji|$BL?Na$N%P%0$r=$@5$7$^$7$?!#(B
+$B;EMM$r:vDj$9$k$3$H$K$7$^$7$?!#>\:Y$O(B\file{pldoc.pdf}$B$b$7$/$O$=$N%=!<%9(B
+\file{plext.dtx}$B$r;2>H$7$F$/$@$5$$!#(B
 
 
 \section{$B;YCl$N9b$5(B}
@@ -85,15 +85,35 @@ ISO$B=q<0$KJQ99$5$l$^$7$?$,!"(B\pLaTeXe{}$B$N%U%)!<%^%C%HF|IU$O$^$@=>Mh$N=q<0
 $B$^$^$K$7$F$$$^$9!#(B
 
 
+\section{\file{nidanfloat}$B%Q%C%1!<%8$N=$@5(B}
+\LaTeX{}$B$GFsCJAH$K$*$1$kCJH4$-%U%m!<%H$r(Bbottom$B$K$bG[CV$G$-$k$h$&$K$9$k(B
+\file{nidanfloat}$B%Q%C%1!<%8$G$9$,!"1&%+%i%`$N=hM}Cf$KCJH4$-%U%m!<%H$,(B
+$B=P8=$7$?>l9g$K1&%+%i%`$N%F%-%9%H$N9b$5$r8m$j!"%F%-%9%H$H%U%m!<%H$,(B
+$B=E$J$C$F$7$^$&%P%0$,$"$j$^$7$?!#$3$l$O(B2006$BG/;~E@$+$i;XE&$5$l$F$$$?8E$$(B
+$BLdBj$G$7$?$,!":#2s$h$&$d$/%P%0=$@5$7$^$7$?!#(B
+
+
 \section{$B$=$NB>$N%P%0=$@5(B}
+$B$=$NB>$N(B\pLaTeXe{}$B%+!<%M%k$N=$@5E@$O0J2<$N$H$*$j$G$9!#(B
 \begin{itemize}
 \item $BAj8_;2>H$N(B|\ref{$B%i%Y%k(B}|$B$d(B|\pageref{$B%i%Y%k(B}|$B$r%;%/%7%g%s$J$I$N(B
   $B!VF0$/0z?t!W$G;H$&$H!"L\<!$K=P$?$H$-$K8e$m$NH>3Q%9%Z!<%9$,>C$($k%P%0$r(B
   $B=$@5$7$^$7$?!#(B
 \item $B=PNO%k!<%A%s$K4X$o$k%^%/%m$N?<$5Jd@5$N8m$j$K$h$j!"5SCm$r4^$`%Z!<%8(B
   $B$NHGLLA4BN$,!JFC$K=DAH$G82Cx$K!K$:$l$F$$$?%P%0$rD>$7$^$7$?!#(B
+\item $B9TF,6XB'J8;z$ND>A0$G(B|\linebreak|$B$K$h$k6/@)2~9T$,8z$+$J$+$C$?(B
+  $BLdBj$KBP=h$7$^$7$?!#(B
 \item $B=D?t<0%G%#%l%/%7%g%s$G%"%s%@!<%9%3%"(B(|\_|)$B$N%Y!<%9%i%$%sJd@5NL$,(B
-  $B4V0c$C$F$$$?$N$rD>$7$^$7$?(B
+  $B4V0c$C$F$$$?$N$r=$@5$7$^$7$?!#(B
+\end{itemize}
+$B$^$?!"(B\file{plext}$B%Q%C%1!<%8$N=$@5E@$O0J2<$N$H$*$j$G$9!#(B
+\begin{itemize}
+\item \LaTeXe\ 2015/01/01$B$KDI?o$7$F(B|\parbox|$B$r(Brobust$B$K$7$^$7$?!#(B
+  $B$^$?!"FH<+L?Na$G$"$k(B|\pbox|$B$bF1MM$K(Brobust$B$K$7$^$7$?!#(B
+\item |\pbox|$BL?Na$N%*%W%7%g%s0z?t!JI}$N;XDj!K$G!"(B\file{calc}$B%Q%C%1!<%8(B
+  $B$r;H$C$?>l9g$O<0$b;H$($k$h$&$K$7$^$7$?!#(B
+\item |\Kanji|$BL?Na$N0z?t$N$"$H$K?t;z$,B3$/>l9g!"$=$N?t;z$^$G4A?t;z$K(B
+  $B$J$C$F$7$^$&%P%0$r=$@5$7$^$7$?!#(B
 \end{itemize}
 
 
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 43a72df3e70..8a9add2a2b0 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -55,12 +55,13 @@
 %    (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}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{plvers.dtx}[2017/03/19 v1.1b pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2017/04/23 v1.1c pLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plvers.dtx}
@@ -96,6 +97,7 @@
 % \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}
 %
 % $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,
@@ -109,7 +111,7 @@
 %<latexrelease>\edef\latexreleaseversion
 %<platexrelease>\edef\p@known@latexreleaseversion
 %<*2ekernel|latexrelease|platexrelease>
-   {2017/01/01}
+   {2017/04/15}
 %</2ekernel|latexrelease|platexrelease>
 %    \end{macrocode}
 %
@@ -125,7 +127,7 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2017/04/08}
+   {2017/05/05}
 %</plcore|platexrelease>
 %<*plcore>
 \def\ppatch@level{0}
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index a0f6cb8adb3..55ddf96abd2 100644
--- a/Master/texmf-dist/tex/platex/base/exppl2e.sty
+++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty
@@ -34,7 +34,7 @@
 % case 1: This file must be a normal package
   \NeedsTeXFormat{pLaTeX2e}
   \ProvidesPackage{exppl2e}
-                [2017/04/08 v1.0k Experimental pLaTeX2e features]
+                [2017/05/04 v1.0l Experimental pLaTeX2e features]
   \PackageWarningNoLine{exppl2e}{%
       This is the unstable, experimental part of pLaTeX2e.\MessageBreak
       This package may contain:\MessageBreak
@@ -257,229 +257,7 @@
 %
 % \section{$B;YCl(B}
 %
-% \subsubsection{$B;YCl(B}
-% $B9T4V$ND4@0$J$I$KMQ$$$k;YCl$G$9!#(B
-% $B;YCl$N$b$H$H$J$k%\%C%/%9$NBg$-$5$O!"%U%)%s%H%5%$%:$,JQ99$5$l$k$?$S$K!"(B
-% |\set@fontsize|$B%3%^%s%I$K$h$C$FJQ2=$7$^$9!#(B
-%
-% $B%U%)%s%H%5%$%:$,JQ99$5$l$?$H$-$K!"(B|\set@fontsize|$B%3%^%s%I$G99?7$5$l$^$9!#(B
-%
-% $B=>Mh!"2#AH%\%C%/%9MQ$N;YCl$O(B|\strutbox|$B$G!"9b$5$H?<$5$,(B7$BBP(B3$B$H$J$C$F$$$^$7$?!#(B
-% $B$3$l$O(Bp\LaTeX{}$BC1BN$G$OLdBj$K$J$j$^$;$s$G$7$?$,!"3$30@=$N(B\LaTeX{}$B%Q%C%1!<%8$r(B
-% $B=DAH$G;HMQ$7$?>l9g$K!"0U?^$7$J$$I}$d9b$5$,<hF@$5$l$k$3$H$,$"$j$^$7$?!#(B
-% $B$3$NITET9g$r2sHr$9$k$?$a!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O<!$NJ}K!$r$H$j$^$9!#(B
-% \begin{itemize}
-% \item |\ystrutbox|$B!J?7@_!K!'9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl(B
-% \item |\tstrutbox|$B!'9b$5$H?<$5$,(B5$BBP(B5$B$N=DAH%\%C%/%9MQ$N;YCl(B
-% \item |\zstrutbox|$B!'9b$5$H?<$5$,(B7$BBP(B3$B$N=DAH%\%C%/%9MQ$N;YCl(B
-% \item |\strutbox|$B!J;EMMJQ99!K!'=D2#$N%G%#%l%/%7%g%s$K1~$8$F(B
-%                     |\tstrutbox|$B$^$?$O(B|\ystrutbox|$B$KE83+$5$l$k%^%/%m(B
-% \end{itemize}
-% $B$9$J$o$A!"=>Mh$N(Bp\LaTeX{}$B$K$*$1$k(B|\strutbox|$B$HF1$85sF0$r<($9$N$,!"(B
-% $B?7@_$5$l$?(B|\ystrutbox|$B$H$$$&$3$H$K$J$j$^$9!#(B
-%
-% \begin{macro}{\tstrutbox}
-% \begin{macro}{\zstrutbox}
-% |\tstrutbox|$B$O9b$5$H?<$5$,(B5$BBP(B5$B!"(B
-% |\zstrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N;YCl%\%C%/%9$H$J$j$^$9!#(B
-% $B$3$l$i$O=DAH%\%C%/%9$N9T4V$ND4@0$J$I$K;H$$$^$9!#(B
-%    \begin{macrocode}
-\newbox\tstrutbox
-\newbox\zstrutbox
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\ystrutbox}
-% |\ystrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl$G$9!#(B
-% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrutbox}
-%<platexrelease>                   {Add \ystrutbox}%
-%<*plcore|platexrelease>
-\newbox\ystrutbox
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrutbox}
-%<platexrelease>                   {Add \ystrutbox}%
-%<platexrelease>\let\ystrutbox\@undefined
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\strutbox}
-% |\strutbox|$B$O=D2#N>BP1~$G$9!#(B
-% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\strutbox}
-%<platexrelease>                   {Add \strutbox}%
-%<*plcore|platexrelease>
-\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\strutbox}
-%<platexrelease>                   {Add \strutbox}%
-%<platexrelease>\newbox\strutbox % emulation purpose only
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\strut}
-% $B%G%#%l%/%7%g%s$K1~$8$F(B|\ystrutbox|$B$H(B|\tstrutbox|$B$r;H$$J,$1$^$9!#(B
-% ^^A |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B
-% ^^A $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B
-% $B85!9$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
-%
-% \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''$B$NI}$,%<%m$K(B
-% $B$J$C$F$7$^$&$N$r=$@5(B}
-% \changes{v1.3h}{1999/08/09}{$B=DAH$N$H$-!"I}$N$"$k%\%C%/%9$K$J$C$F$7$^$&(B
-% $B$N$r=$@5(B}
-% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut}
-%<platexrelease>                   {Use \ystrutbox}%
-%<*plcore|platexrelease>
-\def\strut{\relax
-  \ifydir
-    \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
-  \else
-    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
-  \fi}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\strut}
-%<platexrelease>                   {Use \ystrutbox}%
-%<platexrelease>\def\strut{\relax
-%<platexrelease>  \ifydir
-%<platexrelease>    \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
-%<platexrelease>  \else
-%<platexrelease>    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
-%<platexrelease>  \fi}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\tstrut}
-% \begin{macro}{\zstrut}
-%    \begin{macrocode}
-\def\tstrut{\relax\hbox{\tate
-   \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\zstrut{\relax\hbox{\tate
-   \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\ystrut}
-% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut}
-%<platexrelease>                   {Add \ystrut}%
-%<*plcore|platexrelease>
-\def\ystrut{\relax\hbox{\yoko
-    \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrut}
-%<platexrelease>                   {Add \ystrut}%
-%<platexrelease>\let\ystrut\@undefined
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-%
-%
-% \begin{macro}{\set@fontsize}
-% |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B
-% $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B
-%    \begin{macrocode}
-%</plcore|trace>
-%<platexrelease|trace>\plIncludeInRelease{2017/04/08}{\set@fontsize}
-%<platexrelease|trace>                   {Construct \ystrutbox}%
-%<*plcore|platexrelease|trace>
-\def\set@fontsize#1#2#3{%
-    \@defaultunits\@tempdimb#2pt\relax\@nnil
-    \edef\f@size{\strip@pt\@tempdimb}%
-    \@defaultunits\@tempskipa#3pt\relax\@nnil
-    \edef\f@baselineskip{\the\@tempskipa}%
-    \edef\f@linespread{#1}%
-    \let\baselinestretch\f@linespread
-    \def\size@update{%
-      \baselineskip\f@baselineskip\relax
-      \baselineskip\f@linespread\baselineskip
-      \normalbaselineskip\baselineskip
-%    \end{macrocode}
-% $B$3$3$G!"%Y!<%9%i%$%s%7%U%H$ND4@0$H;YCl$rAH$_N)$F$^$9!#(B
-% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B}
-%    \begin{macrocode}
-      \adjustbaseline
-      \setbox\ystrutbox\hbox{\yoko
-          \vrule\@width\z@
-                \@height.7\baselineskip \@depth.3\baselineskip}%
-      \setbox\tstrutbox\hbox{\tate
-          \vrule\@width\z@
-                \@height.5\baselineskip \@depth.5\baselineskip}%
-      \setbox\zstrutbox\hbox{\tate
-          \vrule\@width\z@
-                \@height.7\baselineskip \@depth.3\baselineskip}%
-%    \end{macrocode}
-% $B%U%)%s%H%5%$%:$H%Y!<%9%i%$%s$K4X$9$k?GCG>pJs$r=PNO$7$^$9!#(B
-%    \begin{macrocode}
-%<*trace>
-%    \ifnum \tracingfonts>\tw@
-%      \ifx\f@linespread\@empty
-%        \let\reserved@a\@empty
-%      \else
-%        \def\reserved@a{\f@linespread x}%
-%      \fi
-%      \@font@info{Changing size to\space
-%            \f@size/\reserved@a \f@baselineskip}%
-%      \aftergroup\type@restoreinfo
-%    \fi
-%</trace>
-        \let\size@update\relax}}
-%</plcore|platexrelease|trace>
-%<platexrelease|trace>\plEndIncludeInRelease
-%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\set@fontsize}
-%<platexrelease|trace>                   {Construct \ystrutbox}%
-%<platexrelease|trace>\def\set@fontsize#1#2#3{%
-%<platexrelease|trace>    \@defaultunits\@tempdimb#2pt\relax\@nnil
-%<platexrelease|trace>    \edef\f@size{\strip@pt\@tempdimb}%
-%<platexrelease|trace>    \@defaultunits\@tempskipa#3pt\relax\@nnil
-%<platexrelease|trace>    \edef\f@baselineskip{\the\@tempskipa}%
-%<platexrelease|trace>    \edef\f@linespread{#1}%
-%<platexrelease|trace>    \let\baselinestretch\f@linespread
-%<platexrelease|trace>    \def\size@update{%
-%<platexrelease|trace>      \baselineskip\f@baselineskip\relax
-%<platexrelease|trace>      \baselineskip\f@linespread\baselineskip
-%<platexrelease|trace>      \normalbaselineskip\baselineskip
-%<platexrelease|trace>      \adjustbaseline
-%<platexrelease|trace>      \setbox\strutbox\hbox{\yoko
-%<platexrelease|trace>          \vrule\@width\z@
-%<platexrelease|trace>                \@height.7\baselineskip \@depth.3\baselineskip}%
-%<platexrelease|trace>      \setbox\tstrutbox\hbox{\tate
-%<platexrelease|trace>          \vrule\@width\z@
-%<platexrelease|trace>                \@height.5\baselineskip \@depth.5\baselineskip}%
-%<platexrelease|trace>      \setbox\zstrutbox\hbox{\tate
-%<platexrelease|trace>          \vrule\@width\z@
-%<platexrelease|trace>                \@height.7\baselineskip \@depth.3\baselineskip}%
-%<*trace>
-%<platexrelease|trace>    \ifnum \tracingfonts>\tw@
-%<platexrelease|trace>      \ifx\f@linespread\@empty
-%<platexrelease|trace>        \let\reserved@a\@empty
-%<platexrelease|trace>      \else
-%<platexrelease|trace>        \def\reserved@a{\f@linespread x}%
-%<platexrelease|trace>      \fi
-%<platexrelease|trace>      \@font@info{Changing size to\space
-%<platexrelease|trace>            \f@size/\reserved@a \f@baselineskip}%
-%<platexrelease|trace>      \aftergroup\type@restoreinfo
-%<platexrelease|trace>    \fi
-%</trace>
-%<platexrelease|trace>        \let\size@update\relax}}
-%<platexrelease|trace>\plEndIncludeInRelease
-%<*plcore|trace>
-%    \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -489,26 +267,57 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \section{$B6/@)2~9T$H(B\cs{par}}
+% \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
 %
 % \begin{macro}{\@gnewline}
-% $B=>Mh!"(Bp\LaTeX $B$G$O(B
+% \changes{v1.1c}{1995/08/25}{$B9TF,6XB'J8;z$ND>A0$G$N2~9T$G$NIT6q9g$N=$@5(B}
+% $BF|K\8l(B\TeX{}$B$N9TF,6XB'=hM}$O!"6XB'BP>]J8;z$ND>A0$K!"(B
+% |\prebreakpenalty|$B$G;XDj$5$l$?%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G(B
+% $B9T$J$C$F$$$^$9!#(B
+% $B$H$3$m$,!"2~9T%3%^%s%I$OIi$N%Z%J%k%F%#$NCM$rA^F~$9$k$3$H$G2~9T$r9T$J$$$^$9!#(B
+% $B$=$N$?$a$K!"6XB'%Z%J%k%F%#$NCM$,(B$10000$$B$NJ8;z$ND>8e$G$O!"%Z%J%k%F%#$NCM$,(B
+% $BAj;&$5$l!"2~9T$9$k$3$H$,$G$-$^$;$s!#(B
+%
 %\begin{verbatim}
 % $B$"$$$&$($*(B\\
 % $B!*$+$-$/$1$3(B
 %\end{verbatim}
-% $B$N$h$&$K9TF,6XB'J8;z$ND>A0$G6/@)2~9T$r9T$($k$h$&$K$9$k$?$a(B
-% |\null|$B$r(B|\@gnewline|$B%^%/%mFb$KA^F~$7$F$$$^$7$?!#(B
 %
-% $B$7$+$7!"$3$l$G$O(B|\\\par|$B$H=q$$$?>l9g$K(BUnderfull$B7Y9p$,=P$J$/$J$j(B
-% $B$^$9!J(B|tests/newline_par.tex|$B$r(B\texttt{latex}$B$H(B\texttt{platex}$B$G(B
-% $B=hM}$7$F$_$F$/$@$5$$!K$N$G!"(B|\null|$B$NBe$o$j$K(B|\hskip\z@|$B$r=E$M$k(B
-% $B7A$GBP1~$7$^$9!#(B
+% $B$7$?$,$C$F!"(B|\newline|$B%^%/%m$K(B|\mbox{}|$B$rF~$l$k$3$H$K$h$C$F!"(B
+% |\newline|$B%^%/%m$N%Z%J%k%F%#(B$-10000$$B$H9TF,J8;z$N%Z%J%k%F%#(B$10000$$B$,(B
+% $B2C;;$5$l$J$$$h$&$K$7$^$9!#(B|\\|$B$O(B|\newline|$B%^%/%m$r8F$S=P$7$F$$$^$9!#(B
+%
+% $B$J$*!"(B|\newline|$B%^%/%m$O(B\file{ltspaces.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
 %
-% $B$?$@$7!"=>Mh$N(B|\null|$B$rA^F~$7$?>l9g$H0[$J$j!"6/@)2~9T8e$N9TF,$K(B
+% \changes{v1.1j}{1999/04/05}{$B%*%W%7%g%s$rIU$1$?>l9g$K!"M>7W$J6uGr(B
+%    $B$,F~$C$F$7$^$&$N$r=$@5!#$"$j$,$H$&!"NkLZN4;V!w5~ETBg3X$5$s!#(B}
+% \changes{v1.1h}{1997/06/25}{\LaTeX\ $B$N2~9T%^%/%m$NJQ99$KBP1~!#(B
+%    $B$"$j$,$H$&!"1|B<$5$s!#(B}
+% \LaTeX\ \texttt{<1996/12/01>}$B$G2~9T%^%/%m$,JQ99$5$l!"(B|\\|$B$,(B
+% |\newline|$B$r8F$S=P$5$J$/$J$C$?$?$a!"JQ99$5$l$?2~9T%^%/%m$KBP1~$7$^$7(B
+% $B$?!#(B|\null|$B$NA^F~0LCV$OF1$8$G$9!#(B
+% \file{ltspace.dtx}$B$NDj5A$r>e5-$K9g$o$;$F!"Dj5A$7$J$*$7$^$7$?!#(B
+%
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'(B
+% $B%"%9%-!<$K$h$k(Bp\LaTeX{}$B$G$O!"9TF,6XB'J8;z$ND>A0$G(B|\\|$B$K$h$k6/@)2~9T$r(B
+% $B9T$($k$h$&$K$9$k$H$$$&L\E*$G(B
+% |\null|$B$r(B|\@gnewline|$B%^%/%mFb$KA^F~$7$F$$$^$7$?!#(B
+% $B$7$+$7!"$3$l$G$O(B|\\\par|$B$H=q$$$?>l9g$K(BUnderfull$B7Y9p$,=P$J$/$J$C$F(B
+% $B$$$^$9!J(B|tests/newline_par.tex|$B$r(B\texttt{latex}$B$H(B\texttt{platex}$B$G(B
+% $B=hM}$7$F$_$F$/$@$5$$!K!#(B
+%
+% $B$b$7(B|\null|$B$NBe$o$j$K(B|\hskip\z@|$B$rA^F~$9$l$P!"(B\LaTeX{}$B$HF1MM$K(B
+% Underfull$B7Y9p$r=P$9$3$H$,$G$-$^$9!#(B
+% $B$?$@$7!"(B|\null|$B$rA^F~$7$?>l9g$H0[$J$j!"6/@)2~9T8e$N9TF,$K(B
 % JFM$B%0%k!=$,F~$i$J$/$J$j$^$9!#$3$l$O$`$7$m!"1|B<$5$s$N(Bjsclasses$B$G(B
 % $B9TF,$rE7%D%-$KD>$7$F$$$k$N$HF1$8$G$9$,!"(Bp\LaTeX{}$B$H$7$F$O5sF0$,(B
-% $BJQ2=$7$F$7$^$$$^$9$N$G!"$H$j$"$($:%3%a%s%H%"%&%H$7$F$*$-$^$9!#(B
+% $BJQ2=$7$F$7$^$$$^$9$N$G!"8=;~E@$G$O(B|\null|$B"*(B|\hskip\z@|$B$X$NJQ99$r(B
+% $B8+Aw$C$F$$$^$9!#(B
+% \changes{v1.2n}{2017/04/23}{$B%I%-%e%a%s%H$NDI2C(B}
+%
+% $B$b$7JQ99$9$k$J$i$P!"0J2<$N%3!<%I$rM-8z$K$7$^$9!#(B
 %    \begin{macrocode}
 %<platexrelease>\plIncludeInRelease{????/??/??}{\@gnewline}
 %<platexrelease>                   {Restore Underfull warning for |\\\par|}%
@@ -535,568 +344,32 @@
 %    \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
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$BAj8_;2>H(B}
 %
-% \begin{macro}{\@setref}
-% \changes{v1.1c}{1995/09/07}{change \cs{null} to \cs{relax} in \cs{@setref}.}
-% \changes{v1.2k}{2017/02/20}{$BL\<!$G(B\cs{ref}$B$r;H$C$?>l9g$K8e$m$N6uGr$,>C$($k(B
-%    $B8=>]$KBP=h$9$k$?$a!"(B\cs{relax}$B$N$"$H$K(B\{\}$B$rDI2C(B}
-% |\ref|$B%3%^%s%I$d(B|\pageref|$B%3%^%s%I$G;2>H$7$?$H$-!"$3$l$i$N%3%^%s%I$K(B
-% $B$h$C$F=PNO$5$l$?HV9f$HB3$/#2%P%$%HJ8;z$H$N4V$K(B|\xkanjiskip|$B$,F~$j$^$;$s!#(B
-% $B$3$l$O!"(B|\null|$B$,(B|\hbox{}|$B$HDj5A$5$l$F$$$k$?$a$G$9!#(B
-% $B$=$3$G(B|\null|$B$r<h$j=|$-$^$9!#(B
-% $B$3$N%3%^%s%I$O!"(B\file{ltxref.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
-%
-% $B$7$+$7!"C1$K(B|\null|$B$r(B|\relax|$B$KCV$-49$($k$@$1$G$O!"(B|\section|$B$N$h$&$J(B
-% $B!VF0$/0z?t!W$G(B|\ref|$B$J$I$r;H$C$?>l9g$K!"L\<!$G8e$m$N6uGr$,>C$($F$7$^$$$^$9!#(B
-% $B$=$3$G!"(B|\relax|$B$N$"$H$K(B|{}|$B$rDI2C$7$^$7$?!#=>Mh$b(B|\protect\ref|$B$N$h$&$K;H$($P(B
-% $BLdBj$"$j$^$;$s$G$7$?$,!"(B\LaTeX{}$B$G$OE83+$5$l$F$bLdBj$,5/$-$J$$(Brobust$B$J<BAu$K(B
-% $B$J$C$F$$$^$9$N$G!"$3$l$K=>$$$^$9!#(B
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref}
-%<platexrelease>                   {Spacing after \ref in moving arguments}%
-%<*plcore|platexrelease>
-\def\@setref#1#2#3{%
-  \ifx#1\relax
-    \protect\G@refundefinedtrue
-    \nfss@text{\reset@font\bfseries ??}%
-    \@latex@warning{Reference `#3' on page \thepage \space
-              undefined}%
-  \else
-    \expandafter#2#1\relax{}% change \null to \relax{}
-  \fi}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref}
-%<platexrelease>                   {Spacing after \ref in moving arguments}%
-%<platexrelease>\def\@setref#1#2#3{%
-%<platexrelease>  \ifx#1\relax
-%<platexrelease>    \protect\G@refundefinedtrue
-%<platexrelease>    \nfss@text{\reset@font\bfseries ??}%
-%<platexrelease>    \@latex@warning{Reference `#3' on page \thepage \space
-%<platexrelease>              undefined}%
-%<platexrelease>  \else
-%<platexrelease>    \expandafter#2#1\relax% change \null to \relax
-%<platexrelease>  \fi}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B}
 %
-% \begin{macro}{\@makecol}
-% $B$3$N%^%/%m$,AH$_N)$F$kItJ,$NCf?4$H$J$j$^$9!#(B
-% \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}%
-%<*plcore|platexrelease>
-\gdef\@makecol{%
-   \setbox\@outputbox\box\@cclv%
-   \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)
-   \xdef\@freelist{\@freelist\@midlist}%
-   \global \let \@midlist \@empty
-   \@combinefloats
-%    \end{macrocode}
-% $B%*%j%8%J%k$N(B\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"5SCm!"%\%H%`%U%m!<%H$N=gHV$G(B
-% $B=PNO$7$^$9!#0lJ}(Bp\LaTeX{}$B$O!"%H%C%W%U%m!<%H!"K\J8!"%\%H%`%U%m!<%H!"5SCm$N(B
-% $B=gHV$G=PNO$7$^$9!#$H$3$m$,!"%"%9%-!<HG$N%3!<%I$O=gHV$rF~$lBX$($k$@$1$G$J$/!"(B
-% $BHGLLA4BN$N?bD>0LCV$,!JFC$K=DAH$G82Cx$K!K$:$l$F$7$^$C$F$$$^$7$?!#(B
-% $B$3$l$OJd@5NL(B|\dp\@outputbox|$B$N<hF@$,Aa$9$.$?$?$a$G$9$N$G!"%3%_%e%K%F%#HG(B
-% p\LaTeX{}$B$G$O$3$NLdBj$KBP=h$7$F$"$j$^$9!#7k2LE*$K!"(Bfnpos$B%Q%C%1!<%8(B(yafoot)$B$N(B
-% |\makeFNbottom|$B$+$D(B|\makeFNbelow|$B$J>uBV$H40A4$KEy2A$K$J$j$^$7$?!#(B
-% \changes{v1.2l}{2017/02/25}{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$rF~$lBX$($?$3$H$G(B
-%    $BHGLLA4BN$N?bD>0LCV$,$:$l$F$$$?$N$r=$@5(B(Issue 32)}
-%    \begin{macrocode}
-   \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25)
-   \ifvoid\footins\else % changed (pLaTeX 2017/02/25)
-     \setbox\@outputbox \vbox {%
-       \boxmaxdepth \@maxdepth
-       \unvbox \@outputbox
-       \@textbottom % inserted here (pLaTeX 2017/02/25)
-       \vskip \skip\footins
-       \color@begingroup
-         \normalcolor
-         \footnoterule
-         \unvbox \footins
-       \color@endgroup
-       }%
-       \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25)
-   \fi
-   \ifvbox\@kludgeins
-     \@makespecialcolbox
-   \else
-     \setbox\@outputbox \vbox to\@colht {%
-%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
-       \@texttop
-       \dimen@ \dp\@outputbox
-       \unvbox \@outputbox
-%    \end{macrocode}
-% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B
-% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B
-% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B
-% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B
-%
-% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B
-% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B
-% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B
-% \changes{v1.1j}{2001/05/10}{\cs{@makecol}$B$GAH$_N)$F$i$l$k(B
-%    \cs{@outputbox}$B$NBg$-$5$,!"=DAH$GCf?H$,6u$N%\%C%/%9$@$1$N>l9g$bE,@5$K$J$k(B
-%    $B$h$&$K=$@5(B}
-% \changes{v1.2b}{2016/01/26}{\cs{@outputbox}$B$N?<$5$,B>$N$b$N$N0LCV$K1F6A$rM?$($J$$(B
-%    $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B}
-% \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B
-%    $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
-%    \begin{macrocode}
-       \iftdir\vbox{\hskip\z@}\fi
-       \vskip -\dimen@
-       \@textbottom
-       }%
-   \fi
-   \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25)
-   \global \maxdepth \@maxdepth
-}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{2016/09/03}{\@makecol}{\@makecol}%
-%<platexrelease>\gdef\@makecol{%
-%<platexrelease>   \setbox\@outputbox\box\@cclv%
-%<platexrelease>   \xdef\@freelist{\@freelist\@midlist}%
-%<platexrelease>   \global \let \@midlist \@empty
-%<platexrelease>   \@combinefloats
-%<platexrelease>   \ifvbox\@kludgeins
-%<platexrelease>     \@makespecialcolbox
-%<platexrelease>   \else
-%<platexrelease>     \setbox\@outputbox \vbox to\@colht {%
-%<platexrelease>%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
-%<platexrelease>       \@texttop
-%<platexrelease>       \dimen@ \dp\@outputbox
-%<platexrelease>       \unvbox \@outputbox
-%<platexrelease>       \iftdir\vbox{\hskip\z@}\fi
-%<platexrelease>       \vskip -\dimen@
-%<platexrelease>       \@textbottom
-%<platexrelease>       \ifvoid\footins\else % for pLaTeX
-%<platexrelease>         \vskip \skip\footins
-%<platexrelease>         \color@begingroup
-%<platexrelease>            \normalcolor
-%<platexrelease>            \footnoterule
-%<platexrelease>            \unvbox \footins
-%<platexrelease>         \color@endgroup
-%<platexrelease>       \fi
-%<platexrelease>       }%
-%<platexrelease>   \fi
-%<platexrelease>   \global \maxdepth \@maxdepth
-%<platexrelease>}
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{2016/04/17}{\@makecol}{\@makecol}%
-%<platexrelease>\gdef\@makecol{%
-%<platexrelease>   \setbox\@outputbox\box\@cclv%
-%<platexrelease>   \xdef\@freelist{\@freelist\@midlist}%
-%<platexrelease>   \global \let \@midlist \@empty
-%<platexrelease>   \@combinefloats
-%<platexrelease>   \ifvbox\@kludgeins
-%<platexrelease>     \@makespecialcolbox
-%<platexrelease>   \else
-%<platexrelease>     \setbox\@outputbox \vbox to\@colht {%
-%<platexrelease>%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
-%<platexrelease>       \@texttop
-%<platexrelease>       \dimen@ \dp\@outputbox
-%<platexrelease>       \unvbox \@outputbox
-%<platexrelease>       \iftdir\hskip\z@\fi
-%<platexrelease>       \vskip -\dimen@
-%<platexrelease>       \@textbottom
-%<platexrelease>       \ifvoid\footins\else % for pLaTeX
-%<platexrelease>         \vskip \skip\footins
-%<platexrelease>         \color@begingroup
-%<platexrelease>            \normalcolor
-%<platexrelease>            \footnoterule
-%<platexrelease>            \unvbox \footins
-%<platexrelease>         \color@endgroup
-%<platexrelease>       \fi
-%<platexrelease>       }%
-%<platexrelease>   \fi
-%<platexrelease>   \global \maxdepth \@maxdepth
-%<platexrelease>}
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@makecol}{\@makecol}%
-%<platexrelease>\gdef\@makecol{%
-%<platexrelease>   \setbox\@outputbox\box\@cclv%
-%<platexrelease>   \xdef\@freelist{\@freelist\@midlist}%
-%<platexrelease>   \global \let \@midlist \@empty
-%<platexrelease>   \@combinefloats
-%<platexrelease>   \ifvbox\@kludgeins
-%<platexrelease>     \@makespecialcolbox
-%<platexrelease>   \else
-%<platexrelease>     \setbox\@outputbox \vbox to\@colht {%
-%<platexrelease>%       \boxmaxdepth \@maxdepth    % comment out on LaTeX 1997/12/01
-%<platexrelease>       \@texttop
-%<platexrelease>       \dimen@ \dp\@outputbox
-%<platexrelease>       \unvbox \@outputbox
-%<platexrelease>       \iftdir\hskip\z@
-%<platexrelease>       \else\vskip -\dimen@\fi
-%<platexrelease>       \@textbottom
-%<platexrelease>       \ifvoid\footins\else % for pLaTeX
-%<platexrelease>         \vskip \skip\footins
-%<platexrelease>         \color@begingroup
-%<platexrelease>            \normalcolor
-%<platexrelease>            \footnoterule
-%<platexrelease>            \unvbox \footins
-%<platexrelease>         \color@endgroup
-%<platexrelease>       \fi
-%<platexrelease>       }%
-%<platexrelease>   \fi
-%<platexrelease>   \global \maxdepth \@maxdepth
-%<platexrelease>}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@makespecialcolbox}
-% $BK\J8!J$"$k$$$O%\%H%`%U%m!<%H!K$H5SCm$N4V$K(B|\@textbottom|$B$rF~$l$?$$$N$G!"(B
-% |\@makespecialcolbox|$B%3%^%s%I$b=$@5$r$7$^$9!#(B
-% $B$d$O$j!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
-%
-% $B$3$N%^%/%m$O!"(B|\enlargethispage|$B$,;H$o$l$?$H$-$K!"(B
-% |\@makecol|$B%^%/%m$+$i8F$S=P$5$l$^$9!#(B
-%
-% \noindent\emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B(2017/02/25)}$B!'(B
-% 2016/11/29$B0JA0$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`%U%m!<%H$rA^F~$7$?8e!"(B
-% $B$9$0$K(B|\@kludgeins|$B$,6u$+$I$&$+H=Dj$7(B
-% \begin{itemize}
-% \item $B6u$N>l9g$O!";D$j$9$Y$F$N=hM}$r(B|\@makespecialcolbox|$B$KG$$;$k(B
-% \item $B6u$G$J$$>l9g$O!"(B|\@makecol|$B<+?H$G;D$j$9$Y$F$N=hM}$r9T$&(B
-% \end{itemize}
-% $B$H$7$F$$$^$7$?!#$7$+$7(B2017/04/08$B0J9_$N(Bp\LaTeX{}$B$G$O!"(B|\@makecol|$B$O%\%H%`(B
-% $B%U%m!<%H$H5SCm$rA^F~$7$F$+$i(B|\@kludgeins|$B$NH=Dj$K0\$k$h$&$K$7$F$$$^$9!#(B
-% $B$7$?$,$C$F!"?7$7$$(B|\@makecol|$B$+$i0J2<$K5-$9(B|\@makespecialcolbox|$B$,8F$S(B
-% $B=P$5$l$k>l9g$O!"(B|\ifvoid\footins|$B!JFs2U=j!K$NH=Dj$O>o$K??$H$J$k$O$:$G$9!#(B
-% $BMW$9$k$K!V$D$.$NItJ,$,(Bp\LaTeX{}$BMQ$N=$@5$G$9!#!W$H$$$&Fs2U=j$N%3!<%I$O(B
-% $B<B<AE*$KITMW$H$J$j$^$7$?!#(B
-%
-% $B$7$+$7!"$@$+$i$H$$$C$F>C$7$F$7$^$&$H!"8E$$(Bp\LaTeX{}$B$N(B|\@makecol|$B$r(B
-% $B%Y!<%9$K:n$i$l$?30It%Q%C%1!<%8$+$i(B|\@makespecialcolbox|$B$,8F$S=P$5$l$k(B
-% $B>l9g$K5SCm$,>CLG$9$k$*$=$l$,$"$j$^$9!#$3$N$?$a!"(B|\@makespecialcolbox|$B$O(B
-% $B=>Mh$N%3!<%I$N$^$^0];}$7$F$"$j$^$9!J32$O$"$j$^$;$s!K!#(B
-% \changes{v1.2l}{2017/02/25}{\cs{@makecol}$B$rJQ99$7$?$N$K(B
-%    \cs{@makespecialcolbox}$B$rJQ99$7$J$$!"$H$$$&H=CG$K$D$$$FL@J82=(B}
-% $B!JCfN,!K(B
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % \section{$B2<@~%^%/%m(B}
 %
-% \begin{macro}{\textunderscore}
-% \changes{v1.1b}{1995/04/12}{$B2<@~%^%/%m$rDI2C(B}
-% $B$3$N%3%^%s%I$O%F%-%9%H%b!<%I$G;XDj$5$l$?(B|\_|$B$NFbIt%3%^%s%I$G$9!#(B
-% $B=DAH$G$N0LCV$rD4@0$9$k$h$&$K:FDj5A$r$7$^$9!#(B
-% $B$b$H$O(B\file{ltoutenc.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
-%
-% $B$J$*!"(B|\_|$B$r?t<0%b!<%I$G;H$&$H(B|\mathunderscore|$B$,<B9T$5$l$^$9!#(B
-%
-% $B%3%_%e%K%F%#HG$G$O=D?t<0%G%#%l%/%7%g%s$G%Y!<%9%i%$%sJd@5NL$,(B
-% $BJQ$@$C$?$N$rD>$7$^$7$?!#$"$o$;$F2#%G%#%l%/%7%g%s$G$b%Y!<%9%i%$%s(B
-% $BJd@5$KDI?o$9$k$h$&$K$7$F$$$^$9!#(B
-% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\textunderscore}
-%<platexrelease>                   {Baseline shift for \textunderscore}%
-%<*plcore|platexrelease>
-\DeclareTextCommandDefault{\textunderscore}{%
-  \leavevmode\kern.06em
-  \raise-\iftdir\ifmdir\ybaselineshift
-         \else\tbaselineshift\fi
-         \else\ybaselineshift\fi
-  \vbox{\hrule\@width.3em}}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\textunderscore}
-%<platexrelease>                   {Baseline shift for \textunderscore}%
-%<platexrelease>\DeclareTextCommandDefault{\textunderscore}{%
-%<platexrelease>  \leavevmode\kern.06em
-%<platexrelease>  \iftdir\raise-\tbaselineshift\fi
-%<platexrelease>  \vbox{\hrule\@width.3em}}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% ^^A ===== plcore.dtx (plcore) =====
 % \section{verbatim$B$H%O%$%U%M!<%7%g%s(B}
 %
-% \LaTeXe\ 2017-04-15$B$GF3F~$5$l$?5?;w%?%$%WF~NO(B(verbatim)$BFb$G$N(B
-% $B%O%$%U%M!<%7%g%s$K4XO"$7$?=$@5$KDI?o$7$^$9!#(B
-%
-% \begin{macro}{\@outputpage}
-% |\textwidth|$B$H(B|\textheight|$B$N8r49$O!"(B|\@shipoutsetup|$BFb$G$O9T$J$$$^$;$s!#(B
-% $B$J$<$J$i!"(B|\@shipoutsetup|$B%^%/%m$,<B9T$5$l$k$H$-$O!"(B
-% |\shipout|$B$5$l$k(Bvbox$B$NCf$G$"$j!"$3$N$H$-$O2#AH%b!<%I$G$9$N$G!"(B
-% $B$D$M$K(B|\iftdir|$B$O56$HH=CG$5$l!"=D$H2#$N%5%$%:$r8r49$G$-$J$$$+$i$G$9!#(B
-%
-% $B$J$*!"$3$NJQ99$r%m!<%+%k$J$b$N$K$9$k$?$a$K!"(B
-% |\begingroup|$B$H(B|\endgroup|$B$G0O$_$^$9!#(B
-% \changes{v1.2a}{2001/09/26}{\LaTeX\ \texttt{!<2001/06/01!>}$B$KBP1~(B}
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\@outputpage}
-%<platexrelease>                   {Reset language for hyphenation}%
-%<*plcore|platexrelease>
-\def\@outputpage{%
-\begingroup % the \endgroup is put in by \aftergroup
-  \iftdir
-    \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
-  \fi
-  \let \protect \noexpand
-%    \end{macrocode}
-% \LaTeXe\ 2017-04-15$B$G$O(Bverbatim$B4D6-Fb$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B
-% $B=$@5$5$l$^$7$?$,!"(Bverbatim$B4D6-$NESCf$G2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G(B
-% $B%O%$%U%M!<%7%g%s$,M^@)$5$l$k$N$O@5$7$/$J$$$N$G!"(B|\language|$B$r(B
-% |\begin{document}|$B$G$NCM$K%j%;%C%H$7$^$9!J;29M!'(Blatex2e svn r1407$B!K!#(B
-% $B%W%j%"%s%V%k$GFCJL$K@_Dj$5$l$l$P$=$NCM!"@_Dj$5$l$J$1$l$P(B0$B$G$9!JK|$,0l(B
-% |\document|$B$NDj5A$,8E$$>l9g(B\footnote{\LaTeXe\ 2017/01/01$B0JA0$r;H$C$F(B
-% p\LaTeXe{}$B$N%U%)!<%^%C%H$r:n@.$7$?>l9g$d!"(Bdinbrief.cls$B$N$h$&$KFH<+$N(B
-% $B:FDj5A$r9T$&%/%i%9$d%Q%C%1!<%8$r;H$C$?>l9g$K5/$3$k$+$b$7$l$^$;$s!#(B}$B$O(B
-% $-1$$B$K$J$j$^$9$,!"$3$l$O(B0$B$HF1$8$O$?$i$-$r$9$k$N$GLdBj$O5/$-$^$;$s!K!#(B
-% \changes{v1.2m}{2017/03/19}{\cs{language}$B$r%j%;%C%H(B
-%    (sync with ltoutput.dtx 2017/03/10 v1.3c)}
-%    \begin{macrocode}
-  \language\document@default@language
-  \@resetactivechars
-  \global\let\@@if@newlist\if@newlist
-  \global\@newlistfalse
-  \@parboxrestore
-  \shipout\vbox{\yoko
-    \set@typeset@protect
-    \aftergroup\endgroup
-    \aftergroup\set@typeset@protect
-%    \end{macrocode}
-% \changes{v1.1g}{1998/02/03}{\cs{@shipoutsetup}$B$r(B\cs{@outputpage}$BFb$KF~$l$?(B}
-% $B$3$3$+$i(B|\@shipoutsetup|$B$NFbMF!#(B
-%    \begin{macrocode}
-     \if@specialpage
-       \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
-     \fi
-%    \end{macrocode}
-% \changes{v1.1c}{1995/02/05}{\cs{oddsidemargin}$B$H(B\cs{evensidemargin}$B$,(B
-%    $B5U$@$C$?$N$r=$@5(B}
-%    \begin{macrocode}
-     \if@twoside
-       \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
-          \iftdir\let\@themargin\evensidemargin
-          \else\let\@themargin\oddsidemargin\fi
-       \else \let\@thehead\@evenhead
-          \let\@thefoot\@evenfoot
-           \iftdir\let\@themargin\oddsidemargin
-           \else\let\@themargin\evensidemargin\fi
-     \fi\fi
-%    \end{macrocode}
-% $B%H%s%\=PNO%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g!"$3$3$GMQ;f%5%$%:$r:F@_Dj$7$^$9!#(B
-% \TeX $B$N2C$($k:8$H>eIt$N(B1$B%$%s%A$O!"%H%s%\$NFbB&$KF~$j$^$9!#(B
-% \changes{v1.1a}{1995/11/10}{\cs{topmargin}$B$,H?1G$5$l$J$$%P%0$r=$@5(B}
-%    \begin{macrocode}
-     \@@topmargin\topmargin
-     \iftombow
-       \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax
-       \@@paperheight\paperheight \advance\@@paperheight 16mm\relax
-       \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
-     \fi
-     \reset@font
-     \normalsize
-     \normalsfcodes
-     \let\label\@gobble
-     \let\index\@gobble
-     \let\glossary\@gobble
-     \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
-%    \end{macrocode}
-% $B$3$3$^$G$,(B|\@shipoutsetup|$B$NFbMF!#(B
-%    \begin{macrocode}
-    \@begindvi
-    \@outputtombow
-    \vskip \@@topmargin
-    \moveright\@themargin\vbox{%
-      \setbox\@tempboxa \vbox to\headheight{%
-        \vfil
-        \color@hbox
-          \normalcolor
-          \hb@xt@\textwidth{\@thehead}%
-        \color@endbox
-      }%                        %% 22 Feb 87
-      \dp\@tempboxa \z@
-      \box\@tempboxa
-      \vskip \headsep
-      \box\@outputbox
-      \baselineskip \footskip
-      \color@hbox
-        \normalcolor
-        \hb@xt@\textwidth{\@thefoot}%
-      \color@endbox
-    }%
-  }%
-%  \endgroup now inserted by \aftergroup
-%    \end{macrocode}
-% |\if@newlist|$B$r=i4|2=!#(B
-%    \begin{macrocode}
-  \global\let\if@newlist\@@if@newlist
-  \global \@colht \textheight
-  \stepcounter{page}%
-  \let\firstmark\botmark
-}
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\@outputpage}
-%<platexrelease>                   {Reset language for hyphenation}%
-%<platexrelease>\def\@outputpage{%
-%<platexrelease>\begingroup % the \endgroup is put in by \aftergroup
-%<platexrelease>  \iftdir
-%<platexrelease>    \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
-%<platexrelease>  \fi
-%<platexrelease>  \let \protect \noexpand
-%<platexrelease>  \@resetactivechars
-%<platexrelease>  \global\let\@@if@newlist\if@newlist
-%<platexrelease>  \global\@newlistfalse
-%<platexrelease>  \@parboxrestore
-%<platexrelease>  \shipout\vbox{\yoko
-%<platexrelease>    \set@typeset@protect
-%<platexrelease>    \aftergroup\endgroup
-%<platexrelease>    \aftergroup\set@typeset@protect
-%<platexrelease>     \if@specialpage
-%<platexrelease>       \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
-%<platexrelease>     \fi
-%<platexrelease>     \if@twoside
-%<platexrelease>       \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
-%<platexrelease>          \iftdir\let\@themargin\evensidemargin
-%<platexrelease>          \else\let\@themargin\oddsidemargin\fi
-%<platexrelease>       \else \let\@thehead\@evenhead
-%<platexrelease>          \let\@thefoot\@evenfoot
-%<platexrelease>           \iftdir\let\@themargin\oddsidemargin
-%<platexrelease>           \else\let\@themargin\evensidemargin\fi
-%<platexrelease>     \fi\fi
-%<platexrelease>     \@@topmargin\topmargin
-%<platexrelease>     \iftombow
-%<platexrelease>       \@@paperwidth\paperwidth \advance\@@paperwidth 6mm\relax
-%<platexrelease>       \@@paperheight\paperheight \advance\@@paperheight 16mm\relax
-%<platexrelease>       \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
-%<platexrelease>     \fi
-%<platexrelease>     \reset@font
-%<platexrelease>     \normalsize
-%<platexrelease>     \normalsfcodes
-%<platexrelease>     \let\label\@gobble
-%<platexrelease>     \let\index\@gobble
-%<platexrelease>     \let\glossary\@gobble
-%<platexrelease>     \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
-%<platexrelease>    \@begindvi
-%<platexrelease>    \@outputtombow
-%<platexrelease>    \vskip \@@topmargin
-%<platexrelease>    \moveright\@themargin\vbox{%
-%<platexrelease>      \setbox\@tempboxa \vbox to\headheight{%
-%<platexrelease>        \vfil
-%<platexrelease>        \color@hbox
-%<platexrelease>          \normalcolor
-%<platexrelease>          \hb@xt@\textwidth{\@thehead}%
-%<platexrelease>        \color@endbox
-%<platexrelease>      }%                        %% 22 Feb 87
-%<platexrelease>      \dp\@tempboxa \z@
-%<platexrelease>      \box\@tempboxa
-%<platexrelease>      \vskip \headsep
-%<platexrelease>      \box\@outputbox
-%<platexrelease>      \baselineskip \footskip
-%<platexrelease>      \color@hbox
-%<platexrelease>        \normalcolor
-%<platexrelease>        \hb@xt@\textwidth{\@thefoot}%
-%<platexrelease>      \color@endbox
-%<platexrelease>    }%
-%<platexrelease>  }%
-%<platexrelease>  \global\let\if@newlist\@@if@newlist
-%<platexrelease>  \global \@colht \textheight
-%<platexrelease>  \stepcounter{page}%
-%<platexrelease>  \let\firstmark\botmark
-%<platexrelease>}
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% \subsection{$B5?;w%?%$%WF~NO(B}
-%
-% \begin{macro}{\verb}
-% \changes{v1.1b}{1995/04/05}{$B8_49%b!<%I$N$H$-$O!"(Bpl209.def$B$NDj5A$r;H$&(B}
-% \changes{v1.1g}{1997/01/16}
-%    {\cs{verb}$B%3%^%s%I$r(B\LaTeX\ \texttt{!<1996/06/01!>}$B$K9g$o$;$F=$@5(B}
-% \LaTeX{}$B$N(B|\verb|$B%3%^%s%I$G$O!"?t<0%b!<%I$G$J$$$H$-$O!"(B
-% |\leavevmode|$B$G?eJ?%b!<%I$KF~$C$?$"$H!"(B|\null|$B$r=PNO$7$F$$$^$9!#(B
-% $B%^%/%m(B|\null|$B$O(B|\hbox{}|$B$H$7$FDj5A$5$l$F$$$^$9$N$G!"(B
-% $B$3$3$K$OOB2$J84V%9%Z!<%9!J(B|\xkanjiskip|$B!K$,F~$j$^$;$s!#(B
-% $B$=$3$G!"(B|\null|$B$r=PNO$7$J$$$h$&%^%/%m$r=$@5$7$^$9!#(B
-% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
-%    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb}
-%<platexrelease>                   {Disable hyphenation in verb}%
-%<*plcore|platexrelease>
-\if@compatibility\else
-\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
-  \bgroup
-    \verb@eol@error \let\do\@makeother \dospecials
-    \verbatim@font\@noligs
-%    \end{macrocode}
-% \LaTeXe\ 2017-04-15$B$KDI?o$7$F!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B
-% $B$h$&$K(B|\language|$B$r@_Dj$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B
-% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B
-%    $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)}
-%    \begin{macrocode}
-    \language\l@nohyphenation
-    \@ifstar\@sverb\@verb}
-\fi
-%</plcore|platexrelease>
-%<platexrelease>\plEndIncludeInRelease
-%<platexrelease>\plIncludeInRelease{0000/00/00}{\verb}
-%<platexrelease>                   {Disable hyphenation in verb}%
-%<platexrelease>\if@compatibility\else
-%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
-%<platexrelease>  \bgroup
-%<platexrelease>    \verb@eol@error \let\do\@makeother \dospecials
-%<platexrelease>    \verbatim@font\@noligs
-%<platexrelease>    \@ifstar\@sverb\@verb}
-%<platexrelease>\fi
-%<platexrelease>\plEndIncludeInRelease
-%    \end{macrocode}
-% \end{macro}
-%
-% ^^A ===== plvers.dtx (plfinal) =====
-% \subsection{$B%O%$%U%M!<%7%g%s4XO"(B}
-%
-% \begin{macro}{\l@nohyphenation}
-% \LaTeXe\ 2017-04-15$B$G!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$$h$&$K(B
-% $B$9$k=$@5$,F~$j$^$7$?!#$3$N=$@5$K$O(B|\l@nohyphenation|$B$,Dj5A:Q$_$G$J$1$l$P(B
-% $B$J$j$^$;$s$,!"DL>o$O(BBabel$B$NDj5A%U%!%$%k$K$h$C$FDs6!$5$l$F$$$^$9!#(B
-% \LaTeXe{}$B$OFC<l$J>u67$bA[Dj$7$F(Bltfinal$B$GBP:v$7$F$$$k$h$&$G$9$N$G!"(B
-% p\LaTeXe{}$B$bG0$N$?$a(Bplfinal$B$GBP:v$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B
-% \changes{v1.1b}{2017/03/19}{\cs{l@nohyphenation}$B$NDj5A$rJ]>Z(B
-%    (sync with ltfinal 2017/03/09 v2.0t)}
-%    \begin{macrocode}
-%<*plfinal>
-\ifx\l@nohyphenation \@undefined
-  \newlanguage\l@nohyphenation
-\fi
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\document@default@language}
-% \LaTeXe\ 2017-04-15$B$GF3F~$5$l$?%Q%i%a!<%?$G$9!#99?7%?%$%_%s%0$N$:$l$N(B
-% $B2DG=@-$r9MN8$7!"(Bp\LaTeXe{}$B$G$b=`Hw$7$F$*$-$^$9!#(Bverbatim$B4D6-$NESCf$G(B
-% $B2~%Z!<%8$,5/$-$?>l9g$K%X%C%@$G%O%$%U%M!<%7%g%s$,M^@)$5$l$J$$$h$&$K!"(B
-% |\@outputpage|$B$G(B|\language|$B$r%j%;%C%H$9$k$H$-$K;H$o$l$^$9(B
-% $B!J;29M!'(Blatex2e svn r1407$B!K!#(B
-% \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
-%</plfinal>
-%    \end{macrocode}
-% \end{macro}
+% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/Master/texmf-dist/tex/platex/base/nidanfloat.sty b/Master/texmf-dist/tex/platex/base/nidanfloat.sty
index ae6d8839928..f7444b16137 100644
--- a/Master/texmf-dist/tex/platex/base/nidanfloat.sty
+++ b/Master/texmf-dist/tex/platex/base/nidanfloat.sty
@@ -15,7 +15,7 @@
 %% File: nidanfloat.dtx
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{nidanfloat}%
-  [2005/12/09 v2.7 Put double-floats at top/bottom within twocolumn mode]
+  [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode]
 \DeclareOption{balance}{\AtEndDocument{\let\clearpage\balanceclearpage}}
 \DeclareOption{nobalance}{\relax}
 \ExecuteOptions{nobalance}
@@ -373,6 +373,7 @@
   \global\@floatht\@floatht
 }
 \global\newdimen\@fixht
+\global\newdimen\@rightfixht
 \def\@combinefloats{%
   %%\boxmaxdepth\maxdepth
   \if@twocolumn
@@ -390,16 +391,32 @@
         \setbox\z@=\vsplit\@leftcolumn to\@fixht
         \advance\@fixht-\maxdepth
         \@tempdima\baselineskip \advance\@tempdima-\topskip
-        \setbox\@outputbox=\vbox to\@fixht{%
+        \setbox\@outputbox=\vbox{%
             \ifvoid\@leftcolumn
             \else
               \unvbox\@leftcolumn\vskip\@tempdima
             \fi\relax
-            \unvbox\@outputbox\vss}%
-        \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@}%
+            \unvbox\@outputbox}% \vss moved from here
+        \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01)
       \fi
       \@fixht\ht\@leftcolumn
         \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht
+      \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox
+      \@chkdblfloatht \@tempdima\@floatht
+      \R@chkfloatht \advance\@tempdima\@floatht
+      \advance\@rightfixht\@tempdima
+      \ifdim\@rightfixht>\textheight
+        \@rightfixht\textheight
+        \advance\@rightfixht-\@tempdima
+        \advance\@rightfixht\maxdepth
+        \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
+        \setbox\z@=\vsplit\@outputbox to\@rightfixht
+        \advance\@rightfixht-\maxdepth
+        \unvbox\@outputbox
+        \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}%
+      \fi
+      \@rightfixht\ht\@outputbox
+        \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht
       \ifx\L@toplist\@empty\else\L@cflt\fi
       \ifx\L@botlist\@empty\else\L@cflb\fi
       \ifx\R@toplist\@empty\else\R@cflt\fi
@@ -418,6 +435,7 @@
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty
+  \@colht\@fixht
 }
 \def\L@cflb{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist
@@ -427,24 +445,27 @@
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty
+  \@colht\@fixht
 }
 \def\R@cflt{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist
-  \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth
+  \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
       \unvbox\@tempboxa
       \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty
+  \@colht\@rightfixht
 }
 \def\R@cflb{%
   \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist
-  \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth
+  \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
       \unvbox\@outputbox
       \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
       \vss}%
   \let\@elt\relax
   \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty
+  \@colht\@rightfixht
 }
 \def\@combinedblfloats{%
   \ifx\@dbltoplist\@empty
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 6efb18a30aa..2609700d438 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/01/01}
+   {2017/04/15}
 \edef\platexreleaseversion
-   {2017/04/08}
+   {2017/05/05}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
   {\@plIncludeInRelease{#1}[#1]}}
@@ -393,6 +393,37 @@ of this package available from CTAN}
 \let\eminnershape\@undefined
 \plEndIncludeInRelease
 %% File: plcore.dtx
+\plIncludeInRelease{2017/05/05}{\@no@lnbk}
+                   {Break before prebreakpenalty}%
+\def\@no@lnbk #1[#2]{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \@tempskipa\lastskip
+    \unskip
+    \penalty #1\@getpen{#2}%
+    \hskip\z@\relax %% added (2017/05/03)
+    \ifdim\@tempskipa>\z@
+      \hskip\@tempskipa
+      \ignorespaces
+    \fi
+  \fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\@no@lnbk}
+                   {Break before prebreakpenalty}%
+\def\@no@lnbk #1[#2]{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \@tempskipa\lastskip
+    \unskip
+    \penalty #1\@getpen{#2}%
+    \ifdim\@tempskipa>\z@
+      \hskip\@tempskipa
+      \ignorespaces
+    \fi
+  \fi}
+\plEndIncludeInRelease
 \plIncludeInRelease{2017/04/08}{\@makecol}{\@makecol}%
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 775b33fd921..50ea96a1821 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -18,7 +18,7 @@
 %% File: plvers.dtx
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
-   {2017/04/08}
+   {2017/05/05}
 \def\ppatch@level{0}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
@@ -693,6 +693,19 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \ignorespaces
   \fi}
+\def\@no@lnbk #1[#2]{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \@tempskipa\lastskip
+    \unskip
+    \penalty #1\@getpen{#2}%
+    \hskip\z@\relax %% added (2017/05/03)
+    \ifdim\@tempskipa>\z@
+      \hskip\@tempskipa
+      \ignorespaces
+    \fi
+  \fi}
 \gdef\@makecol{%
    \setbox\@outputbox\box\@cclv%
    \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index 3d6e4be9ec3..071980ec497 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -15,7 +15,7 @@
 %% File: plext.dtx
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{plext}
-   [2017/03/28 v1.2f pLaTeX package file (community edition)]
+   [2017/05/04 v1.2g pLaTeX package file (community edition)]
 \newif\if@rotsw
 \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
   \let\@classiv\@arrayclassiv
@@ -410,7 +410,7 @@
       \def\@end@parbox{\m@th$}%
    \fi\fi\fi
 \fi\fi}
-\def\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
+\DeclareRobustCommand\pbox{\leavevmode\@ifnextchar<{\X@makePbox}{\X@makePbox<Z>}}
 \def\X@makePbox<#1>{%
   \@ifnextchar[{\@imakePbox<#1>}{\@imakePbox<#1>[-5\p@]}}
 \def\@imakePbox<#1>[#2]{\@ifnextchar[%]
@@ -428,8 +428,9 @@
     \fi
   \fi
   \ifmmode\else\if@rotsw\@pboxswtrue\hbox\bgroup$\fi\fi
-    \ifdim #2 <\z@ \hbox{\box@dir#4}\else
-    \hbox to#2{\box@dir
+    \setlength{\@tempdima}{#2}%
+    \ifdim\@tempdima<\z@ \hbox{\box@dir#4}\else
+    \hb@xt@\@tempdima{\box@dir
                \if #3l\relax\else\hss\fi
                #4\relax
                \if #3r\relax\else\hss\fi}\fi