summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-05 22:46:19 +0000
committerKarl Berry <karl@freefriends.org>2017-05-05 22:46:19 +0000
commitaa83c35f19bc3126e14b09cdf98f7c177b9ad872 (patch)
treeeb585dc753a3382747b6605641c7e6bd4f1d769d /Master/texmf-dist/source/platex
parentaa9f58cd7bdffb2529e82e736476df8a7acaa70e (diff)
platex (5may17)
git-svn-id: svn://tug.org/texlive/trunk@44209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex')
-rw-r--r--Master/texmf-dist/source/platex/base/nidanfloat.dtx79
-rw-r--r--Master/texmf-dist/source/platex/base/plcore.dtx79
-rw-r--r--Master/texmf-dist/source/platex/base/plext.dtx34
-rw-r--r--Master/texmf-dist/source/platex/base/plnewsc06.tex36
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx8
5 files changed, 199 insertions, 37 deletions
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}