From a70fd575c028c4669d977e58d87bdc1cc996dfbd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Nov 2017 22:04:21 +0000 Subject: uplatex (5nov17) git-svn-id: svn://tug.org/texlive/trunk@45699 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/uplatex/base/README.md | 2 +- Master/texmf-dist/doc/uplatex/base/upldoc.pdf | Bin 632618 -> 632621 bytes Master/texmf-dist/source/uplatex/base/plcore.dtx | 6 ++++-- Master/texmf-dist/source/uplatex/base/uplvers.dtx | 2 +- Master/texmf-dist/tex/uplatex/base/uplcore.ltx | 4 ++-- 5 files changed, 8 insertions(+), 6 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 b62ba163b9f..8133a227fe8 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-11-03 +2017-11-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 b07afbb8d55..d1dd850c5dd 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 4ef45b866e4..e81ad2c6726 100644 --- a/Master/texmf-dist/source/uplatex/base/plcore.dtx +++ b/Master/texmf-dist/source/uplatex/base/plcore.dtx @@ -77,13 +77,14 @@ % \changes{v1.2s}{2017/09/27}{tabbing環境の行冒頭のJFMグル―を削除} % \changes{v1.2t}{2017/10/31}{v1.2sの変更に伴い、\cs{ref}が数式モードで % エラーになっていたのを修正} +% \changes{v1.2u}{2017/11/04}{emathの\cs{marusuuref}対策} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/10/31 v1.2t pLaTeX core file] +\ProvidesFile{plcore.dtx}[2017/11/04 v1.2u pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -1391,6 +1392,7 @@ % \changes{v1.2s}{2017/09/27}{相互参照のスペースファクターを補正} % \changes{v1.2t}{2017/10/31}{v1.2sの変更に伴い、\cs{ref}が数式モードで % エラーになっていたのを修正} +% \changes{v1.2u}{2017/11/04}{emathの\cs{marusuuref}対策} % \begin{macrocode} % %\plIncludeInRelease{2017/10/28}{\@setref} @@ -1405,7 +1407,7 @@ \else \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{} \fi} -\def\@setref@{\ifmmode\else\spacefactor\@m\fi} +\def\@setref@{\ifhmode\spacefactor\@m\fi} % %\plEndIncludeInRelease %\plIncludeInRelease{2017/04/08}{\@setref} diff --git a/Master/texmf-dist/source/uplatex/base/uplvers.dtx b/Master/texmf-dist/source/uplatex/base/uplvers.dtx index baf1b85cef8..42eb8dd2bcb 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{1} +\def\ppatch@level{2} % % \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 9e303f7ff46..bc391d1128e 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{1} +\def\ppatch@level{2} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} {\@plIncludeInRelease{#1}[#1]}} @@ -1014,7 +1014,7 @@ \else \expandafter#2#1\protect\@setref@{}% change \null to \protect\@setref@{} \fi} -\def\@setref@{\ifmmode\else\spacefactor\@m\fi} +\def\@setref@{\ifhmode\spacefactor\@m\fi} \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi \bgroup -- cgit v1.2.3