uplatex (3nov17)

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

7 files changed, 17 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/uplatex/base/README.md b/Master/texmf-dist/doc/uplatex/base/README.md
index cfc2e93c327..b62ba163b9f 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-10-28
+2017-11-03
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
index 652bbe7bad0..c9c90931e06 100644
--- a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
+++ b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf
diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf
index 21f8cd35574..b07afbb8d55 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 77ea7eb9f74..4ef45b866e4 100644
--- a/Master/texmf-dist/source/uplatex/base/plcore.dtx
+++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx
@@ -75,13 +75,15 @@
 % \changes{v1.2s}{2017/09/27}{$BAj8_;2>H$N%9%Z!<%9%U%!%/%?!<$rJd@5(B}
 % \changes{v1.2s}{2017/09/27}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B}
 % \changes{v1.2s}{2017/09/27}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2t}{2017/10/31}{v1.2s$B$NJQ99$KH<$$!"(B\cs{ref}$B$,?t<0%b!<%I$G(B
+%    $B%(%i!<$K$J$C$F$$$?$N$r=$@5(B}
 % \fi
 %
 % \iffalse
 %<*driver>
 \NeedsTeXFormat{pLaTeX2e}
 % \fi
-\ProvidesFile{plcore.dtx}[2017/09/27 v1.2s pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/10/31 v1.2t pLaTeX core file]
 % \iffalse
 \documentclass{jltxdoc}
 \GetFileInfo{plcore.dtx}
@@ -1384,8 +1386,11 @@
 % ``A''$B$rAj8_;2>H$G<hF@$7$?>l9g$N%9%Z!<%9%U%!%/%?!<$rJd@5$9$k$?$a!"(B
 % |\spacefactor\@m{}|$B$K=$@5$7$^$7$?!#$3$l$G!"(B``A.''$B$N8e$N%9%Z!<%9$,(B
 % $BJ8Kv$H$7$F07$o$l$^$9!#(B
-% $B!J;29M!'(B\LaTeXe{}$B%^%/%m(B\&$B%/%i%9(B $B%W%m%0%i%_%s%0<BA)2r@b!K(B
+% $B!V(B\LaTeXe{}$B%^%/%m(B\&$B%/%i%9(B $B%W%m%0%i%_%s%0<BA)2r@b!W$N%3!<%I$r;29M$K(B
+% $B$7$^$7$?$,!"?t<0%b!<%IFb$G$b%(%i!<$K$J$i$J$$$h$&$K2~NI$7$F$$$^$9!#(B
 % \changes{v1.2s}{2017/09/27}{$BAj8_;2>H$N%9%Z!<%9%U%!%/%?!<$rJd@5(B}
+% \changes{v1.2t}{2017/10/31}{v1.2s$B$NJQ99$KH<$$!"(B\cs{ref}$B$,?t<0%b!<%I$G(B
+%    $B%(%i!<$K$J$C$F$$$?$N$r=$@5(B}
 %    \begin{macrocode}
 %</plcore>
 %<platexrelease>\plIncludeInRelease{2017/10/28}{\@setref}
@@ -1398,8 +1403,9 @@
     \@latex@warning{Reference `#3' on page \thepage \space
               undefined}%
   \else
-    \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{}
+    \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{}
   \fi}
+\def\@setref@{\ifmmode\else\spacefactor\@m\fi}
 %</plcore|platexrelease>
 %<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref}
@@ -1413,6 +1419,7 @@
 %<platexrelease>  \else
 %<platexrelease>    \expandafter#2#1\relax{}% change \null to \relax{}
 %<platexrelease>  \fi}
+%<platexrelease>\let\@setref@\@undefined
 %<platexrelease>\plEndIncludeInRelease
 %<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref}
 %<platexrelease>                   {Spacing after \ref in moving arguments}%
@@ -1425,6 +1432,7 @@
 %<platexrelease>  \else
 %<platexrelease>    \expandafter#2#1\relax% change \null to \relax
 %<platexrelease>  \fi}
+%<platexrelease>\let\@setref@\@undefined
 %<platexrelease>\plEndIncludeInRelease
 %<*plcore>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/uplatex/base/uplatex.dtx b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
index 47ddf9fee6f..fbe4391b811 100644
--- a/Master/texmf-dist/source/uplatex/base/uplatex.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplatex.dtx
@@ -678,7 +678,7 @@
   \def\Xpatch{0}
   \ifx\patchdate\Xpatch\else
   % number is assumed
-  \ifx\patchdate>0
+  \ifnum\patchdate>0
     \edef\@date{\@date\space Patch level\space\patchdate}
   \else
     \edef\@date{\@date\space Pre-Release\patchdate}
diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
index ac7389e1073..baf1b85cef8 100644
--- a/Master/texmf-dist/source/uplatex/base/uplvers.dtx
+++ b/Master/texmf-dist/source/uplatex/base/uplvers.dtx
@@ -145,7 +145,7 @@
    {2017/10/28u01}
 %</plcore|platexrelease>
 %<*plcore>
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 %</plcore>
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index ef1905558a6..9e303f7ff46 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -20,7 +20,7 @@
 \def\pfmtname{pLaTeX2e}
 \def\pfmtversion
    {2017/10/28u01}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
 \def\plIncludeInRelease#1{\kernel@ifnextchar[%
   {\@plIncludeInRelease{#1}}
   {\@plIncludeInRelease{#1}[#1]}}
@@ -1012,8 +1012,9 @@
     \@latex@warning{Reference `#3' on page \thepage \space
               undefined}%
   \else
-    \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{}
+    \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{}
   \fi}
+\def\@setref@{\ifmmode\else\spacefactor\@m\fi}
 \if@compatibility\else
 \def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
   \bgroup