From e9c70de7cb494496d1f0357ba7ae82c5c2b15447 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Nov 2017 21:37:43 +0000 Subject: uplatex (3nov17) git-svn-id: svn://tug.org/texlive/trunk@45681 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/uplatex/base/README.md | 2 +- Master/texmf-dist/doc/uplatex/base/uplatex.pdf | Bin 232700 -> 232702 bytes Master/texmf-dist/doc/uplatex/base/upldoc.pdf | Bin 632410 -> 632618 bytes Master/texmf-dist/source/uplatex/base/plcore.dtx | 14 +++++++++++--- Master/texmf-dist/source/uplatex/base/uplatex.dtx | 2 +- Master/texmf-dist/source/uplatex/base/uplvers.dtx | 2 +- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 5 +++-- 7 files changed, 17 insertions(+), 8 deletions(-) (limited to 'Master') 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 Binary files a/Master/texmf-dist/doc/uplatex/base/uplatex.pdf and b/Master/texmf-dist/doc/uplatex/base/uplatex.pdf differ diff --git a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf index 21f8cd35574..b07afbb8d55 100644 Binary files a/Master/texmf-dist/doc/uplatex/base/upldoc.pdf and b/Master/texmf-dist/doc/uplatex/base/upldoc.pdf differ 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}{相互参照のスペースファクターを補正} % \changes{v1.2s}{2017/09/27}{\cs{verb}の冒頭の半角空白を保持} % \changes{v1.2s}{2017/09/27}{tabbing環境の行冒頭のJFMグル―を削除} +% \changes{v1.2t}{2017/10/31}{v1.2sの変更に伴い、\cs{ref}が数式モードで +% エラーになっていたのを修正} % \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''を相互参照で取得した場合のスペースファクターを補正するため、 % |\spacefactor\@m{}|に修正しました。これで、``A.''の後のスペースが % 文末として扱われます。 -% （参考：\LaTeXe{}マクロ\&クラス プログラミング実践解説） +% 「\LaTeXe{}マクロ\&クラス プログラミング実践解説」のコードを参考に +% しましたが、数式モード内でもエラーにならないように改良しています。 % \changes{v1.2s}{2017/09/27}{相互参照のスペースファクターを補正} +% \changes{v1.2t}{2017/10/31}{v1.2sの変更に伴い、\cs{ref}が数式モードで +% エラーになっていたのを修正} % \begin{macrocode} % %\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} % %\plEndIncludeInRelease %\plIncludeInRelease{2017/04/08}{\@setref} @@ -1413,6 +1419,7 @@ % \else % \expandafter#2#1\relax{}% change \null to \relax{} % \fi} +%\let\@setref@\@undefined %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@setref} % {Spacing after \ref in moving arguments}% @@ -1425,6 +1432,7 @@ % \else % \expandafter#2#1\relax% change \null to \relax % \fi} +%\let\@setref@\@undefined %\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> -\def\ppatch@level{0} +\def\ppatch@level{1} % % \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 -- cgit v1.2.3