uplatex (8sep16)

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

2 files changed, 31 insertions, 5 deletions

diff --git a/Master/texmf-dist/source/uplatex/base/plcore.dtx b/Master/texmf-dist/source/uplatex/base/plcore.dtx
index 2a73a150a24..be449ca760e 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -51,6 +51,8 @@
 %    $BLdBj$KBP=h(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)}
+% \changes{v1.2i}{2016/09/08}{v1.2g$B$N=$@5$GF~$l$?(B\cs{null}$B$,$^$:$+$C$?$N$G(B
+%    $B?eJ?%b!<%I$N$H$-$@$1H/9T$9$k$3$H$K$7$?(B(Issue 23)}
 % \fi
 %
 % \iffalse
@@ -883,7 +885,7 @@
 % \end{macro}
 %
 % \begin{macro}{\pltx@foot@penalty}
-% $BJD$83g8LN`$ND>8e$K(B|\footnotetext|$B$,B3$$$?>l9g!"(B|\footnotetext|$B$NA0$G$N2~9T$O(B
+% $B3+$-3g8LN`$ND>8e$K(B|\footnotetext|$B$,B3$$$?>l9g!"(B|\footnotetext|$B$NA0$G$N2~9T$O(B
 % $BK>$^$7$/$"$j$^$;$s!#$3$N$h$&$J>l9g$KBP=h$9$k$?$a$K!"(B|\pltx@foot@penalty|$B$H$$$&(B
 % $B%+%&%s%?$rMQ0U$7$^$7$?!#(B|\footnotetext|$B$N:G=i$G!VD>A0$N%Z%J%k%F%#CM!W(B
 % $B$H$7$F$3$N%+%&%s%?$,=i4|2=$5$l$^$9!#(B
@@ -981,8 +983,8 @@
 %
 % \changes{v1.0a}{1995/04/07}{$BAHJ}8~$NH=Dj$r%\%C%/%9$N30$G$9$k$h$&$K$7$?(B}
 %    \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2016/09/03}{\@footnotetext}
-%<platexrelease>                   {Allow break after \footnote}%
+%<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext}
+%<platexrelease>                   {Allow break after \footnote (more fix)}%
 %<*plcore|platexrelease>
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -1010,8 +1012,10 @@
 % $B5SCm$NA0$K%Z%J%k%F%#$,$"$C$?$H$$$&$3$H$G$9$+$i!"I|3h$5$;$F$*$-$^$9!#(B
 % \changes{v1.2g}{2016/08/25}{$B5SCm$N9g0uD>8e$G$N2~9T$,6X;_$5$l$F$7$^$&(B
 %    $BLdBj$KBP=h(B}
+% \changes{v1.2i}{2016/09/08}{v1.2g$B$N=$@5$GF~$l$?(B\cs{null}$B$,$^$:$+$C$?$N$G(B
+%    $B?eJ?%b!<%I$N$H$-$@$1H/9T$9$k$3$H$K$7$?(B(Issue 23)}
 %    \begin{macrocode}
-    \color@endgroup}\null
+    \color@endgroup}\ifhmode\null\fi
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty
       \pltx@foot@penalty\z@
@@ -1020,6 +1024,28 @@
 %    \begin{macrocode}
 %</plcore|platexrelease>
 %<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/09/03}{\@footnotetext}
+%<platexrelease>                   {Allow break after \footnote}%
+%<platexrelease>\long\def\@footnotetext#1{%
+%<platexrelease>  \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+%<platexrelease>  \insert\footins{\@tempa%
+%<platexrelease>    \reset@font\footnotesize
+%<platexrelease>    \interlinepenalty\interfootnotelinepenalty
+%<platexrelease>    \splittopskip\footnotesep
+%<platexrelease>    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<platexrelease>    \hsize\columnwidth \@parboxrestore
+%<platexrelease>    \protected@edef\@currentlabel{%
+%<platexrelease>       \csname p@footnote\endcsname\@thefnmark
+%<platexrelease>    }%
+%<platexrelease>    \color@begingroup
+%<platexrelease>      \@makefntext{%
+%<platexrelease>        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<platexrelease>    \color@endgroup}\null
+%<platexrelease>    \ifnum\pltx@foot@penalty=\z@\else
+%<platexrelease>      \penalty\pltx@foot@penalty
+%<platexrelease>      \pltx@foot@penalty\z@
+%<platexrelease>    \fi}
+%<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{0000/00/00}{\@footnotetext}
 %<platexrelease>                   {Allow break after \footnote}%
 %<platexrelease>\long\def\@footnotetext#1{%
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index 84eefb53ea2..efd98f22a21 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -127,7 +127,7 @@
 %</plcore>
 %<platexrelease>\edef\platexreleaseversion
 %<*plcore|platexrelease>
-   {2016/09/03u01}
+   {2016/09/08u01}
 %</plcore|platexrelease>
 %<*plcore>
 \def\ppatch@level{0}