summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty23
1 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 2d773310ff9..afbd7a5528a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -12,9 +12,8 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
\RequirePackage{expl3}
-\ProvidesExplPackage {siunitx} {2011/12/06} {2.4b}
+\ProvidesExplPackage {siunitx} {2011/12/09} {2.4d}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2011/09/05 }
{ }
@@ -704,9 +703,9 @@
}
}
\cs_set:Npn \siunitx_tmp:w { \rmfamily }
- \cs_if_eq:NNT \siunitx_number_textrm:n \siunitx_tmp:w
+ \cs_if_eq:NNT \siunitx_number_textrm: \siunitx_tmp:w
{ \keys_set:nn { siunitx } { number-text-rm = \sffamily } }
- \cs_if_eq:NNT \siunitx_unit_textrm:n \siunitx_tmp:w
+ \cs_if_eq:NNT \siunitx_unit_textrm: \siunitx_tmp:w
{ \keys_set:nn { siunitx } { unit-text-rm = \sffamily } }
}
\tl_if_eq:NNT \l_siunitx_tmpa_tl \c_siunitx_texttt_tl
@@ -717,9 +716,9 @@
\cs_if_eq:NNT \siunitx_unit_mathrm:n \siunitx_tmp:w
{ \keys_set:nn { siunitx } { unit-math-rm = \mathtt } }
\cs_set:Npn \siunitx_tmp:w { \rmfamily }
- \cs_if_eq:NNT \siunitx_number_textrm:n \siunitx_tmp:w
+ \cs_if_eq:NNT \siunitx_number_textrm: \siunitx_tmp:w
{ \keys_set:nn { siunitx } { number-text-rm = \ttfamily } }
- \cs_if_eq:NNT \siunitx_unit_textrm:n \siunitx_tmp:w
+ \cs_if_eq:NNT \siunitx_unit_textrm: \siunitx_tmp:w
{ \keys_set:nn { siunitx } { unit-text-rm = \ttfamily } }
}
}
@@ -1595,7 +1594,6 @@
\siunitx_number_in_complex_to_uncert_pad:
}
{ \siunitx_error:nx { misplaced-sign-token } { \exp_not:n {#1} } }
-
}
\cs_new_protected:Npn
\siunitx_number_in_complex_to_uncert_dec_loop:N #1
@@ -7042,7 +7040,13 @@
}
}
\cs_new_protected:Npn \siunitx_contents_add:N #1
- { \cs_set:Npn #1 { \token_to_str:N #1 } }
+ {
+ \cs_set:Npn #1
+ {
+ \token_to_str:N #1
+ \c_space_tl
+ }
+ }
\cs_new_protected:Npn \siunitx_contents_bookmarks:
{
\tl_map_function:NN \l_siunitx_declare_list_tl
@@ -7369,16 +7373,13 @@
\ProcessKeysOptions { siunitx }
%% Copyright (C) 2008-2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
-%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
%% http://www.latex-project.org/lppl.txt
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
-%%
%% This work consists of the file siunitx.dtx
%% and the derived files siunitx.pdf,
%% siunitx.sty and