summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-23 00:55:09 +0000
committerKarl Berry <karl@freefriends.org>2015-01-23 00:55:09 +0000
commit2c9cedf6fec08e22e33f98a2e6fcac127161d0d5 (patch)
tree12f22d629993043397f9405eecf988571e89661a /Master
parentace11a85bfbb3639f2a96ee51b12020932cf9b8b (diff)
siunitx (22jan15)
git-svn-id: svn://tug.org/texlive/trunk@36118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/LICENSE5
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin620759 -> 620938 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx27
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty16
7 files changed, 34 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/LICENSE b/Master/texmf-dist/doc/latex/siunitx/LICENSE
deleted file mode 100644
index 69cdc42a1a3..00000000000
--- a/Master/texmf-dist/doc/latex/siunitx/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-Released under the [LaTeX Project Public
-License](http://www.latex-project.org/lppl.txt), v1.3c or later.
-
-The package has status 'maintained': the current maintainer is
-[Joseph Wright](joseph.wright@morningstar2.co.uk). \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 6dd901eb3b9..6c8178ac22e 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
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}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 246297350ae..9c72465c64a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/10/28} {2.6d}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/01/21} {2.6e}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
index 79a4447a85d..76d0cb496c3 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-binary.cfg} {2014/10/28} {2.6d}
+\ProvidesExplFile {siunitx-binary.cfg} {2015/01/21} {2.6e}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
index d0406518d4c..acdf0c6c731 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2014/10/28} {2.6d}
+\ProvidesExplFile {siunitx-version-1.cfg} {2015/01/21} {2.6e}
{siunitx: Version 1 settings}
\keys_define:nn { siunitx } {
addsign .choice: ,
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 9a28e0f91b6..f314066fa01 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,7 +14,7 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{expl3,xparse}
-\ProvidesExplPackage {siunitx} {2014/10/28} {2.6d}
+\ProvidesExplPackage {siunitx} {2015/01/21} {2.6e}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2012/11/21 }
{ }
@@ -77,9 +77,17 @@
\AtBeginDocument {
\@ifpackageloaded { fontspec }
{
- \int_const:Nn \c__siunitx_minus_int { 8722 }
- \tl_set:Nn \c__siunitx_minus_tl
- { \tex_char:D \c__siunitx_minus_int }
+ \@ifpackageloaded { mathspec }
+ { }
+ {
+ \@ifpackageloaded { eulervm }
+ { }
+ {
+ \int_const:Nn \c__siunitx_minus_int { 8722 }
+ \tl_set:Nn \c__siunitx_minus_tl
+ { \tex_char:D \c__siunitx_minus_int }
+ }
+ }
}
{ }
}