From 2c9cedf6fec08e22e33f98a2e6fcac127161d0d5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Jan 2015 00:55:09 +0000 Subject: siunitx (22jan15) git-svn-id: svn://tug.org/texlive/trunk@36118 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index c02cf67828f..018ccbaf468 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -621,6 +621,8 @@ This work consists of the file siunitx.dtx % is loaded but \pkg{unicode-math} is not} % \changes{v2.6d}{2014/10/07}{Fix conversion of \enquote{long} to % \enquote{short} uncertainty values with integer mantissas} +% \changes{v2.6e}{2015/01/21}{Auto-detect some packages where \pkg{fontspec} +% should not affect default symbol use} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5147,7 +5149,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2014/10/28} {2.6d} +\ProvidesExplPackage {siunitx} {2015/01/21} {2.6e} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5282,16 +5284,25 @@ This work consists of the file siunitx.dtx %} % To allow the correct symbol to appear in text mode: this is the same % as \cs{textminus} from \pkg{textcomp}. If \pkg{fontspec} is loaded -% then the real character can be used. +% then the real character can be used unless there's a good reason +% to suspect % \begin{macrocode} \DeclareTextSymbolDefault \c_@@_minus_tl { TS1 } \DeclareTextSymbol \c_@@_minus_tl { TS1 } { 61 } \AtBeginDocument { \@ifpackageloaded { fontspec } { - \int_const:Nn \c_@@_minus_int { 8722 } - \tl_set:Nn \c_@@_minus_tl - { \tex_char:D \c_@@_minus_int } + \@ifpackageloaded { mathspec } + { } + { + \@ifpackageloaded { eulervm } + { } + { + \int_const:Nn \c_@@_minus_int { 8722 } + \tl_set:Nn \c_@@_minus_tl + { \tex_char:D \c_@@_minus_int } + } + } } { } } @@ -16644,7 +16655,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2014/10/28} {2.6d} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/01/21} {2.6e} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17586,7 +17597,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/10/28} {2.6d} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/01/21} {2.6e} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17768,7 +17779,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2014/10/28} {2.6d} +\ProvidesExplFile {siunitx-binary.cfg} {2015/01/21} {2.6e} {siunitx: Binary units} % \end{macrocode} % -- cgit v1.2.3