uplatex (5may17)

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

5 files changed, 97 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index cd068199eab..dad7a3709eb 100644
--- a/Master/texmf-dist/doc/uplatex/base/README.md
+++ b/Master/texmf-dist/doc/uplatex/base/README.md
@@ -17,6 +17,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/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index 6553fce4e66..d28a65d949f 100644
--- a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
index bfe4d5a0861..5f04e22a119 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/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/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 20e045d7016..a533bba1d07 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -66,12 +66,14 @@
 % \changes{v1.1b}{2017/03/19}{\cs{document@default@language}の定義を保証
 %    (sync with ltfinal 2017/03/09 v2.0t)}
 % \changes{v1.1b-u01}{2017/03/19}{p\LaTeX{}の変更に追随。}
+% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017/04/15!>}版対応確認}
+% \changes{v1.1c-u01}{2017/05/04}{p\LaTeX{}の変更に追随。}
 % \fi
 %
 % \iffalse
 %<*driver>
 % \fi
-\ProvidesFile{uplvers.dtx}[2017/03/19 v1.1b-u01 upLaTeX Kernel (Version Info)]
+\ProvidesFile{uplvers.dtx}[2017/05/04 v1.1c-u01 upLaTeX Kernel (Version Info)]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{uplvers.dtx}
@@ -107,6 +109,7 @@
 % \changes{v1.0s}{2016/02/01}{\LaTeX\ \texttt{!<2015/01/01!>}版用に修正}
 % \changes{v1.0u}{2016/04/17}{\LaTeX\ \texttt{!<2016/03/31!>}版対応確認}
 % \changes{v1.1a}{2017/02/20}{\LaTeX\ \texttt{!<2017/01/01!>}版対応確認}
+% \changes{v1.1c}{2017/04/23}{\LaTeX\ \texttt{!<2017/04/15!>}版対応確認}
 %
 % このバージョンのup\LaTeXe{}は、次のバージョンの\LaTeX{}\footnote{%
 % \LaTeX\ authors: Johannes Braams, David Carlisle, Alan Jeffrey,
@@ -120,7 +123,7 @@
 %<latexrelease>\edef\latexreleaseversion
 %<platexrelease>\edef\p@known@latexreleaseversion
 %<*2ekernel|latexrelease|platexrelease>
-   {2017/01/01}
+   {2017/04/15}
 %</2ekernel|latexrelease|platexrelease>
 %    \end{macrocode}
 %
@@ -136,7 +139,7 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2017/04/08u01}
+   {2017/05/05u01}
 %</plcore|platexrelease>
 %<*plcore>
 \def\ppatch@level{0}
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index 6fd6af1b9e1..503a33abf50 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -19,7 +19,7 @@
 %% File: uplvers.dtx
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
-   {2017/04/08u01}
+   {2017/05/05u01}
 \def\ppatch@level{0}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
@@ -694,6 +694,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)